Synchronize with fedorahosted, coventry content type adapted to Aplaws, not yet finished.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4000 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2016-04-15 20:46:24 +00:00
parent eb2cd7d96d
commit 97b36159de
8 changed files with 32 additions and 57 deletions

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<ccm:application name="ccm-ldn-coventry-councillor"
prettyName="Red Hat CCM Content Types"
version="1.0.1"
release="3"
webapp="ROOT"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
name="ccm-ldn-types-councillor"
prettyName="Red Hat CCM Content Types"
version="6.6.0"
release="1"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
<ccm:requires name="ccm-ldn-coventry-person" version="1.0.1"/>
<!-- <ccm:requires name="ccm-ldn-coventry-person" version="1.0.1"/> -->
</ccm:dependencies>
<ccm:directories>
@ -26,7 +26,9 @@
</ccm:contacts>
<ccm:description>
The Address Content Type for the Red Hat CCM CMS.
The Councillor Content Type for APLAWS+.
It's a refactoring of the Coventry contribution's Councillor content type.
</ccm:description>
</ccm:application>

View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<ccm:application name="ccm-ldn-coventry-person"
prettyName="Red Hat CCM Content Types"
version="1.0.1"
release="3"
webapp="ROOT"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
</ccm:dependencies>
<ccm:directories>
<ccm:directory name="pdl"/>
<ccm:directory name="sql"/>
<ccm:directory name="src"/>
<ccm:directory name="web"/>
</ccm:directories>
<ccm:contacts>
<ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
<ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
</ccm:contacts>
<ccm:description>
The Address Content Type for the Red Hat CCM CMS.
</ccm:description>
</ccm:application>

View File

@ -16,12 +16,14 @@
model com.arsdigita.coventry.cms.contenttypes;
import com.arsdigita.cms.TextPage;
import com.arsdigita.coventry.cms.contenttypes.Person;
// import com.arsdigita.cms.TextPage; Had been merged into ContentPage
import com.arsdigita.cms.ContentPage;
//import com.arsdigita.coventry.cms.contenttypes.Person;
import com.arsdigita.cms.contenttypes.ldn.Person;
// object type to hold extended attributes of event content type
object type Councillor extends com.arsdigita.coventry.cms.contenttypes.Person {
object type Councillor extends com.arsdigita.cms.contenttypes.ldn.Person {
String [0..1] position = cov_councillors.position VARCHAR(4000);
String [0..1] politicalParty = cov_councillors.political_party VARCHAR(1000);
String [0..1] ward = cov_councillors.ward VARCHAR(1000);

View File

@ -16,11 +16,12 @@
model com.arsdigita.coventry.cms.contenttypes;
import com.arsdigita.cms.TextPage;
// import com.arsdigita.cms.TextPage;
import com.arsdigita.cms.ContentPage;
// object type to hold extended attributes of event content type
object type Person extends TextPage {
object type Person extends ContentPage {
String [0..1] description = cov_persons.description VARCHAR(4000);
String [0..1] contactDetails = cov_persons.contact_details VARCHAR(4000);
reference key (cov_persons.item_id);

View File

@ -2,8 +2,8 @@
<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-type label="Coventry Councillor"
description="A Coventry councillor type"
objectType="com.arsdigita.coventry.cms.contenttypes.Councillor"
classname="com.arsdigita.coventry.cms.contenttypes.Councillor">
objectType="com.arsdigita.cms.contenttypes.ldn.Councillor"
classname="com.arsdigita.cms.contenttypes.ldn.Councillor">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">

View File

@ -2,8 +2,8 @@
<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-type label="Coventry Person"
description="A Coventry person type"
objectType="com.arsdigita.coventry.cms.contenttypes.Person"
classname="com.arsdigita.coventry.cms.contenttypes.Person">
objectType="com.arsdigita.cms.contenttypes.ldn.Person"
classname="com.arsdigita.cms.contenttypes.ldn.Person">
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">

View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
<xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
<xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
<xrd:adapter objectType="com.arsdigita.coventry.cms.contenttypes.Councillor" extends="com.arsdigita.cms.TextPage" traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
<xrd:adapter objectType="com.arsdigita.cms.contenttypes.ldn.Councillor"
extends="com.arsdigita.cms.ContentPage"
traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
<xrd:associations rule="include">
<xrd:property name="/object/textAsset"/>
</xrd:associations>

View File

@ -15,23 +15,20 @@
package com.arsdigita.cms.contenttypes.ldn;
import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader;
/**
* Loader.
*
* @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: CouncillorLoader.java 1489 2007-03-19 11:39:58Z apevec $
*/
public class CouncillorLoader extends AbstractContentTypeLoader {
public final static String versionId =
"$Id: CouncillorLoader.java 1489 2007-03-19 11:39:58Z apevec $" +
"$Author: apevec $" +
"$DateTime: 2003/12/19 16:20:50 $";
private static final String[] TYPES = {
"/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Councillor.xml"
"/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Councillor.xml"
};
@Override
public String[] getTypes() {
return TYPES;
}