ContentType FAQ.
+ * Executes at each system startup and initializes the FAQ 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).
+ * (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: FAQItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $
*/
public class FAQItemInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(FAQItemInitializer.class);
/**
@@ -43,12 +45,22 @@ public class FAQItemInitializer extends ContentTypeInitializer {
}
/**
- * Retrieve location of the assoziated stylesheet.
- * @return
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
*/
+ @Override
public String[] getStylesheets() {
return new String[] {
- "/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl"
+ INTERNAL_THEME_TYPES_DIR + "FAQItem.xsl"
};
}
diff --git a/ccm-cms-types-faqitem/web/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl b/ccm-cms-types-faqitem/web/themes/heirloom/contenttypes/FAQItem.xsl
similarity index 100%
rename from ccm-cms-types-faqitem/web/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl
rename to ccm-cms-types-faqitem/web/themes/heirloom/contenttypes/FAQItem.xsl
diff --git a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java
index 2121d6bd2..f6ba7da46 100755
--- a/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java
+++ b/ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemInitializer.java
@@ -21,17 +21,20 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger;
/**
- * Initializes the File Storage Item content type.
+ * Executes at each system startup and initializes the File Storage Item (FSI)
+ * 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).
+ * (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: FileStorageItemInitializer.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class FileStorageItemInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log =
Logger.getLogger(FileStorageItemInitializer.class);
@@ -44,22 +47,32 @@ public class FileStorageItemInitializer extends ContentTypeInitializer {
}
/**
- * Retrieve location of traversal adapter
- * @return
+ * Retrieves fully qualified traversal adapter file name.
+ * @return
*/
+ @Override
public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/" +
"cms/contenttypes/FileStorageItem.xml";
}
/**
- * Retrieve location of this content types stylesheet.
- * @return
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
*/
+ @Override
public String[] getStylesheets() {
return new String[] {
- "/static/content-types/com/arsdigita/" +
- "cms/contenttypes/FileStorageItem.xsl"
+ INTERNAL_THEME_TYPES_DIR + "FileStorageItem.xsl"
};
}
}
diff --git a/ccm-cms-types-filestorageitem/web/static/content-types/com/arsdigita/cms/contenttypes/FileStorageItem.xsl b/ccm-cms-types-filestorageitem/web/themes/heirloom/contenttypes/FileStorageItem.xsl
similarity index 100%
rename from ccm-cms-types-filestorageitem/web/static/content-types/com/arsdigita/cms/contenttypes/FileStorageItem.xsl
rename to ccm-cms-types-filestorageitem/web/themes/heirloom/contenttypes/FileStorageItem.xsl
diff --git a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java
index d0f595e35..deb946850 100755
--- a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java
+++ b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java
@@ -23,11 +23,12 @@ import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
import org.apache.log4j.Logger;
/**
- * Initializes the Form Item content type.
+ * Executes at each system startup and 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).
+ * (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 $
@@ -35,6 +36,7 @@ import org.apache.log4j.Logger;
public class FormItemInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log =
Logger.getLogger(FormItemInitializer.class);
@@ -47,23 +49,32 @@ public class FormItemInitializer extends ContentTypeInitializer {
}
/**
- * Retrieve location of traversal adapter
+ * Retrieves fully qualified traversal adapter file name.
* @return
*/
+ @Override
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
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
*/
+ @Override
public String[] getStylesheets() {
return new String[] {
- "/static/content-types/com/arsdigita/" +
- "cms/contenttypes/FormItem.xsl"
+ INTERNAL_THEME_TYPES_DIR + "FormItem.xsl"
};
}
}
diff --git a/ccm-cms-types-formitem/web/static/content-types/com/arsdigita/cms/contenttypes/FormItem.xsl b/ccm-cms-types-formitem/web/themes/heirloom/contenttypes/FormItem.xsl
similarity index 100%
rename from ccm-cms-types-formitem/web/static/content-types/com/arsdigita/cms/contenttypes/FormItem.xsl
rename to ccm-cms-types-formitem/web/themes/heirloom/contenttypes/FormItem.xsl
diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java
index 4c47de43c..e8a25fb15 100755
--- a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java
+++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemInitializer.java
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.formbuilder;
import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
@@ -23,17 +24,20 @@ import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
import org.apache.log4j.Logger;
/**
- * Initializes the Form Section Item content type.
+ * Executes at each system startup and 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).
+ * (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 $
- **/
+ */
public class FormSectionItemInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log =
Logger.getLogger(FormSectionItemInitializer.class);
@@ -46,22 +50,32 @@ public class FormSectionItemInitializer extends ContentTypeInitializer {
}
/**
- * Retrieve location of traversal adapter
+ * Retrieves fully qualified traversal adapter file name.
* @return
*/
+ @Override
public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/" +
"cms/formbuilder/FormSectionItem.xml";
}
/**
- * Retrieve location of this content types stylesheet.
- * @return
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
*/
+ @Override
public String[] getStylesheets() {
return new String[] {
- "/static/content-types/com/arsdigita/cms/" +
- "contenttypes/FormSectionItem.xsl"
+ INTERNAL_THEME_TYPES_DIR + "FormSectionItem.xsl"
};
}
}
diff --git a/ccm-cms-types-formsectionitem/web/static/content-types/com/arsdigita/cms/contenttypes/FormSectionItem.xsl b/ccm-cms-types-formsectionitem/web/themes/heirloom/contenttypes/FormSectionItem.xsl
similarity index 100%
rename from ccm-cms-types-formsectionitem/web/static/content-types/com/arsdigita/cms/contenttypes/FormSectionItem.xsl
rename to ccm-cms-types-formsectionitem/web/themes/heirloom/contenttypes/FormSectionItem.xsl
diff --git a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java
index 31bf6dbd0..4e1d1402d 100755
--- a/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java
+++ b/ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java
@@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger;
/**
- * Initializes the Form Item content type.
+ * Executes at each system startup and initializes the Glossary 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
@@ -34,6 +35,7 @@ import org.apache.log4j.Logger;
*/
public class GlossaryItemInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(GlossaryItemInitializer.class);
/**
@@ -45,16 +47,23 @@ public class GlossaryItemInitializer extends ContentTypeInitializer {
}
/**
- * Retrieve location of this content types stylesheet. Overwrites parent
- * method with FormItem specific value for use by the parent class worker
- * methods.
- * @return
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
*/
@Override
public String[] getStylesheets() {
return new String[] {
// "/static/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xsl"
- "/themes/heirloom/contenttypes/GlossaryItem.xsl"
+ INTERNAL_THEME_TYPES_DIR + "GlossaryItem.xsl"
};
}
}
diff --git a/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java b/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java
index 0c346d91e..959a6fa6f 100755
--- a/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java
+++ b/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java
@@ -17,22 +17,44 @@ package com.arsdigita.cms.contenttypes;
/**
- * The HTMLForm initializer.
+ * Executes at each system startup and initializes the HTMLForm 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: com/arsdigita/cms/contenttypes/HTMLFormInitializer.java#2 $
*/
public class HTMLFormInitializer extends ContentTypeInitializer {
+ /**
+ * Constructor, sets the PDL manifest file and object type string.
+ */
public HTMLFormInitializer() {
super("ccm-cms-types-htmlform.pdl.mf", HTMLForm.BASE_DATA_OBJECT_TYPE);
}
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
@Override
public String[] getStylesheets() {
return new String[] {
// "/static/content-types/com/arsdigita/cms/contenttypes/HTMLForm.xsl" };
- "/themes/heirloom/contenttypes/HTMLForm.xsl" };
+ INTERNAL_THEME_TYPES_DIR + "HTMLForm.xsl" };
}
}
diff --git a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
index 278b31ed7..78414b8d5 100755
--- a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
+++ b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
@@ -16,35 +16,59 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger;
/**
- * Initializes the image content type.
+ * Executes at each system startup and initializes the Image 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).
+ * (map). This is done by runtimeRuntime startup method which runs the init()
+ * methods of all initializers (this one just using the parent implementation).
*
* @author Sören Bernstein (sbernstein@zes.uni-bremen.de);
*/
public class ImageInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(ImageInitializer.class);
+ /**
+ * Constructor, sets the PDL manifest file and object type string.
+ */
public ImageInitializer() {
super("ccm-cms-types-image.pdl.mf", Image.BASE_DATA_OBJECT_TYPE);
}
+ /**
+ * Retrieves fully qualified traversal adapter file name.
+ * @return
+ */
@Override
public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml";
}
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
@Override
public String[] getStylesheets() {
return new String[] {
- "/static/content-types/com/arsdigita/cms/contenttypes/Image.xsl" };
+ INTERNAL_THEME_TYPES_DIR + "Image.xsl" };
}
}
diff --git a/ccm-cms-types-image/web/static/content-types/com/arsdigita/cms/contenttypes/Image.xsl b/ccm-cms-types-image/web/themes/heirloom/contenttypes/Image.xsl
similarity index 100%
rename from ccm-cms-types-image/web/static/content-types/com/arsdigita/cms/contenttypes/Image.xsl
rename to ccm-cms-types-image/web/themes/heirloom/contenttypes/Image.xsl
diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java
index 9c1cbfba5..cbd3a775e 100644
--- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java
+++ b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
@@ -27,22 +28,49 @@ import com.arsdigita.runtime.DomainInitEvent;
import org.apache.log4j.Logger;
/**
+ * Executes at each system startup and initializes the Member 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 Jens Pelzetter
*/
public class MemberInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(MemberInitializer.class);
+ /**
+ * Constructor, sets the PDL manifest file and object type string.
+ */
public MemberInitializer() {
super("ccm-cms-types-member.pdl.mf", Member.BASE_DATA_OBJECT_TYPE);
}
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
@Override
public String[] getStylesheets() {
- return new String[]{"/static/content-types/com/arsdigita/cms/contenttypes/Member.xsl"};
+ return new String[]{INTERNAL_THEME_TYPES_DIR + "Member.xsl"};
}
+ /**
+ * Retrieves fully qualified traversal adapter file name.
+ * @return
+ */
@Override
public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Member.xml";
diff --git a/ccm-cms-types-member/web/static/content-types/com/arsdigita/cms/contenttypes/Member.xsl b/ccm-cms-types-member/web/themes/heirloom/contenttypes/Member.xsl
similarity index 100%
rename from ccm-cms-types-member/web/static/content-types/com/arsdigita/cms/contenttypes/Member.xsl
rename to ccm-cms-types-member/web/themes/heirloom/contenttypes/Member.xsl
diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java
index fc68a8879..ab1976cf7 100755
--- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java
+++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java
@@ -20,43 +20,73 @@ package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.CMSConfig;
import com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel;
-//Unused import
-// import com.arsdigita.cms.search.ContentPageMetadataProvider;
import com.arsdigita.kernel.URLService;
import com.arsdigita.runtime.DomainInitEvent;
import com.arsdigita.search.MetadataProviderRegistry;
+import org.apache.log4j.Logger;
+
/**
- * The MultiPartArticle initializer.
+ * Executes at each system startup and initializes the MultiPartArticle
+ * 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: MultiPartArticleInitializer.java 2212 2011-06-22 08:39:04Z pboy $
*/
public class MultiPartArticleInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
+ private static final Logger s_log = Logger.getLogger(
+ MultiPartArticleInitializer.class);
+
/**
- * MultiPartArticleInitializer Constructor
+ * Constructor, sets the PDL manifest file and object type string.
*/
public MultiPartArticleInitializer() {
super("ccm-cms-types-mparticle.pdl.mf", MultiPartArticle.BASE_DATA_OBJECT_TYPE);
}
+ /**
+ * Retrieves fully qualified traversal adapter file name.
+ * @return
+ */
@Override
public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/MultiPartArticle.xml";
}
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
@Override
public String[] getStylesheets() {
return new String [] {
- "/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl",
- "/static/content-types/com/arsdigita/cms/contenttypes/ArticleSection.xsl"
+ INTERNAL_THEME_TYPES_DIR + "MultiPartArticle.xsl",
+ INTERNAL_THEME_TYPES_DIR + "ArticleSection.xsl"
};
}
- // Previously used LegacyInitEvent, allthough no legacy init functionality
- // is used here. Wondering.
+ /**
+ *
+ * @param evt
+ */
@Override
public void init(DomainInitEvent evt) {
super.init(evt);
diff --git a/ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/ArticleSection.xsl b/ccm-cms-types-mparticle/web/themes/heirloom/contenttypes/ArticleSection.xsl
similarity index 100%
rename from ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/ArticleSection.xsl
rename to ccm-cms-types-mparticle/web/themes/heirloom/contenttypes/ArticleSection.xsl
diff --git a/ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl b/ccm-cms-types-mparticle/web/themes/heirloom/contenttypes/MultiPartArticle.xsl
similarity index 100%
rename from ccm-cms-types-mparticle/web/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl
rename to ccm-cms-types-mparticle/web/themes/heirloom/contenttypes/MultiPartArticle.xsl
diff --git a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java
index 22d00453b..0ef1aad73 100755
--- a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java
+++ b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java
@@ -16,37 +16,62 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger;
/**
- * Initializes the NewsItem content type.
+ * Executes at each system startup and 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).
+ * (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: #7 $ $Date: 2004/08/17 $
* @version $Id: NewsItemInitializer.java 1594 2007-07-10 10:56:11Z p_boy $
- **/
-
+ */
public class NewsItemInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(NewsItemInitializer.class);
+ /**
+ * Constructor, sets the PDL manifest file and object type string.
+ */
public NewsItemInitializer() {
super("ccm-cms-types-newsitem.pdl.mf", NewsItem.BASE_DATA_OBJECT_TYPE);
}
+ /**
+ * Retrieves fully qualified traversal adapter file name.
+ * @return
+ */
+ @Override
public String getTraversalXML() {
return
"/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/NewsItem.xml";
}
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
+ @Override
public String[] getStylesheets() {
return new String[]
- { "/static/content-types/com/arsdigita/cms/contenttypes/NewsItem.xsl" };
+ { INTERNAL_THEME_TYPES_DIR + "NewsItem.xsl" };
}
}
diff --git a/ccm-cms-types-newsitem/web/static/content-types/com/arsdigita/cms/contenttypes/NewsItem.xsl b/ccm-cms-types-newsitem/web/themes/heirloom/contenttypes/NewsItem.xsl
similarity index 100%
rename from ccm-cms-types-newsitem/web/static/content-types/com/arsdigita/cms/contenttypes/NewsItem.xsl
rename to ccm-cms-types-newsitem/web/themes/heirloom/contenttypes/NewsItem.xsl
diff --git a/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonInitializer.java b/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonInitializer.java
index 8651469da..3e22c65e5 100644
--- a/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonInitializer.java
+++ b/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonInitializer.java
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
@@ -25,25 +26,54 @@ import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainObjectInstantiator;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.runtime.DomainInitEvent;
+
import org.apache.log4j.Logger;
/**
+ * Executes at each system startup and initializes the Person 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 Jens Pelzetter
+ * @version $Id$
*/
public class PersonInitializer extends ContentTypeInitializer {
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(PersonInitializer.class);
+ /**
+ * Constructor, sets the PDL manifest file and object type string.
+ */
public PersonInitializer() {
super("ccm-cms-types-person.pdl.mf", Person.BASE_DATA_OBJECT_TYPE);
}
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
@Override
public String[] getStylesheets() {
- return new String[]{"/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl"};
+ return new String[]{INTERNAL_THEME_TYPES_DIR + "Person.xsl"};
}
+ /**
+ * Retrieves fully qualified traversal adapter file name.
+ * @return
+ */
@Override
public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Person.xml";
diff --git a/ccm-cms-types-person/web/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl b/ccm-cms-types-person/web/themes/heirloom/contenttypes/Person.xsl
similarity index 100%
rename from ccm-cms-types-person/web/static/content-types/com/arsdigita/cms/contenttypes/Person.xsl
rename to ccm-cms-types-person/web/themes/heirloom/contenttypes/Person.xsl
diff --git a/ccm-cms-types-simpleaddress/pdl/com/arsdigita/content-types/SimpleAddress.pdl b/ccm-cms-types-simpleaddress/pdl/com/arsdigita/content-types/SimpleAddress.pdl
index 0c6c7d1b1..6906481b6 100755
--- a/ccm-cms-types-simpleaddress/pdl/com/arsdigita/content-types/SimpleAddress.pdl
+++ b/ccm-cms-types-simpleaddress/pdl/com/arsdigita/content-types/SimpleAddress.pdl
@@ -17,6 +17,7 @@
//
// $Id: SimpleAddress.pdl 1597 2007-07-10 16:27:26Z p_boy $
// $DateTime: 2004/08/17 23:15:09 $
+
model com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentPage;
diff --git a/ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressInitializer.java b/ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressInitializer.java
index 05ad74027..3204306b5 100755
--- a/ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressInitializer.java
+++ b/ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressInitializer.java
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.cms.contenttypes;
import com.arsdigita.domain.DomainObject;
@@ -26,7 +27,13 @@ import com.arsdigita.runtime.DomainInitEvent;
import org.apache.log4j.Logger;
/**
- * Initializes the SimpleAddress content type.
+ * Executes at each system startup and initializes the SimpleAddress
+ * 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: SimpleAddressInitializer.java 1597 2007-07-10 16:27:26Z p_boy $
@@ -37,7 +44,7 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
private static final Logger s_log = Logger.getLogger(SimpleAddressInitializer.class);
/**
- * Constructor
+ * Constructor, sets the PDL manifest file and object type string.
*/
public SimpleAddressInitializer() {
super("ccm-cms-types-simpleaddress.pdl.mf",
@@ -45,7 +52,7 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
}
/**
- * Initializer
+ * Domain Initializer
* @param evt
*/
@Override
@@ -70,15 +77,21 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
}
/**
- * Provides location of the stylesheets assoziated with this content type.
- * (As of 6.6.x it is really used to locate the content type stylesheet,
- * in distinction from locating application stylesheets.)
- * @return
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
*/
@Override
public String[] getStylesheets() {
return new String[] {
- // "/static/content-types/com/arsdigita/cms/contenttypes/SimpleAddress.xsl" };
- "/themes/heirloom/contenttypes/SimpleAddress.xsl" };
+ INTERNAL_THEME_TYPES_DIR + "SimpleAddress.xsl" };
}
}
diff --git a/ccm-cms-types-simpleaddress/web/themes/heirloom/contenttypes/SimpleAddress.xsl b/ccm-cms-types-simpleaddress/web/themes/heirloom/contenttypes/SimpleAddress.xsl
index 125cdbddc..2cf13d8f8 100755
--- a/ccm-cms-types-simpleaddress/web/themes/heirloom/contenttypes/SimpleAddress.xsl
+++ b/ccm-cms-types-simpleaddress/web/themes/heirloom/contenttypes/SimpleAddress.xsl
@@ -72,8 +72,8 @@
diff --git a/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java b/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java index a3de134c5..c2bf3de7a 100755 --- a/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java +++ b/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java @@ -50,7 +50,7 @@ import org.apache.log4j.Logger; * * <servlet-mapping> * <servlet-name>legacy-adapter</servlet-name> - * <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> + * <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern> * </servlet-mapping> * * diff --git a/ccm-core/src/com/arsdigita/web/URL.java b/ccm-core/src/com/arsdigita/web/URL.java index e5fab9105..971a011fc 100755 --- a/ccm-core/src/com/arsdigita/web/URL.java +++ b/ccm-core/src/com/arsdigita/web/URL.java @@ -133,13 +133,18 @@ import org.apache.log4j.Logger; public class URL { private static final Logger s_log = Logger.getLogger(URL.class); + /** + * @deprecated + */ private static final String INTERNAL_DIR = "/__ccm__"; /** * The standard location for JSP files. + * @deprecated */ public static final String JSP_DIR = INTERNAL_DIR + "/jsp"; /** * The standard location for static files. + * @deprecated */ public static final String STATIC_DIR = INTERNAL_DIR + "/static"; /** @@ -147,12 +152,14 @@ public class URL { * No longer in use. */ // public static final String XSL_DIR = INTERNAL_DIR + "/xsl"; + + + public static final String THEMES_DIR = "/themes"; + /** * The standard location for servlets. */ - public static final String SERVLET_DIR = INTERNAL_DIR + "/servlet"; - - public static final String THEMES_DIR = "/themes"; + public static final String SERVLET_DIR = THEMES_DIR + "/servlet"; public static final String INTERNAL_THEME_DIR = THEMES_DIR + "/heirloom"; diff --git a/ccm-core/src/com/arsdigita/web/Web.java b/ccm-core/src/com/arsdigita/web/Web.java index 0150b9101..626259620 100755 --- a/ccm-core/src/com/arsdigita/web/Web.java +++ b/ccm-core/src/com/arsdigita/web/Web.java @@ -178,13 +178,13 @@ public class Web { * to search for the second component 'path'. So, if the * 'resource' is: *
- * /myproj,ccm-cms,ROOT/__ccm__/apps/content-section/index.sl
+ * /myproj,ccm-cms,ROOT/themes/heirloom/apps/content-section/index.sl
*
* then this method will look for resources at
*
- * /myproj/__ccm__/apps/content-section/index.sl
- * /ccm-cms/__ccm__/apps/content-section/index.sl
- * /ROOT/__ccm__/apps/content-section/index.sl
+ * /myproj/themes/heirloom/apps/content-section/index.sl
+ * /ccm-cms/themes/heirloom/apps/content-section/index.sl
+ * /ROOT/themes/heirloom/apps/content-section/index.sl
*
* @param resource the resource name
* @return the URL for the resource, or null
@@ -201,12 +201,12 @@ public class Web {
* webapp resource. The first argument is a list of
* webapp paths to search through for the path. So
* if the webapps param is { 'myproj', 'ccm-cms', 'ROOT' }
- * and the path parma is '/__ccm__/apps/content-section/index.xsl'
+ * and the path parma is '/themes/heirloom/apps/content-section/index.xsl'
* then the paths that are searched are:
*
- * /myproj/__ccm__/apps/content-section/index.sl
- * /ccm-cms/__ccm__/apps/content-section/index.sl
- * /ROOT/__ccm__/apps/content-section/index.sl
+ * /myproj/themes/heirloom/apps/content-section/index.sl
+ * /ccm-cms/themes/heirloom/apps/content-section/index.sl
+ * /ROOT/themes/heirloom/apps/content-section/index.sl
*
* @param webapps the list of webapps
* @param path the resource path
diff --git a/ccm-core/web/WEB-INF/web.ccm-core.xml b/ccm-core/web/WEB-INF/web.ccm-core.xml
index af8a3ca8b..076a33871 100644
--- a/ccm-core/web/WEB-INF/web.ccm-core.xml
+++ b/ccm-core/web/WEB-INF/web.ccm-core.xml
@@ -148,7 +148,7 @@
+ 
Edit
+ 
Delete
+
+
Delete indexer
* <define:component name="contentList" * classname="com.arsdigita.cms.dispatcher.ContentList" /> - *
+ *
* <xsl:include href="content-lists.xsl" /> * *
@@ -65,7 +65,7 @@ import org.apache.log4j.Logger; *
* <define:component name="contentList" * classname="com.arsdigita.cms.dispatcher.ContentList" /> - *
+ *
* <xsl:include href="../../navigation/xsl/content-lists.xsl" /> * * diff --git a/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml b/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml index b11d050a7..f67f276b8 100644 --- a/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml +++ b/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml @@ -30,7 +30,7 @@
@@ -20,12 +22,12 @@
- 
- 
diff --git a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/layout-panel.xsl b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/layout-panel.xsl
index 6ab197ed7..c556948d7 100755
--- a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/layout-panel.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/layout-panel.xsl
@@ -5,7 +5,7 @@
>
diff --git a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/section.xsl b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/section.xsl
index b660a9f2d..a0a409a05 100755
--- a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/section.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/section.xsl
@@ -6,7 +6,7 @@
>
diff --git a/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl b/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
index 3d6994bfa..7b70949d5 100644
--- a/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
@@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0" >
-
diff --git a/ccm-themedirector/web/themes/static/default/content-center-index.xsl b/ccm-themedirector/web/themes/static/default/content-center-index.xsl
index bb6ab9923..2c4fcd463 100644
--- a/ccm-themedirector/web/themes/static/default/content-center-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/content-center-index.xsl
@@ -4,6 +4,6 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0" >
-