Abhaengigkeit von Legacy Init fuer alle Content Typen entfernt.

git-svn-id: https://svn.libreccm.org/ccm/trunk@356 8810af33-2d31-482b-a856-94f89814c4df

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/"
+		return "/WEB-INF/traversal-adapters/com/arsdigita/"
-			+ "cms/contentassets/FileAttachment.xml";
+			+ "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 
+         * cms registers AssetMetadataProvider for type FileAsset and provides
-			 * context. We register a more specific metadataprovider for FileAttachment that provides useful information
+         * adapter for that context. We register a more specific metadataprovider
-			 * about the owner. Because we are using a new metadataprovider, we need to register
+         * for FileAttachment that provides useful information about the owner.
-			 * adapter for that context. Note this is not the same as the adapters registered by the 
+         * Because we are using a new metadataprovider, we need to register
-			 * ContentAssetInitializer, because those are used specifically when traversing a content item
+         * adapter for that context. Note this is not the same as the adapters
-			 * that delegates assets to their specific adapters
+         * registered by the ContentAssetInitializer, because those are used
-			 * 
+         * specifically when traversing a content item that delegates assets to
-			 * chris.gilbert@westsussex.gov.uk 
+         * their specific adapters
-			 */
+         *
-		MetadataProviderRegistry.registerAdapter(
+         * chris.gilbert@westsussex.gov.uk
-			FileAttachment.BASE_DATA_OBJECT_TYPE,
+	 */
-			new FileAttachmentMetadataProvider());
+        MetadataProviderRegistry.registerAdapter(
-		XML.parseResource(
+			FileAttachment.BASE_DATA_OBJECT_TYPE,
-			"/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment-search.xml",
+			new FileAttachmentMetadataProvider());
-                new TraversalHandler());
+        XML.parseResource(
+            "/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/"
+             + "FileAttachment-search.xml",
+            new TraversalHandler());
     }
-
+
 }

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
     }

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 <a href="mailto:berrange@redhat.com">Daniel Berrange</a>
  * @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 =
+    private static final Logger s_log =
-		Logger.getLogger(FileAttachmentMetadataProvider.class);
+            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
+        if (owner != null) {
-		FileAttachment file = (FileAttachment) dobj;
+            String title = owner.getTitle();
-		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.isLiveVersion()) {
+            if (owner.isLiveVersion()) {
-			ParameterMap map = new ParameterMap();
+                ParameterMap map = new ParameterMap();
-			map.setParameter( "oid", owner.getOID().toString() );
+                map.setParameter( "oid", owner.getOID().toString() );
-			
-			String url = new URL(Web.getConfig().getDefaultScheme(),
-					Web.getConfig().getServer().getName(),
-					Web.getConfig().getServer().getPort(),
-					"",
-					"",
-					"/redirect/", map ).getURL();	  
 			
+                String url = new URL(Web.getConfig().getDefaultScheme(),
+                                     Web.getConfig().getServer().getName(),
+                                     Web.getConfig().getServer().getPort(),
+                                     "",
+                                     "",
+                                     "/redirect/", map ).getURL();
+
 		summary.append("A file attached to <a href=\"" + url + "\">" + title + "</a>");
 
-		} else {
+            } else {
-			// draft - don't give a live link because stylesheets 
+                // draft - don't give a live link because stylesheets
-            // escape <a> tags. If this is changed in the bebop stylesheets
+                // escape <a> tags. If this is changed in the bebop stylesheets
-            // then just add parameter context=draft in map created above
+                // then just add parameter context=draft in map created above
-            // instead of this
+                // instead of this
-			summary.append("A file attached to " + title);
+                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;
-	}
+    }
 
 }

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

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 {
 

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

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("");
                         }

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";

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" );

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.

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";
     }

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
     }

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

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" };
     }
 }

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" };
     }
 
 }

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"
     };

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" };
     }
 }

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"

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);
 

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"

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;
+
+
 /**
- * 
  * <code>DomainObject</code> class to represent Contact <code>ContentType</code>
  * objects.
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @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;

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 <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @version $Id: ContactAddress.java 287 2005-02-22 00:29:02Z sskracic $
- * 
  */
 public class ContactAddress extends ContentItem {
 

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 <code>ContentType <code>Contact</code>.
+ * Initializer class to initialize <code>ContentType Contact</code>.
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @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(),
+	    AuthoringKitWizard.registerAssetStep(
-						 getAuthoringStep(), getAuthoringStepLabel(),
+                    getBaseType(),
-						 getAuthoringStepDescription(), getAuthoringStepSortKey());
+                    getAuthoringStep(), getAuthoringStepLabel(),
+                    getAuthoringStepDescription(), getAuthoringStepSortKey());
 	    
-	    // and sort out the display	- at the moment this is just the basic properties, addresses and phones		
+	    // and sort out the display	- at the moment this is just the
-	    ContentItemTraversalAdapter associatedContactTraversalAdapter = new ContentItemTraversalAdapter();
+            // basic properties, addresses and phones
+	    ContentItemTraversalAdapter associatedContactTraversalAdapter =
+                                        new ContentItemTraversalAdapter();
 	    associatedContactTraversalAdapter.addAssociationProperty("/object/phones");
 	    associatedContactTraversalAdapter.addAssociationProperty("/object/contactAddress");
 	    
 	    ContentItemTraversalAdapter.registerAssetAdapter(
-							     "associatedContactForItem",
+                    "associatedContactForItem",
-							     associatedContactTraversalAdapter, 
+                    associatedContactTraversalAdapter,
-							     "com.arsdigita.cms.dispatcher.SimpleXMLGenerator"); 
+                    "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.contact_authoring_step_description",
-				     "com.arsdigita.cms.contenttypes.ContactResources");
+            "com.arsdigita.cms.contenttypes.ContactResources");
     }
     
     private GlobalizedMessage getAuthoringStepLabel() {
 	return new GlobalizedMessage(
-				     "com.arsdigita.cms.contenttypes.contact_authoring_step_label",
+                "com.arsdigita.cms.contenttypes.contact_authoring_step_label",
-				     "com.arsdigita.cms.contenttypes.ContactResources");
+                "com.arsdigita.cms.contenttypes.ContactResources");
     }
     
     private Class getAuthoringStep() {

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 <code>Contact</code> objects.
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @version $Id: ContactType.java 287 2005-02-22 00:29:02Z sskracic $
- * 
  */
 public class ContactType extends ContentItem {
 

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 <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @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);
   }
 

ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/package.html

@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+<title>Content type Contact</title>
+</head>
+<body bgcolor="white">
+
+<p>
+Implementation of a Contact content type.</p>
+<p>
+Contact attributes include
+</p>
+<ul>
+    <li>Given name, family name, title and other personal characteristics</li>
+    <li>Contact type (e.g. service)</li>
+    <li>Contact details as e-mail, oranisation name, etc.</li>
+    <li>Address details (street, area, postal code, etc.y</li>
+    <li>Phone (number and type) several may be added</li>
+</ul>
+<p>Because of these attributes this content type is especially useful for
+   <i>United Kingdom</i> residents and UK local authorities.</p>
+</body>
+</html>

ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/ContactPropertyForm.java

@@ -41,9 +41,7 @@ import com.arsdigita.cms.ui.authoring.BasicPageForm;
  * <code>ContactPropertiesStep</code> authoring kit step.
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- * 
  * @version $Id: ContactPropertyForm.java 287 2005-02-22 00:29:02Z sskracic $
- *  
  */
 public class ContactPropertyForm extends BasicPageForm {
 

ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/util/ContactGlobalizationUtil.java

@@ -27,28 +27,26 @@ import com.arsdigita.globalization.GlobalizedMessage;
  * </p>
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @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,
+     *  This returns a globalized message using the type specific bundle,
-	 *  BUNDLE_NAME
+     *  BUNDLE_NAME
-	 */
+     */
-	public static GlobalizedMessage globalize(String key) {
+    public static GlobalizedMessage globalize(String key) {
-		return new GlobalizedMessage(key, BUNDLE_NAME);
+        return new GlobalizedMessage(key, BUNDLE_NAME);
-	}
+    }
 
-	/**
+    /**
-	 *  This returns a globalized message using the type specific bundle,
+     *  This returns a globalized message using the type specific bundle,
-	 *  BUNDLE_NAME
+     *  BUNDLE_NAME
-	 */
+     */
-	public static GlobalizedMessage globalize(String key, Object[] args) {
+    public static GlobalizedMessage globalize(String key, Object[] args) {
-		return new GlobalizedMessage(key, BUNDLE_NAME, args);
+        return new GlobalizedMessage(key, BUNDLE_NAME, args);
-	}
+    }
 }

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 <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @version $Id: ContactResourceBundle.java 287 2005-02-22 00:29:02Z sskracic $
- * 
  */
 public class ContactResourceBundle extends ChainedResourceBundle implements CMSGlobalized {
   

ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java

@@ -31,9 +31,7 @@ import java.math.BigDecimal;
  * Domain object class to represent <code>ESDService</code> content type.
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- *
  * @version $Id: ESDService.java 287 2005-02-22 00:29:02Z sskracic $
- * 
  */
 public class ESDService extends TextPage {
 

ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java

@@ -18,11 +18,13 @@
 package com.arsdigita.cms.contenttypes;
 
 /**
- * Initializer class to initialize <code>ContentType <code>ESDService</code>.
+ * Initializer class to initialize <code>ContentType ESDService</code>.
- * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
+ * 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 <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
  * @version $Id: ESDServiceInitializer.java 287 2005-02-22 00:29:02Z sskracic $
- * 
  */
 public class ESDServiceInitializer extends ContentTypeInitializer {
 

ccm-cms-types-esdservice/src/com/arsdigita/cms/contenttypes/package.html

@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+<title>ESD Service content type</title>
+</head>
+<body bgcolor="white">
+
+<p>
+
+</p>
+
+
+</body>
+</html>

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 $

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 <code>ContentType FAQ</code>.
+ *
+ * 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 &lt;jross@redhat.com&gt;
  * @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"

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"

ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/package.html

@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+  <head>
+      <title>FAQ contenttype</title>
+  </head>
+  <body bgcolor="white">
+  <p>
+  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.
+  </p>
+
+  <h3>Package Specification</h3>
+  <p>
+  Each content type is organized in a separate module (ccm-cms-types-[contenttype]).
+  Detailed description is provided with the domain class <code>[contenttype].java</code> 
+  of each module.
+  </p>
+
+  <h3>Configuration</h3>
+  <p>
+  Some content types can be configured by the <code>ccm [get|set]</code> 
+  utility. Details about the available parameters can be found in the 
+  <code>[contenttype]Config.java</code> class. The page /ccm/ds/config of
+  your installed APLAWS web site provides an overview for all content types.
+  </p>
+
+  <h3>Related Documentation</h3>
+  <p>
+  For overviews, tutorials, examples, guides, and tool documentation, please see:
+  </p>
+  <ul>
+    <!-- <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a> -->
+    <li>CMS Administrator Guide</li>
+  </ul>
+
+<!-- Put @see and @since tags down here. -->
+
+  </body>
+</html>

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/" + 

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"

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

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/" + 

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");

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

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/" + 

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"
     };

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

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

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"

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"

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:

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);
 

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"

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);

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"
     };

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_de.properties

@@ -0,0 +1 @@
+job.authoring.basic_properties.description=Editieren der Beschreibungsdaten

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" };
     }
 
 }

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"
     };

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

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" };
     }
 
 }

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"
     };

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.

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[] { };
     }

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

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 <a href="mailto:dturner@arsdigita.com">Dave Turner</a>
- * @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
+     * Depending on config parameter, either return the title
-     * of the section 
+     * of the section 
-     * 
+     * 
-     * OR
+     * OR
-     * 
+     * 
-     * return the title of the section at the top of the 
+     * return the title of the section at the top of the 
-     * page on which the current section appears unless
+     * page on which the current section appears unless
-     * the whole multipart article appears on one page, 
+     * the whole multipart article appears on one page, 
-     * in which case null is returned.
+     * in which case null is returned.
-     */
+     */
-    public String getPageTitle() {
+    public String getPageTitle() {
-        
+        
-        if (MultiPartArticle.getConfig().useSectionTitle()) {
+        if (MultiPartArticle.getConfig().useSectionTitle()) {
-        	return getTitle();
+        	return getTitle();
-        }
+        }
-        
+        
-        s_log.debug("retrieve pageTitle for section " + getTitle() + " ranked " + getRank());
+        s_log.debug("retrieve pageTitle for section " + getTitle() + " ranked " + getRank());
-        MultiPartArticle parent = getMPArticle();
+        MultiPartArticle parent = getMPArticle();
-        
+        
-        // is this a single page article? either page break on last section, 
+        // is this a single page article? either page break on last section, 
-        // or no page breaks
+        // or no page breaks
-        
+        
-        
+        
-        // boolean argument means order by rank ascending - no argument
+        // boolean argument means order by rank ascending - no argument
-	// currently means ascending, but specify here in case that 
+	// currently means ascending, but specify here in case that 
-	// changes
+	// changes
-        ArticleSectionCollection sections = parent.getSections(true);
+        ArticleSectionCollection sections = parent.getSections(true);
-        sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE);
+        sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE);
-        Integer firstPageBreak = null;
+        Integer firstPageBreak = null;
-        if (sections.next()) {
+        if (sections.next()) {
-            firstPageBreak = sections.getArticleSection().getRank();
+            firstPageBreak = sections.getArticleSection().getRank();
-            s_log.debug("first page break in this article is in section ranked " + firstPageBreak);
+            s_log.debug("first page break in this article is in section ranked " + firstPageBreak);
-        }
+        }
-        sections.close();
+        sections.close();
-        int lastSection = parent.getMaxRank();
+        int lastSection = parent.getMaxRank();
-        s_log.debug("last section of article is ranked " + lastSection);
+        s_log.debug("last section of article is ranked " + lastSection);
-        
+        
-        if (firstPageBreak == null || firstPageBreak.intValue() == lastSection) {
+        if (firstPageBreak == null || firstPageBreak.intValue() == lastSection) {
-            s_log.debug("this is a single page article");
+            s_log.debug("this is a single page article");
-            return null;
+            return null;
-        } else {
+        } else {
-            s_log.debug("this article has more than one page");
+            s_log.debug("this article has more than one page");
-        }
+        }
-        
+        
-        // okay - this article has more than one page - lets find the page break
+        // okay - this article has more than one page - lets find the page break
-        // before this section and then the section following that page break
+        // before this section and then the section following that page break
-        // boolean argument means order by rank descending
+        // boolean argument means order by rank descending
-        
+        
-        sections = parent.getSections(false);
+        sections = parent.getSections(false);
-        sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE);
+        sections.addEqualsFilter(PAGE_BREAK, Boolean.TRUE);
-        sections.addFilter(
+        sections.addFilter(
-        sections.getFilterFactory().lessThan(RANK, getRank(), true));
+        sections.getFilterFactory().lessThan(RANK, getRank(), true));
-            
+            
-        Integer topOfPageRank = new Integer(1);
+        Integer topOfPageRank = new Integer(1);
-        if (sections.next()) {
+        if (sections.next()) {
-            topOfPageRank = new Integer(sections.getArticleSection().getRank().intValue() + 1);
+            topOfPageRank = new Integer(sections.getArticleSection().getRank().intValue() + 1);
-            s_log.debug("Found top of page rank: " 
+            s_log.debug("Found top of page rank: " 
-                + topOfPageRank.intValue());
+                + topOfPageRank.intValue());
-        } else {
+        } else {
-            // If no page breaks before this section then we must be on 
+            // If no page breaks before this section then we must be on 
-            // page one.
+            // page one.
-            s_log.debug("This section is on first page.");
+            s_log.debug("This section is on first page.");
-        }
+        }
-        sections.close();
+        sections.close();
-        
+        
-        // Get 'clean' 
+        // Get 'clean' 
-        sections = parent.getSections(false);
+        sections = parent.getSections(false);
-        sections.addEqualsFilter(RANK, topOfPageRank);
+        sections.addEqualsFilter(RANK, topOfPageRank);
-       	String sectionTitle= null;
+       	String sectionTitle= null;
-        while (sections.next()) {
+        while (sections.next()) {
-            sectionTitle =  sections.getArticleSection().getTitle();
+            sectionTitle =  sections.getArticleSection().getTitle();
-            s_log.debug("Found page/section title: " + sectionTitle);
+            s_log.debug("Found page/section title: " + sectionTitle);
-        }
+        }
-        
+        
-        return sectionTitle;
+        return sectionTitle;
-    }
+    }
-    
+    
-    /**
+    /**
-    * As sections don't have their own summary, return the parent's search
+    * As sections don't have their own summary, return the parent's search
-    * summary.
+    * summary.
-    */
+    */
-    public String getSearchSummary() {
+    public String getSearchSummary() {
-    	if (MultiPartArticle.getConfig().useParentSummary()) {
+    	if (MultiPartArticle.getConfig().useParentSummary()) {
-    		MultiPartArticle parent = getMPArticle();
+    		MultiPartArticle parent = getMPArticle();
-    		return parent.getSearchSummary();
+    		return parent.getSearchSummary();
-    	} else {
+    	} else {
-    		return super.getSearchSummary();
+    		return super.getSearchSummary();
-    	}
+    	}
-    }
+    }
-
+
     protected void afterSave() {
         super.afterSave();
 

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(

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
      */

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,
+                                                  contentSection,
-                                                              context);
+                                                  context);
 			final int sep = url.indexOf('?');
 			URL destination = null;
         

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);
         }

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;
     }
 
-    
 }

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
 {
-    /**
+    private static final Logger log =
-     *  The class has already a logger (s_log), so I removed this.
+        Logger.getLogger(SectionTable.class.getName());
-     *  Jens Pelzetter 2009-05-29
-     */
-    /*private static final Logger log =
-        Logger.getLogger(SectionTable.class.getName());*/
 
     // column headings
     public static final String COL_TITLE  = "Section";

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" };
     }
 
 }

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"
     };

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"

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"

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.

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" };
     }
 
 }

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"
     };

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

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

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" };
     }
 }

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"
     };

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.

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

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"

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

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 

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";

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" };

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");

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

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.
  * </p>
  *
- * @author <a href="mailto:miles@runtime-collective.com">Miles Barr</a>
- * @version $Id: RetrieveListener.java 755 2005-09-02 13:42:47Z sskracic $
- * @since 05-03-2003
- *
  * @see XmlFeed
+ * @author <a href="mailto:miles@runtime-collective.com">Miles Barr</a>
+ * @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";

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;

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
+ * <li>delegate to this constructor providing its own manifest file </li>
+ * <li>Overwrite the abstract methods providing its own data</li>
+ * </ul>
+ *
+ */
 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
      */

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
+ * <li>delegate to this constructor providing its own manifest file and Base Data
+ * Object Type</li>
+ * <li>Overwrite getStylesheets() providing its specific stylesheet(s)</li>
+ * <li>optionally overwrite getTraversalXML() it necessary.</li>
+ * <li>optionally overwrite init(DomainObjectEvent), first delegating to this
+ * init() method for common basic tasks and then add its own specific initialization
+ * tasks.</li>
+ * </ul>
+ * 
+ */
 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
+     * Retrieves a list of style sheets assoziated with a content type.
-     * correct location of is stylesheets.
+     * 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;

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();
     }

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";

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.
      */

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";
 

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.
      *

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);

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);
     }