Weitere Bereinigung des Namensraums und heirloom themes (Verlegen der content type XSLs).

git-svn-id: https://svn.libreccm.org/ccm/trunk@1475 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2012-01-29 01:08:19 +00:00
parent 55657c07e1
commit 569eb2ab13
191 changed files with 918 additions and 468 deletions

View File

@ -10,7 +10,7 @@ modifications are necessary:
2. move the files in this dir to WEB-INF/ 2. move the files in this dir to WEB-INF/
3. change src/com/ad/auth/http/HTTPAuth.java 3. change src/com/ad/auth/http/HTTPAuth.java
method getServletContext() as back to "/files" method getServletContext() as back to "/files"
4. edit __ccm__/.../xsl/index.xsl according the comment 4. edit themes__ccm__/.../xsl/index.xsl according the comment
Running it in its own webapplication context nevertheless is not suggestive. Running it in its own webapplication context nevertheless is not suggestive.

View File

@ -334,7 +334,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -410,7 +410,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -420,7 +420,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -455,22 +455,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -334,7 +334,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -410,7 +410,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -420,7 +420,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -455,22 +455,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -4,11 +4,11 @@
# the full story. # the full story.
# Output type is for things such as text/javascript # Output type is for things such as text/javascript
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::outputtype::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
# Grabs custom item xsl for CMS # Grabs custom item xsl for CMS
http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url:: http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
# added by Quasimodo # added by Quasimodo
# Theme with single entry point (e.g Mandalay) # Theme with single entry point (e.g Mandalay)
@ -37,8 +37,8 @@ http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::ur
http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
# Global default, from application's own web app # Global default, from application's own web app
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
# Global default, from application's own web app - relocated version >= 6.6.1 # Global default, from application's own web app - relocated version >= 6.6.1
http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0"> version="1.0">
<!-- <!--
<xsl:import href="../../../../ROOT/__ccm__/apps/admin/xsl/index.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/admin/xsl/index.xsl"/>
--> -->
<xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/> <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>

View File

@ -5,11 +5,11 @@
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
<xsl:import href="../../../../ccm-ldn-atoz/__ccm__/apps/atoz/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-atoz/themes/heirloom/apps/atoz/xsl/index.xsl"/>
--> -->
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
--> -->
<xsl:import href="../../../__ccm__/apps/atoz/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/atoz/xsl/index.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>
<xsl:param name="theme-prefix"/> <xsl:param name="theme-prefix"/>

View File

@ -12,12 +12,12 @@
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
--> -->
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
--> -->
<xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/content-section/xsl/index.xsl"/>
<xsl:import href="lib/header.xsl"/> <xsl:import href="lib/header.xsl"/>
<xsl:import href="lib/lib.xsl"/> <xsl:import href="lib/lib.xsl"/>

View File

@ -13,5 +13,5 @@ color: #6F3 !important;
.dark { .dark {
color: #336 !important; color: #336 !important;
font-style: bold !important; font-weight: bold !important;
} }

View File

@ -9,13 +9,13 @@
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-forum installed as separate web application <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
<xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/> <xsl:import href="../../../../ROOT/themes/aplaws/category-step.xsl"/>
<xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/cms/admin/category-step/category-step.xsl"/>
--> -->
<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
--> -->
<xsl:import href="../../../__ccm__/themes/aplaws/category-step.xsl"/> <xsl:import href="../../category-step.xsl"/>
<xsl:import href="../../../__ccm__/static/cms/admin/category-step/category-step.xsl"/> <xsl:import href="../../../heirloom/packages/cms/xsl/admin/category-step/category-step.xsl"/>
<xsl:output method="html" indent="yes"/> <xsl:output method="html" indent="yes"/>

View File

@ -26,7 +26,7 @@
<!-- The file ~/lib/page.css does not exist at least since version 1.0.2 <!-- The file ~/lib/page.css does not exist at least since version 1.0.2
there exists a file of this name in there exists a file of this name in
ccm-cms/web/__ccm__/static/cms/admin/page/page.css ccm-cms/web/themes/packages/cms/admin/page/page.css
may be a copy&paste error --> may be a copy&paste error -->
<xsl:template name="aplaws:headerStyleSheets"> <xsl:template name="aplaws:headerStyleSheets">
<link rel="stylesheet" href="{$theme-prefix}/lib/page.css" type="text/css" media="screen"/> <link rel="stylesheet" href="{$theme-prefix}/lib/page.css" type="text/css" media="screen"/>

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0"> version="1.0">
<xsl:import href="../../../../ROOT/__ccm__/apps/navigation/xsl/admin.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/navigation/xsl/admin.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>
<xsl:param name="theme-prefix" /> <xsl:param name="theme-prefix" />

View File

@ -11,7 +11,7 @@
exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal" exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"
version="1.0"> version="1.0">
<!-- <xsl:import href="../../../__ccm__/apps/workspace/xsl/index.xsl"/> --> <!-- <xsl:import href="../../../themes/heirloom/apps/workspace/xsl/index.xsl"/> -->
<xsl:import href="../../heirloom/apps/portal-workspace/xsl/index.xsl"/> <xsl:import href="../../heirloom/apps/portal-workspace/xsl/index.xsl"/>
<xsl:import href="portal/lib.xsl"/> <xsl:import href="portal/lib.xsl"/>

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0"> version="1.0">
<!-- <xsl:import href="../../../__ccm__/apps/workspace/xsl/admin.xsl"/> --> <!-- <xsl:import href="../../../themes/heirloom/apps/workspace/xsl/admin.xsl"/> -->
<xsl:import href="../../heirloom/apps/portal-workspace/xsl/admin.xsl"/> <xsl:import href="../../heirloom/apps/portal-workspace/xsl/admin.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>

View File

@ -12,10 +12,10 @@
version="1.0"> version="1.0">
<!-- path if installed in its own web context ccm-ldn-search <!-- path if installed in its own web context ccm-ldn-search
<xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-search/themes/heirloom/apps/search/xsl/index.xsl"/>
--> -->
<!-- path to xsl if installed in the main (common) web context <!-- path to xsl if installed in the main (common) web context
--> -->
<xsl:import href="../../../__ccm__/apps/search/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/search/xsl/index.xsl"/>
</xsl:stylesheet> </xsl:stylesheet>

View File

@ -16,12 +16,12 @@
<!-- path if installed in its own web context ccm-ldn-shortcuts <!-- path if installed in its own web context ccm-ldn-shortcuts
<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/> <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
--> -->
<!-- path to xsl if installed in the main (common) web context <!-- path to xsl if installed in the main (common) web context
--> -->
<xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/> <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/content-section/xsl/index.xsl"/>
<xsl:param name="context-prefix"/> <xsl:param name="context-prefix"/>
<xsl:param name="dispatcher-prefix" /> <xsl:param name="dispatcher-prefix" />

View File

@ -5,7 +5,7 @@
version="1.0"> version="1.0">
<!-- path if installed in its own web context ccm-ldn-shortcuts <!-- path if installed in its own web context ccm-ldn-shortcuts
<xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-shortcuts/themes/heirloom/apps/shortcuts/xsl/index.xsl"/>
--> -->
<!-- path to xsl if installed in the main (common) web context <!-- path to xsl if installed in the main (common) web context
--> -->

View File

@ -5,7 +5,7 @@
version="1.0"> version="1.0">
<!-- path if installed in its own web context ccm-ldn-subsite <!-- path if installed in its own web context ccm-ldn-subsite
<xsl:import href="../../../../ccm-ldn-subsite/__ccm__/apps/subsite/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-subsite/themes/heirloom/apps/subsite/xsl/index.xsl"/>
--> -->
<!-- path to xsl if installed in the main (common) web context <!-- path to xsl if installed in the main (common) web context
--> -->

View File

@ -1,6 +1,6 @@
@import url(../../heirloom/css/acs-master.css); @import url(../../heirloom/css/acs-master.css);
/* Following import is valid if terms is executed in its own */ /* Following import is valid if terms is executed in its own */
/* web application context (ccm-ldn-terms) */ /* web application context (ccm-ldn-terms) */
/* @import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css); */ /* @import url(/ccm-ldn-terms/themes/heirloom/apps/terms/xsl/index.css); */
/* import if installed in the main (common) web context */ /* import if installed in the main (common) web context */
@import url(../../heirloom/apps/terms/xsl/index.css); @import url(../../heirloom/apps/terms/xsl/index.css);

View File

@ -5,7 +5,7 @@
version="1.0"> version="1.0">
<!-- path if installed in its own web context ccm-ldn-theme <!-- path if installed in its own web context ccm-ldn-theme
<xsl:import href="../../../../ccm-ldn-theme/__ccm__/apps/theme/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-theme/themes/heirloom/apps/theme/xsl/index.xsl"/>
--> -->
<!-- path to xsl if installed in the main (common) web context <!-- path to xsl if installed in the main (common) web context
--> -->

View File

@ -10,7 +10,7 @@
<xsl:import href="/__ccm__/servlet/content-type/index.xsl"/> <xsl:import href="/themes/servlet/content-type/index.xsl"/>
<xsl:import href="Article.xsl"/> <xsl:import href="Article.xsl"/>
<xsl:import href="MultiPartArticle.xsl"/> <xsl:import href="MultiPartArticle.xsl"/>
<xsl:import href="FileStorageItem.xsl"/> <xsl:import href="FileStorageItem.xsl"/>

View File

@ -72,10 +72,13 @@ public class NotesInitializer extends ContentAssetInitializer {
public void init( DomainInitEvent ev ) { public void init( DomainInitEvent ev ) {
super.init( ev ); super.init( ev );
ContentType.registerXSLFile( null, "/themes/heirloom/assets/notes/xsl/index.xsl" ); ContentType.registerXSLFile(
DomainObjectTraversal.registerAdapter( Note.BASE_DATA_OBJECT_TYPE, null,
new SimpleDomainObjectTraversalAdapter(), "/themes/heirloom/contentassets/notes/xsl/index.xsl" );
SimpleXMLGenerator.ADAPTER_CONTEXT ); DomainObjectTraversal.registerAdapter(
Note.BASE_DATA_OBJECT_TYPE,
new SimpleDomainObjectTraversalAdapter(),
SimpleXMLGenerator.ADAPTER_CONTEXT );
SimpleEditStep.addAdditionalDisplayComponent(new NotesSummary()); SimpleEditStep.addAdditionalDisplayComponent(new NotesSummary());
} }
} }

View File

@ -3,22 +3,45 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* The CMS initializer * Executes at each system startup and initializes the Address 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: AddressInitializer.java 1596 2007-07-10 16:25:57Z p_boy $
*/ */
public class AddressInitializer extends ContentTypeInitializer { public class AddressInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(AddressInitializer.class); private static final Logger s_log = Logger.getLogger(AddressInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public AddressInitializer() { public AddressInitializer() {
super("ccm-cms-types-address.pdl.mf", super("ccm-cms-types-address.pdl.mf",
Address.BASE_DATA_OBJECT_TYPE); Address.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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[]{ return new String[]{
"/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl" "/themes/heirloom/contenttypes/Address.xsl"
}; };
} }
} }

View File

@ -21,35 +21,56 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Initializes the Agenda content type. * Executes at each system startup and initializes the Agenda content type.
*
* Defines the content type specific properties and just uses the super class * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;rhs@mit.edu&gt; * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
* @version $Revision: #8 $ $Date: 2004/08/17 $ * @version $Revision: #8 $ $Date: 2004/08/17 $
* @version $Id: AgendaInitializer.java 1596 2007-07-10 16:25:57Z p_boy $ * @version $Id: AgendaInitializer.java 1596 2007-07-10 16:25:57Z p_boy $
**/ */
public class AgendaInitializer extends ContentTypeInitializer { public class AgendaInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(AgendaInitializer.class); private static final Logger s_log = Logger.getLogger(AgendaInitializer.class);
/** /**
* Constructor * Constructor, sets the PDL manifest file and object type string.
*/ */
public AgendaInitializer() { public AgendaInitializer() {
super("ccm-cms-types-agenda.pdl.mf", Agenda.BASE_DATA_OBJECT_TYPE); super("ccm-cms-types-agenda.pdl.mf", Agenda.BASE_DATA_OBJECT_TYPE);
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override
public String getTraversalXML() { public String getTraversalXML() {
return return
"/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Agenda.xml"; "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Agenda.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() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/Agenda.xsl" }; INTERNAL_THEME_TYPES_DIR + "Agenda.xsl" };
} }
} }

View File

@ -21,7 +21,8 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Initializes the GenericArticle content type. * Executes at each system startup and initializes the Article content type.
*
* Defines the content type specific properties and just uses the super class * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * methods to register the content type with the (transient) content type store
* (map). This is done by runtimeRuntime startup method which runs the init() * (map). This is done by runtimeRuntime startup method which runs the init()
@ -32,15 +33,32 @@ import org.apache.log4j.Logger;
*/ */
public class ArticleInitializer extends ContentTypeInitializer { public class ArticleInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(ArticleInitializer.class); private static final Logger s_log = Logger.getLogger(ArticleInitializer.class);
public ArticleInitializer() { /**
super("ccm-cms-types-article.pdl.mf", GenericArticle.BASE_DATA_OBJECT_TYPE); * Constructor, sets the PDL manifest file and object type string.
*/
public ArticleInitializer() {
super("ccm-cms-types-article.pdl.mf", Article.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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[] return new String[]
{ "/static/content-types/com/arsdigita/cms/contenttypes/Article.xsl" }; { "/themes/heirloom/contenttypes/Article.xsl" };
} }
} }

View File

@ -21,25 +21,46 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Initializes the Bookmark content type. * Executes at each system startup and initializes the Bookmark content type.
*
* Defines the content type specific properties and just uses the super class * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: BookmarkInitializer.java 757 2005-09-02 14:12:21Z sskracic $ * @version $Id: BookmarkInitializer.java 757 2005-09-02 14:12:21Z sskracic $
*/ */
public class BookmarkInitializer extends ContentTypeInitializer { public class BookmarkInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(BookmarkInitializer.class); private static final Logger s_log = Logger.getLogger(BookmarkInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public BookmarkInitializer() { public BookmarkInitializer() {
super("ccm-cms-types-bookmark.pdl.mf", super("ccm-cms-types-bookmark.pdl.mf",
Bookmark.BASE_DATA_OBJECT_TYPE); Bookmark.BASE_DATA_OBJECT_TYPE);
} }
/**
* Retrieves 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() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/Bookmark.xsl" INTERNAL_THEME_TYPES_DIR + "Bookmark.xsl"
}; };
} }

View File

@ -4,28 +4,56 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Executes at each system startup and 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). 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; * @author Sören Bernstein;
* @version $Id: ContactInitializer.java 1596 2007-07-10 16:25:57Z p_boy $
*/ */
public class ContactInitializer extends ContentTypeInitializer { public class ContactInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(ContactInitializer.class); private static final Logger s_log = Logger.getLogger(ContactInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public ContactInitializer() { public ContactInitializer() {
super("ccm-cms-types-contact.pdl.mf", super("ccm-cms-types-contact.pdl.mf",
Contact.BASE_DATA_OBJECT_TYPE); Contact.BASE_DATA_OBJECT_TYPE);
}
@Override
public String[] getStylesheets() {
return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/Contact.xsl"
};
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override @Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.xml"; return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.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[] {
INTERNAL_THEME_TYPES_DIR + "Contact.xsl"
};
}
} }

View File

@ -21,28 +21,52 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Initializes the Event content type. * Executes at each system startup and initializes the Event content type.
*
* Defines the content type specific properties and just uses the super class * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;rhs@mit.edu&gt; * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
* @version $Revision: #7 $ $Date: 2004/08/17 $ * @version $Revision: #7 $ $Date: 2004/08/17 $
* @version $Id: EventInitializer.java 1595 2007-07-10 16:14:44Z p_boy $ * @version $Id: EventInitializer.java 1595 2007-07-10 16:14:44Z p_boy $
**/ */
public class EventInitializer extends ContentTypeInitializer { public class EventInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(EventInitializer.class); private static final Logger s_log = Logger.getLogger(EventInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public EventInitializer() { public EventInitializer() {
super("ccm-cms-types-event.pdl.mf", Event.BASE_DATA_OBJECT_TYPE); super("ccm-cms-types-event.pdl.mf", Event.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() { public String[] getStylesheets() {
return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Event.xsl" }; return new String[] { INTERNAL_THEME_TYPES_DIR + "Event.xsl" };
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Event.xml"; return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Event.xml";
} }

View File

@ -21,17 +21,19 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Initializer class to initialize <code>ContentType FAQ</code>. * Executes at each system startup and initializes the FAQ content type.
* *
* Defines the content type specific properties and just uses the super class * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: FAQItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $ * @version $Id: FAQItemInitializer.java 757 2005-09-02 14:12:21Z sskracic $
*/ */
public class FAQItemInitializer extends ContentTypeInitializer { public class FAQItemInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(FAQItemInitializer.class); 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. * Retrieve location of this content type's internal default theme
* @return * 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() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl" INTERNAL_THEME_TYPES_DIR + "FAQItem.xsl"
}; };
} }

View File

@ -21,17 +21,20 @@ package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; 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 * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: FileStorageItemInitializer.java 287 2005-02-22 00:29:02Z sskracic $ * @version $Id: FileStorageItemInitializer.java 287 2005-02-22 00:29:02Z sskracic $
*/ */
public class FileStorageItemInitializer extends ContentTypeInitializer { public class FileStorageItemInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(FileStorageItemInitializer.class); Logger.getLogger(FileStorageItemInitializer.class);
@ -44,22 +47,32 @@ public class FileStorageItemInitializer extends ContentTypeInitializer {
} }
/** /**
* Retrieve location of traversal adapter * Retrieves fully qualified traversal adapter file name.
* @return * @return
*/ */
@Override
public String getTraversalXML() { public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/" + return "WEB-INF/traversal-adapters/com/arsdigita/" +
"cms/contenttypes/FileStorageItem.xml"; "cms/contenttypes/FileStorageItem.xml";
} }
/** /**
* Retrieve location of this content types stylesheet. * Retrieve location of this content type's internal default theme
* @return * 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() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/" + INTERNAL_THEME_TYPES_DIR + "FileStorageItem.xsl"
"cms/contenttypes/FileStorageItem.xsl"
}; };
} }
} }

View File

@ -23,11 +23,12 @@ import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
import org.apache.log4j.Logger; 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 * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;rhs@mit.edu&gt; * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
* @version $Revision: #6 $ $Date: 2004/08/17 $ * @version $Revision: #6 $ $Date: 2004/08/17 $
@ -35,6 +36,7 @@ import org.apache.log4j.Logger;
public class FormItemInitializer extends ContentTypeInitializer { public class FormItemInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(FormItemInitializer.class); 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 * @return
*/ */
@Override
public String getTraversalXML() { public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/" + return "WEB-INF/traversal-adapters/com/arsdigita/" +
"cms/formbuilder/FormItem.xml"; "cms/formbuilder/FormItem.xml";
} }
/** /**
* Retrieve location of this content types stylesheet. Overwrites parent * Retrieve location of this content type's internal default theme
* method with FormItem specific value. * stylesheet(s) which concomitantly serve as a fallback if a custom theme
* @return * 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() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/" + INTERNAL_THEME_TYPES_DIR + "FormItem.xsl"
"cms/contenttypes/FormItem.xsl"
}; };
} }
} }

View File

@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.formbuilder; package com.arsdigita.cms.formbuilder;
import com.arsdigita.cms.contenttypes.ContentTypeInitializer; import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
@ -23,17 +24,20 @@ import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
import org.apache.log4j.Logger; 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 * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;rhs@mit.edu&gt; * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
* @version $Revision: #6 $ $Date: 2004/08/17 $ * @version $Revision: #6 $ $Date: 2004/08/17 $
**/ */
public class FormSectionItemInitializer extends ContentTypeInitializer { public class FormSectionItemInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(FormSectionItemInitializer.class); 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 * @return
*/ */
@Override
public String getTraversalXML() { public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/" + return "WEB-INF/traversal-adapters/com/arsdigita/" +
"cms/formbuilder/FormSectionItem.xml"; "cms/formbuilder/FormSectionItem.xml";
} }
/** /**
* Retrieve location of this content types stylesheet. * Retrieve location of this content type's internal default theme
* @return * 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() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/cms/" + INTERNAL_THEME_TYPES_DIR + "FormSectionItem.xsl"
"contenttypes/FormSectionItem.xsl"
}; };
} }
} }

View File

@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; 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 * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 { public class GlossaryItemInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(GlossaryItemInitializer.class); 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 * Retrieve location of this content type's internal default theme
* method with FormItem specific value for use by the parent class worker * stylesheet(s) which concomitantly serve as a fallback if a custom theme
* methods. * is engaged.
* @return *
* 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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[] { return new String[] {
// "/static/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xsl" // "/static/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xsl"
"/themes/heirloom/contenttypes/GlossaryItem.xsl" INTERNAL_THEME_TYPES_DIR + "GlossaryItem.xsl"
}; };
} }
} }

View File

@ -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 &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: com/arsdigita/cms/contenttypes/HTMLFormInitializer.java#2 $ * @version $Id: com/arsdigita/cms/contenttypes/HTMLFormInitializer.java#2 $
*/ */
public class HTMLFormInitializer extends ContentTypeInitializer { public class HTMLFormInitializer extends ContentTypeInitializer {
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public HTMLFormInitializer() { public HTMLFormInitializer() {
super("ccm-cms-types-htmlform.pdl.mf", HTMLForm.BASE_DATA_OBJECT_TYPE); 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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[] { return new String[] {
// "/static/content-types/com/arsdigita/cms/contenttypes/HTMLForm.xsl" }; // "/static/content-types/com/arsdigita/cms/contenttypes/HTMLForm.xsl" };
"/themes/heirloom/contenttypes/HTMLForm.xsl" }; INTERNAL_THEME_TYPES_DIR + "HTMLForm.xsl" };
} }
} }

View File

@ -16,35 +16,59 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; 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 * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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); * @author Sören Bernstein (sbernstein@zes.uni-bremen.de);
*/ */
public class ImageInitializer extends ContentTypeInitializer { public class ImageInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(ImageInitializer.class); private static final Logger s_log = Logger.getLogger(ImageInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public ImageInitializer() { public ImageInitializer() {
super("ccm-cms-types-image.pdl.mf", Image.BASE_DATA_OBJECT_TYPE); super("ccm-cms-types-image.pdl.mf", Image.BASE_DATA_OBJECT_TYPE);
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override @Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml"; 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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/Image.xsl" }; INTERNAL_THEME_TYPES_DIR + "Image.xsl" };
} }
} }

View File

@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.contenttypes.ContentTypeInitializer; import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
@ -27,22 +28,49 @@ import com.arsdigita.runtime.DomainInitEvent;
import org.apache.log4j.Logger; 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 * @author Jens Pelzetter
*/ */
public class MemberInitializer extends ContentTypeInitializer { public class MemberInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(MemberInitializer.class); private static final Logger s_log = Logger.getLogger(MemberInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public MemberInitializer() { public MemberInitializer() {
super("ccm-cms-types-member.pdl.mf", Member.BASE_DATA_OBJECT_TYPE); 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 @Override
public String[] getStylesheets() { 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 @Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Member.xml"; return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Member.xml";

View File

@ -20,43 +20,73 @@ package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.CMSConfig; import com.arsdigita.cms.CMSConfig;
import com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel; import com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel;
//Unused import
// import com.arsdigita.cms.search.ContentPageMetadataProvider;
import com.arsdigita.kernel.URLService; import com.arsdigita.kernel.URLService;
import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.DomainInitEvent;
import com.arsdigita.search.MetadataProviderRegistry; 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 &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: MultiPartArticleInitializer.java 2212 2011-06-22 08:39:04Z pboy $ * @version $Id: MultiPartArticleInitializer.java 2212 2011-06-22 08:39:04Z pboy $
*/ */
public class MultiPartArticleInitializer extends ContentTypeInitializer { 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() { public MultiPartArticleInitializer() {
super("ccm-cms-types-mparticle.pdl.mf", MultiPartArticle.BASE_DATA_OBJECT_TYPE); super("ccm-cms-types-mparticle.pdl.mf", MultiPartArticle.BASE_DATA_OBJECT_TYPE);
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override @Override
public String getTraversalXML() { public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/MultiPartArticle.xml"; 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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String [] { return new String [] {
"/static/content-types/com/arsdigita/cms/contenttypes/MultiPartArticle.xsl", INTERNAL_THEME_TYPES_DIR + "MultiPartArticle.xsl",
"/static/content-types/com/arsdigita/cms/contenttypes/ArticleSection.xsl" INTERNAL_THEME_TYPES_DIR + "ArticleSection.xsl"
}; };
} }
// Previously used LegacyInitEvent, allthough no legacy init functionality /**
// is used here. Wondering. *
* @param evt
*/
@Override @Override
public void init(DomainInitEvent evt) { public void init(DomainInitEvent evt) {
super.init(evt); super.init(evt);

View File

@ -16,37 +16,62 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; 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 * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * 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 &lt;rhs@mit.edu&gt; * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
* @version $Revision: #7 $ $Date: 2004/08/17 $ * @version $Revision: #7 $ $Date: 2004/08/17 $
* @version $Id: NewsItemInitializer.java 1594 2007-07-10 10:56:11Z p_boy $ * @version $Id: NewsItemInitializer.java 1594 2007-07-10 10:56:11Z p_boy $
**/ */
public class NewsItemInitializer extends ContentTypeInitializer { public class NewsItemInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(NewsItemInitializer.class); private static final Logger s_log = Logger.getLogger(NewsItemInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public NewsItemInitializer() { public NewsItemInitializer() {
super("ccm-cms-types-newsitem.pdl.mf", NewsItem.BASE_DATA_OBJECT_TYPE); super("ccm-cms-types-newsitem.pdl.mf", NewsItem.BASE_DATA_OBJECT_TYPE);
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override
public String getTraversalXML() { public String getTraversalXML() {
return return
"/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/NewsItem.xml"; "/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() { public String[] getStylesheets() {
return new String[] return new String[]
{ "/static/content-types/com/arsdigita/cms/contenttypes/NewsItem.xsl" }; { INTERNAL_THEME_TYPES_DIR + "NewsItem.xsl" };
} }
} }

View File

@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.contenttypes.ContentTypeInitializer; import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
@ -25,25 +26,54 @@ import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.domain.DomainObjectInstantiator;
import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataObject;
import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.DomainInitEvent;
import org.apache.log4j.Logger; 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 * @author Jens Pelzetter
* @version $Id$
*/ */
public class PersonInitializer extends ContentTypeInitializer { public class PersonInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(PersonInitializer.class); private static final Logger s_log = Logger.getLogger(PersonInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public PersonInitializer() { public PersonInitializer() {
super("ccm-cms-types-person.pdl.mf", Person.BASE_DATA_OBJECT_TYPE); 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 @Override
public String[] getStylesheets() { 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 @Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Person.xml"; return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Person.xml";

View File

@ -17,6 +17,7 @@
// //
// $Id: SimpleAddress.pdl 1597 2007-07-10 16:27:26Z p_boy $ // $Id: SimpleAddress.pdl 1597 2007-07-10 16:27:26Z p_boy $
// $DateTime: 2004/08/17 23:15:09 $ // $DateTime: 2004/08/17 23:15:09 $
model com.arsdigita.cms.contenttypes; model com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;

View File

@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObject;
@ -26,7 +27,13 @@ import com.arsdigita.runtime.DomainInitEvent;
import org.apache.log4j.Logger; 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 &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: SimpleAddressInitializer.java 1597 2007-07-10 16:27:26Z p_boy $ * @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); private static final Logger s_log = Logger.getLogger(SimpleAddressInitializer.class);
/** /**
* Constructor * Constructor, sets the PDL manifest file and object type string.
*/ */
public SimpleAddressInitializer() { public SimpleAddressInitializer() {
super("ccm-cms-types-simpleaddress.pdl.mf", super("ccm-cms-types-simpleaddress.pdl.mf",
@ -45,7 +52,7 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
} }
/** /**
* Initializer * Domain Initializer
* @param evt * @param evt
*/ */
@Override @Override
@ -70,15 +77,21 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
} }
/** /**
* Provides location of the stylesheets assoziated with this content type. * Retrieve location of this content type's internal default theme
* (As of 6.6.x it is really used to locate the content type stylesheet, * stylesheet(s) which concomitantly serve as a fallback if a custom theme
* in distinction from locating application stylesheets.) * is engaged.
* @return *
* 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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[] { return new String[] {
// "/static/content-types/com/arsdigita/cms/contenttypes/SimpleAddress.xsl" }; INTERNAL_THEME_TYPES_DIR + "SimpleAddress.xsl" };
"/themes/heirloom/contenttypes/SimpleAddress.xsl" };
} }
} }

View File

@ -72,8 +72,8 @@
</table> </table>
</xsl:template> </xsl:template>
<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="cms:CT_text" <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleAddress']" mode="cms:CT_text"
name="cms:CT_text_com_arsdigita_cms_contenttypes_Address"> name="cms:CT_text_com_arsdigita_cms_contenttypes_SimpleAddress">
<h1 class="title"><xsl:value-of select="./title"/></h1> <h1 class="title"><xsl:value-of select="./title"/></h1>
<xsl:if test="./address"> <xsl:if test="./address">
<span class="subtitle">Address</span> <span class="subtitle">Address</span>

View File

@ -16,12 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Initializes the SiteProxy content type. * Executes at each system startup and initializes the SiteProxy content type.
* *
* Defines the content type specific properties and just uses the super class * Defines the content type specific properties and just uses the super class
* methods to register the content type with the (transient) content type store * methods to register the content type with the (transient) content type store
@ -33,6 +34,7 @@ import org.apache.log4j.Logger;
*/ */
public class SiteProxyInitializer extends ContentTypeInitializer { public class SiteProxyInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(SiteProxyInitializer.class); private static final Logger s_log = Logger.getLogger(SiteProxyInitializer.class);
/** /**
@ -45,15 +47,22 @@ public class SiteProxyInitializer extends ContentTypeInitializer {
} }
/** /**
* Retrieve location of this content types stylesheet. Overwrites parent * Retrieve location of this content type's internal default theme
* method with FormItem specific value for use by the parent class worker * stylesheet(s) which concomitantly serve as a fallback if a custom theme
* methods. * 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 complete path info string * @return complete path info string
*/ */
@Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[] { return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xsl" INTERNAL_THEME_TYPES_DIR + "SiteProxy.xsl"
}; };
} }
} }

View File

@ -1,32 +1,80 @@
/*
* Copyright (C) 2010 Sören Bernstein All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.formbuilder.util.FormbuilderSetup; import com.arsdigita.formbuilder.util.FormbuilderSetup;
import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.DomainInitEvent;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Executes at each system startup and initializes the Survey 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 Sören Bernstein; * @author Sören Bernstein;
* @version $Id: SurveyInitializer.java $ * @version $Id: SurveyInitializer.java $
*/ */
public class SurveyInitializer extends ContentTypeInitializer { public class SurveyInitializer extends ContentTypeInitializer {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(SurveyInitializer.class); private static final Logger s_log = Logger.getLogger(SurveyInitializer.class);
/**
* Constructor, sets the PDL manifest file and object type string.
*/
public SurveyInitializer() { public SurveyInitializer() {
super("ccm-cms-types-survey.pdl.mf", super("ccm-cms-types-survey.pdl.mf",
Survey.BASE_DATA_OBJECT_TYPE); Survey.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 @Override
public String[] getStylesheets() { public String[] getStylesheets() {
return new String[]{ return new String[]{
"/static/content-types/com/arsdigita/cms/contenttypes/Survey.xsl" INTERNAL_THEME_TYPES_DIR + "Survey.xsl"
}; };
} }
/**
* Retrieves fully qualified traversal adapter file name.
* @return
*/
@Override @Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Survey.xml"; return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Survey.xml";

View File

@ -1,5 +1,5 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>

View File

@ -4,11 +4,11 @@
# the full story. # the full story.
# Grabs custom item xsl for CMS # Grabs custom item xsl for CMS
http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url:: http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::-::outputtype::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::.xsl

View File

@ -33,6 +33,7 @@ import org.apache.log4j.Logger;
*/ */
public abstract class CMS { public abstract class CMS {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(CMS.class); private static final Logger s_log = Logger.getLogger(CMS.class);
/** The CMS XML namespace. */ /** The CMS XML namespace. */

View File

@ -94,6 +94,7 @@ import org.apache.log4j.Logger;
*/ */
public final class CMSConfig extends AbstractConfig { public final class CMSConfig extends AbstractConfig {
/** Private Logger instance for debugging purpose. */
private static final Logger s_log = Logger.getLogger(CMSConfig.class); private static final Logger s_log = Logger.getLogger(CMSConfig.class);
/** Private Object to hold one's own instance to return to users. */ /** Private Object to hold one's own instance to return to users. */
private static CMSConfig s_config; private static CMSConfig s_config;

View File

@ -42,7 +42,7 @@ import org.apache.log4j.Logger;
*/ */
public final class ContentSectionConfig extends AbstractConfig { public final class ContentSectionConfig extends AbstractConfig {
/** Private Logger instance. */ /** Private Logger instance for debugging purpose. */
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(ContentSectionConfig.class); Logger.getLogger(ContentSectionConfig.class);

View File

@ -59,6 +59,11 @@ public abstract class ContentTypeInitializer extends CompoundInitializer {
private final String m_objectType; private final String m_objectType;
/** Just a placeholder in abstract method */ /** Just a placeholder in abstract method */
public static final String[] EMPTY_ARRAY = new String[0]; public static final String[] EMPTY_ARRAY = new String[0];
/** Directory holding the internal base theme */
public static final String INTERNAL_THEME_DIR = "/themes/heirloom/";
/** Directory holding the internal base theme */
public static final String INTERNAL_THEME_TYPES_DIR = INTERNAL_THEME_DIR
+ "contenttypes/";
/** /**
* Constructor, sets specific manifest file and object type. * Constructor, sets specific manifest file and object type.
@ -177,21 +182,18 @@ public abstract class ContentTypeInitializer extends CompoundInitializer {
} }
/** /**
* Retrieves a list of style sheets assoziated with a content type. * Retrieves location of a 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.
*
* Has to be overwritten by each specific content types initializer to * Has to be overwritten by each specific content types initializer to
* provide the correct location of its stylesheets. * provide the correct location of its stylesheets.
* *
* @return List (array) of fully qualified file names (relative to docuemnt / * @return List (array) of fully qualified file names (relative to docuemnt /
* context root) to content types style sheets. * context root) to content types style sheets.
* //@deprecated without replacement.
* Since a long time {@link com.arsdigita.templating.PatternStylesheetResolver
* PatternStylesheetResolver} is used to locate stylesheets based on a
* file patterns. Not used anymore (pb 2011.01.20)
*
* Correction:
* As of 6.6.x it is really used to locate the content type stylesheet,
* in distinction from location of applications stylesheets.
*
*/ */
public String[] getStylesheets() { public String[] getStylesheets() {
return EMPTY_ARRAY; return EMPTY_ARRAY;

View File

@ -80,7 +80,7 @@ public class ContentItemXSLServlet extends BaseServlet {
HttpResourceLocator loc = new HttpResourceLocator( HttpResourceLocator loc = new HttpResourceLocator(
Web.getConfig().getHost(), Web.getConfig().getHost(),
Web.getConfig().getDispatcherContextPath(), Web.getConfig().getDispatcherContextPath(),
"/__ccm__/servlet/template", "/themes/servlet/template",
"/index.xsl", "/index.xsl",
params); params);

View File

@ -45,6 +45,7 @@ public class ContentTypeXSLServlet extends BaseServlet {
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(ContentTypeXSLServlet.class); Logger.getLogger(ContentTypeXSLServlet.class);
@Override
protected void doService(HttpServletRequest sreq, protected void doService(HttpServletRequest sreq,
HttpServletResponse sresp) HttpServletResponse sresp)
throws ServletException, IOException { throws ServletException, IOException {

View File

@ -11,7 +11,7 @@
<xsl:import href="types/FileAttachments.xsl"/> <xsl:import href="types/FileAttachments.xsl"/>
<xsl:import href="types/Link.xsl"/> <xsl:import href="types/Link.xsl"/>
<xsl:import href="/__ccm__/servlet/content-type/index.xsl"/> <xsl:import href="/themes/servlet/content-type/index.xsl"/>
<!-- The styling rules for the live view of an UserDefinedContentItem --> <!-- The styling rules for the live view of an UserDefinedContentItem -->
<xsl:template match="cms:item[@javaClass='com.arsdigita.cms.UserDefinedContentItem']"> <xsl:template match="cms:item[@javaClass='com.arsdigita.cms.UserDefinedContentItem']">

View File

@ -57,9 +57,9 @@ then
exit 1 exit 1
fi fi
if [ ! -d ${CCM_HOME_DIR}/__ccm__ ] if [ ! -d ${CCM_HOME_DIR}/templates ]
then then
echo "Error: CCM_HOME_DIR path is invalid \(no __ccm__ directory in CCM_HOME_DIR\)." echo "Error: CCM_HOME_DIR path is invalid \(no templates directory in CCM_HOME_DIR\)."
exit 1 exit 1
fi fi

View File

@ -3,8 +3,8 @@
# "PatternStylesheetResolver". Please read the Javadoc for that file for # "PatternStylesheetResolver". Please read the Javadoc for that file for
# the full story. # the full story.
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::-::outputtype::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
http://::host::/resource/::webapps::/__ccm__/apps/::application::/xsl/::url::.xsl http://::host::/resource/::webapps::/themes/heirloom/apps/::application::/xsl/::url::.xsl

View File

@ -46,7 +46,7 @@ import javax.servlet.ServletException;
* *
* &lt;servlet-mapping&gt; * &lt;servlet-mapping&gt;
* &lt;servlet-name&gt;reg&lt;/servlet-name&gt; * &lt;servlet-name&gt;reg&lt;/servlet-name&gt;
* &lt;url-pattern&gt;/__ccm__/null/reg/*&lt;/url-pattern&gt; * &lt;url-pattern&gt;/templates/null/reg/*&lt;/url-pattern&gt;
* &lt;/servlet-mapping&gt; * &lt;/servlet-mapping&gt;
*</pre> *</pre>
*<p> *<p>

View File

@ -50,7 +50,7 @@ import org.apache.log4j.Logger;
* *
* &lt;servlet-mapping&gt; * &lt;servlet-mapping&gt;
* &lt;servlet-name&gt;legacy-adapter&lt;/servlet-name&gt; * &lt;servlet-name&gt;legacy-adapter&lt;/servlet-name&gt;
* &lt;url-pattern&gt;/__ccm__/servlet/legacy-adapter/*&lt;/url-pattern&gt; * &lt;url-pattern&gt;/themes/servlet/legacy-adapter/*&lt;/url-pattern&gt;
* &lt;/servlet-mapping&gt; * &lt;/servlet-mapping&gt;
* </pre></blockquote> * </pre></blockquote>
* *

View File

@ -133,13 +133,18 @@ import org.apache.log4j.Logger;
public class URL { public class URL {
private static final Logger s_log = Logger.getLogger(URL.class); private static final Logger s_log = Logger.getLogger(URL.class);
/**
* @deprecated
*/
private static final String INTERNAL_DIR = "/__ccm__"; private static final String INTERNAL_DIR = "/__ccm__";
/** /**
* The standard location for JSP files. * The standard location for JSP files.
* @deprecated
*/ */
public static final String JSP_DIR = INTERNAL_DIR + "/jsp"; public static final String JSP_DIR = INTERNAL_DIR + "/jsp";
/** /**
* The standard location for static files. * The standard location for static files.
* @deprecated
*/ */
public static final String STATIC_DIR = INTERNAL_DIR + "/static"; public static final String STATIC_DIR = INTERNAL_DIR + "/static";
/** /**
@ -147,12 +152,14 @@ public class URL {
* No longer in use. * No longer in use.
*/ */
// public static final String XSL_DIR = INTERNAL_DIR + "/xsl"; // public static final String XSL_DIR = INTERNAL_DIR + "/xsl";
public static final String THEMES_DIR = "/themes";
/** /**
* The standard location for servlets. * The standard location for servlets.
*/ */
public static final String SERVLET_DIR = INTERNAL_DIR + "/servlet"; public static final String SERVLET_DIR = THEMES_DIR + "/servlet";
public static final String THEMES_DIR = "/themes";
public static final String INTERNAL_THEME_DIR = THEMES_DIR + "/heirloom"; public static final String INTERNAL_THEME_DIR = THEMES_DIR + "/heirloom";

View File

@ -178,13 +178,13 @@ public class Web {
* to search for the second component 'path'. So, if the * to search for the second component 'path'. So, if the
* 'resource' is: * 'resource' is:
* <pre> * <pre>
* /myproj,ccm-cms,ROOT/__ccm__/apps/content-section/index.sl * /myproj,ccm-cms,ROOT/themes/heirloom/apps/content-section/index.sl
* </pre> * </pre>
* then this method will look for resources at * then this method will look for resources at
* <pre> * <pre>
* /myproj/__ccm__/apps/content-section/index.sl * /myproj/themes/heirloom/apps/content-section/index.sl
* /ccm-cms/__ccm__/apps/content-section/index.sl * /ccm-cms/themes/heirloom/apps/content-section/index.sl
* /ROOT/__ccm__/apps/content-section/index.sl * /ROOT/themes/heirloom/apps/content-section/index.sl
* </pre> * </pre>
* @param resource the resource name * @param resource the resource name
* @return the URL for the resource, or null * @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 resource. The first argument is a list of
* webapp paths to search through for the path. So * webapp paths to search through for the path. So
* if the webapps param is { 'myproj', 'ccm-cms', 'ROOT' } * 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: * then the paths that are searched are:
* <pre> * <pre>
* /myproj/__ccm__/apps/content-section/index.sl * /myproj/themes/heirloom/apps/content-section/index.sl
* /ccm-cms/__ccm__/apps/content-section/index.sl * /ccm-cms/themes/heirloom/apps/content-section/index.sl
* /ROOT/__ccm__/apps/content-section/index.sl * /ROOT/themes/heirloom/apps/content-section/index.sl
* </pre> * </pre>
* @param webapps the list of webapps * @param webapps the list of webapps
* @param path the resource path * @param path the resource path

View File

@ -148,7 +148,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -158,7 +158,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -195,22 +195,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -8,7 +8,7 @@ If shortcuts should be installed as its own web context again following
modifications are necessary: modifications are necessary:
1. remove webapp="xxx" from application.xml 1. remove webapp="xxx" from application.xml
2. move the files in this dir to WEB-INF/ 2. move the files in this dir to WEB-INF/
3. edit __ccm__/.../xsl/index.xsl according the comment 3. edit themes/.../xsl/index.xsl according the comment
xsl dir hab been moved from root dir (not CCM compliant practice) into xsl dir hab been moved from root dir (not CCM compliant practice) into
package/ccm-formbuilder-pdf/xsl/main.xsl package/ccm-formbuilder-pdf/xsl/main.xsl

View File

@ -22,8 +22,9 @@ public class CategorySubtreePageBuilder implements PageBuilder {
// //
// the title of the page is important because we use the xsl in ccm-ldn-aplaws // the title of the page is important because we use the xsl in ccm-ldn-aplaws
// web/__ccm__/themes/aplaws/category-step.xsl that refers to it. This // web/themes/static/aplaws/category-step.xsl that refers to it. This
// matches the page defined in ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp // matches the page defined in
// ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp
Page page = new EmptyPage(); Page page = new EmptyPage();
page.setTitle("childCategories"); page.setTitle("childCategories");

View File

@ -10,8 +10,8 @@ modifications are necessary:
2. move the files in this dir to WEB-INF/ 2. move the files in this dir to WEB-INF/
3. change src/com/ad/london/forum/Forum.java 3. change src/com/ad/london/forum/Forum.java
method getServletContext() as back to "/files" method getServletContext() as back to "/files"
4. edit __ccm__/.../xsl/index.xsl according the comment 4. edit themes/.../xsl/index.xsl according the comment
5. edit in ccm-ldn-aplaws /web/__ccm__/themes/aplaws/forum* 5. edit in ccm-ldn-aplaws /web/themes/static/aplaws/forum*
according to the comment according to the comment

View File

@ -59,7 +59,7 @@ information entered up to that point. On our site we live with this small risk
but mitigate it by restarting servers at unsociable hours where possible. but mitigate it by restarting servers at unsociable hours where possible.
I have put examle theme files in I have put examle theme files in
ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example: forum-index.xsl, ccm-ldn-aplaws/web/themes/static/aplaws/forum-example: forum-index.xsl,
forum-index.css and the contents of images/forum forum-index.css and the contents of images/forum
To have a look at a forum using these files, copy the xsl and css to the top To have a look at a forum using these files, copy the xsl and css to the top

View File

@ -1,4 +1,4 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>ForumServlet</servlet-name> <servlet-name>ForumServlet</servlet-name>
<url-pattern>/__ccm__/servlet/forum/*</url-pattern> <url-pattern>/themes/servlet/forum/*</url-pattern>
</servlet-mapping> </servlet-mapping>

View File

@ -351,7 +351,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -427,7 +427,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -437,7 +437,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -472,22 +472,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -329,7 +329,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -405,7 +405,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -415,7 +415,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -450,22 +450,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -351,7 +351,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -427,7 +427,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -437,7 +437,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -472,22 +472,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -351,7 +351,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -427,7 +427,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -437,7 +437,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -472,22 +472,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -351,7 +351,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -427,7 +427,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -437,7 +437,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -472,22 +472,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -4,11 +4,11 @@
# the full story. # the full story.
# Output type is for things such as text/javascript # Output type is for things such as text/javascript
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::outputtype::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
# Grabs custom item xsl for CMS # Grabs custom item xsl for CMS
http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url:: http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
# added by Quasimodo # added by Quasimodo
# Theme with single entry point (e.g Mandalay) # Theme with single entry point (e.g Mandalay)
@ -37,8 +37,8 @@ http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::lo
http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
# Global default, from application's own web app # Global default, from application's own web app
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
# Global default, from application's own web app - relocated version >= 6.6.1 # Global default, from application's own web app - relocated version >= 6.6.1
http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl

View File

@ -355,7 +355,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>portlet-type-xsl</servlet-name> <servlet-name>portlet-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -431,7 +431,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>reg</servlet-name> <servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern> <url-pattern>/themes/null/reg/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -441,7 +441,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>legacy-adapter</servlet-name> <servlet-name>legacy-adapter</servlet-name>
<url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
@ -476,22 +476,22 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>content-section</servlet-name> <servlet-name>content-section</servlet-name>
<url-pattern>/__ccm__/servlet/content-section/*</url-pattern> <url-pattern>/themes/servlet/content-section/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-item-xsl</servlet-name> <servlet-name>content-item-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-item/*</url-pattern> <url-pattern>/themes/servlet/content-item/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>content-type-xsl</servlet-name> <servlet-name>content-type-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/content-type/*</url-pattern> <url-pattern>/themes/servlet/content-type/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>template-xsl</servlet-name> <servlet-name>template-xsl</servlet-name>
<url-pattern>/__ccm__/servlet/template/*</url-pattern> <url-pattern>/themes/servlet/template/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0"> version="1.0">
<!-- <!--
<xsl:import href="../../../../ROOT/__ccm__/apps/admin/xsl/index.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/admin/xsl/index.xsl"/>
--> -->
<xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/> <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>

View File

@ -5,11 +5,11 @@
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
<xsl:import href="../../../../ccm-ldn-atoz/__ccm__/apps/atoz/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-atoz/themes/heirloom/apps/atoz/xsl/index.xsl"/>
--> -->
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
--> -->
<xsl:import href="../../../__ccm__/apps/atoz/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/atoz/xsl/index.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>
<xsl:param name="theme-prefix"/> <xsl:param name="theme-prefix"/>

View File

@ -12,12 +12,12 @@
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
--> -->
<!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
--> -->
<xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/content-section/xsl/index.xsl"/>
<xsl:import href="lib/header.xsl"/> <xsl:import href="lib/header.xsl"/>
<xsl:import href="lib/lib.xsl"/> <xsl:import href="lib/lib.xsl"/>

View File

@ -13,5 +13,5 @@ color: #6F3 !important;
.dark { .dark {
color: #336 !important; color: #336 !important;
font-style: bold !important; font-weight: bold !important;
} }

View File

@ -26,7 +26,7 @@
<!-- The file ~/lib/page.css does not exist at least since version 1.0.2 <!-- The file ~/lib/page.css does not exist at least since version 1.0.2
there exists a file of this name in there exists a file of this name in
ccm-cms/web/__ccm__/static/cms/admin/page/page.css ccm-cms/web/themes/packages/cms/admin/page/page.css
may be a copy&paste error --> may be a copy&paste error -->
<xsl:template name="aplaws:headerStyleSheets"> <xsl:template name="aplaws:headerStyleSheets">
<link rel="stylesheet" href="{$theme-prefix}/lib/page.css" type="text/css" media="screen"/> <link rel="stylesheet" href="{$theme-prefix}/lib/page.css" type="text/css" media="screen"/>

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0"> version="1.0">
<xsl:import href="../../../../ROOT/__ccm__/apps/navigation/xsl/admin.xsl"/> <xsl:import href="../../../../ROOT/themes/heirloom/apps/navigation/xsl/admin.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>
<xsl:param name="theme-prefix" /> <xsl:param name="theme-prefix" />

View File

@ -11,7 +11,7 @@
exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal" exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"
version="1.0"> version="1.0">
<!-- <xsl:import href="../../../__ccm__/apps/workspace/xsl/index.xsl"/> --> <!-- <xsl:import href="../../../themes/heirloom/apps/workspace/xsl/index.xsl"/> -->
<xsl:import href="../../heirloom/apps/portal-workspace/xsl/index.xsl"/> <xsl:import href="../../heirloom/apps/portal-workspace/xsl/index.xsl"/>
<xsl:import href="portal/lib.xsl"/> <xsl:import href="portal/lib.xsl"/>

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0"> version="1.0">
<!-- <xsl:import href="../../../__ccm__/apps/workspace/xsl/admin.xsl"/> --> <!-- <xsl:import href="../../../themes/heirloom/apps/workspace/xsl/admin.xsl"/> -->
<xsl:import href="../../heirloom/apps/portal-workspace/xsl/admin.xsl"/> <xsl:import href="../../heirloom/apps/portal-workspace/xsl/admin.xsl"/>
<xsl:import href="lib/page.xsl"/> <xsl:import href="lib/page.xsl"/>

View File

@ -12,10 +12,10 @@
version="1.0"> version="1.0">
<!-- path if installed in its own web context ccm-ldn-search <!-- path if installed in its own web context ccm-ldn-search
<xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/> <xsl:import href="../../../../ccm-ldn-search/themes/heirloom/apps/search/xsl/index.xsl"/>
--> -->
<!-- path to xsl if installed in the main (common) web context <!-- path to xsl if installed in the main (common) web context
--> -->
<xsl:import href="../../../__ccm__/apps/search/xsl/index.xsl"/> <xsl:import href="../../../themes/heirloom/apps/search/xsl/index.xsl"/>
</xsl:stylesheet> </xsl:stylesheet>

Some files were not shown because too many files have changed in this diff Show More