diff --git a/ccm-cms-types-member/application.xml b/ccm-cms-types-member/application.xml index 9e5203211..8e6168bed 100644 --- a/ccm-cms-types-member/application.xml +++ b/ccm-cms-types-member/application.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - Member type for OpenCCM - + name="ccm-cms-types-member" + prettyName="Red Hat CCM Content Types" + version="6.6.0" + release="1" + webapp="ROOT"> + + + + + + + + + + + + + + Member type for OpenCCM + - + diff --git a/ccm-cms-types-member/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Member.xml b/ccm-cms-types-member/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Member.xml index 9df8ccf00..8052d86f9 100644 --- a/ccm-cms-types-member/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Member.xml +++ b/ccm-cms-types-member/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Member.xml @@ -1,28 +1,28 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> - - - - - + - - - - + + + + + + + + diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java index 29fe68d58..ed9501d15 100644 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java +++ b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentType; @@ -67,5 +66,5 @@ public class Member extends Person { Assert.exists(getContentType(), ContentType.class); } - /* accessors *****************************************************/ + /* accessors *****************************************************/ } diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java index 6a2edf9cf..7cea40516 100644 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java +++ b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberInitializer.java @@ -35,13 +35,7 @@ public class MemberInitializer extends ContentTypeInitializer { private static final Logger s_log = Logger.getLogger(MemberInitializer.class); public MemberInitializer() { - super("ccm-cms-types-member.pdl.mf", - Member.BASE_DATA_OBJECT_TYPE); - } - - @Override - public void init(DomainInitEvent evt) { - super.init(evt); + super("ccm-cms-types-member.pdl.mf", Member.BASE_DATA_OBJECT_TYPE); } @Override diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberLoader.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberLoader.java index 65779b4da..8e677342d 100644 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberLoader.java +++ b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberLoader.java @@ -19,17 +19,12 @@ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; - -import org.apache.log4j.Logger; - /** * * @author Jens Pelzetter */ public class MemberLoader extends AbstractContentTypeLoader { - private static final Logger s_log = Logger.getLogger(MemberLoader.class); private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Member.xml" };