From bede2ff49885959bbae6f933864c35370e5d3590 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 20 Jul 2011 09:36:59 +0000 Subject: [PATCH] ccm-sci-publicpersonalprofile (SciPublicPersonalProfile) in ccm-cms-publicpersonalprofile (PublicPersonalProfile) umbenannt. git-svn-id: https://svn.libreccm.org/ccm/trunk@1026 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms-publicpersonalprofile/application.xml | 24 +++++++++++++ .../content-types/PublicPersonalProfile.pdl | 27 +++++++++++++++ .../postgres-create.sql | 0 .../contenttypes/PublicPersonalProfile.xml | 28 +++++++-------- .../contenttypes/PublicPersonalProfile.xml | 2 +- .../src/ccm-cms-publicpersonalprofile.config | 5 +++ .../src/ccm-cms-publicpersonalprofile.load | 16 +++++++++ .../contenttypes/PublicPersonalProfile.java | 14 ++++---- .../PublicPersonalProfileConfig.java | 24 +++++++------ ...PersonalProfileConfig_parameter.properties | 9 +++++ .../PublicPersonalProfileInitializer.java | 14 ++++---- .../PublicPersonalProfileLoader.java | 6 ++-- .../ui/PublicPersonalProfileCreate.java | 24 ++++++------- ...ublicPersonalProfileGlobalizationUtil.java | 4 +-- ...ublicPersonalProfileNavigationAddForm.java | 18 +++++----- .../PublicPersonalProfileNavigationStep.java | 12 +++---- .../PublicPersonalProfileNavigationTable.java | 34 +++++++++---------- .../PublicPersonalProfilePropertiesStep.java | 34 +++++++++---------- .../ui/PublicPersonalProfilePropertyForm.java | 32 ++++++++--------- .../PublicPersonalProfileResources.properties | 9 +++++ ...blicPersonalProfileResources_de.properties | 9 +++++ .../contenttypes/PublicPersonalProfile.xsl | 8 ++--- .../com/arsdigita/runtime/ConfigRegistry.java | 8 ++--- ccm-sci-publicpersonalprofile/application.xml | 32 ----------------- .../SciPublicPersonalProfile.pdl | 27 --------------- .../src/ccm-sci-publicpersonalprofile.config | 5 --- .../src/ccm-sci-publicpersonalprofile.load | 26 -------------- ...PersonalProfileConfig_parameter.properties | 9 ----- ...iPublicPersonalProfileResources.properties | 9 ----- ...blicPersonalProfileResources_de.properties | 12 ------- 30 files changed, 229 insertions(+), 252 deletions(-) create mode 100644 ccm-cms-publicpersonalprofile/application.xml create mode 100644 ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl rename {ccm-sci-publicpersonalprofile/sql/ccm-sci-publicpersonalprofile => ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile}/postgres-create.sql (100%) rename ccm-sci-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml => ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml (50%) rename ccm-sci-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml => ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml (96%) create mode 100644 ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.config create mode 100644 ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.load rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfile.java (82%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig.java (60%) create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig_parameter.properties rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileInitializer.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileInitializer.java (50%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileLoader.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileLoader.java (68%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileCreate.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java (87%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileGlobalizationUtil.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileGlobalizationUtil.java (85%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationAddForm.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java (79%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationStep.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationStep.java (66%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationTable.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java (82%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertiesStep.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertiesStep.java (66%) rename ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertyForm.java => ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java (63%) create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties rename ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl => ccm-cms-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xsl (65%) delete mode 100644 ccm-sci-publicpersonalprofile/application.xml delete mode 100644 ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/SciPublicPersonalProfile.pdl delete mode 100644 ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config delete mode 100644 ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load delete mode 100644 ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig_parameter.properties delete mode 100644 ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources.properties delete mode 100644 ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources_de.properties diff --git a/ccm-cms-publicpersonalprofile/application.xml b/ccm-cms-publicpersonalprofile/application.xml new file mode 100644 index 000000000..40bbc45fa --- /dev/null +++ b/ccm-cms-publicpersonalprofile/application.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + Aggreates informations about a SciMember item. + + diff --git a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl new file mode 100644 index 000000000..641a66081 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl @@ -0,0 +1,27 @@ +model com.arsdigita.cms.contenttypes; + +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.cms.*; + +object type PublicPersonalProfile extends ContentPage { + + String[0..1] profileUrl = ct_public_personal_profiles.profile_url VARCHAR(256); + Boolean[0..1] showPublicationList = ct_public_personal_profiles.show_publication_list BIT; + Boolean[0..1] showProjectList = ct_public_personal_profiles.show_project_list BIT; + + reference key (ct_public_personal_profiles.profile_id); +} + +association { + + PublicPersonalProfile[0..n] profile = join cms_persons.person_id + to ct_public_personal_profile_owner_map.owner_id, + join ct_public_personal_profile_owner_map.profile_id + to ct_public_personal_profiles.profile_id; + + GenericPerson[0..n] owner = join ct_public_personal_profiles.profile_id + to ct_public_personal_profile_owner_map.profile_id, + join ct_public_personal_profile_owner_map.owner_id + to cms_persons.person_id; +} + diff --git a/ccm-sci-publicpersonalprofile/sql/ccm-sci-publicpersonalprofile/postgres-create.sql b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/postgres-create.sql similarity index 100% rename from ccm-sci-publicpersonalprofile/sql/ccm-sci-publicpersonalprofile/postgres-create.sql rename to ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/postgres-create.sql diff --git a/ccm-sci-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml b/ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml similarity index 50% rename from ccm-sci-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml rename to ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml index 15c78502c..6e29dfe3c 100644 --- a/ccm-sci-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml +++ b/ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml @@ -4,28 +4,28 @@ xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> + objectType="com.arsdigita.cms.contenttypes.PublicPersonalProfile" + classname="com.arsdigita.cms.contenttypes.PublicPersonalProfile"> - + diff --git a/ccm-sci-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml b/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml similarity index 96% rename from ccm-sci-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml rename to ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml index fefaf9e96..9bfbd6985 100644 --- a/ccm-sci-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml +++ b/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml @@ -6,7 +6,7 @@ - diff --git a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.config b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.config new file mode 100644 index 000000000..a542fac7b --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.config @@ -0,0 +1,5 @@ + + + + diff --git a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.load b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.load new file mode 100644 index 000000000..e0f2f9776 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.load @@ -0,0 +1,16 @@ + + + +
+
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfile.java similarity index 82% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfile.java index 3c5a91ac6..61c1ecadf 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfile.java @@ -14,32 +14,32 @@ import com.arsdigita.util.Assert; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfile extends ContentPage { +public class PublicPersonalProfile extends ContentPage { public static final String OWNER = "owner"; public static final String PROFILE_URL = "profileUrl"; public static final String BASE_DATA_OBJECT_TYPE = - "com.arsdigita.cms.contenttypes.SciPublicPersonalProfile"; + "com.arsdigita.cms.contenttypes.PublicPersonalProfile"; - public SciPublicPersonalProfile() { + public PublicPersonalProfile() { this(BASE_DATA_OBJECT_TYPE); } - public SciPublicPersonalProfile(BigDecimal id) + public PublicPersonalProfile(BigDecimal id) throws DataObjectNotFoundException { this(new OID(BASE_DATA_OBJECT_TYPE, id)); } - public SciPublicPersonalProfile(OID oid) + public PublicPersonalProfile(OID oid) throws DataObjectNotFoundException { super(oid); } - public SciPublicPersonalProfile(DataObject dobj) { + public PublicPersonalProfile(DataObject dobj) { super(dobj); } - public SciPublicPersonalProfile(String type) { + public PublicPersonalProfile(String type) { super(type); } diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig.java similarity index 60% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig.java index d3b9cd451..57820543a 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig.java @@ -10,31 +10,33 @@ import com.arsdigita.util.parameter.Parameter; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileConfig extends AbstractConfig { +public class PublicPersonalProfileConfig extends AbstractConfig { private final Parameter showUnfinishedParts; private final Parameter personType; - public SciPublicPersonalProfileConfig() { + public PublicPersonalProfileConfig() { showUnfinishedParts = new BooleanParameter( - "com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.show_unfinished_parts", - Parameter.REQUIRED, - Boolean.FALSE); - personType = new StringParameter("com.arsdigita.cms.contenttypes.PublicPersonalProfile.person_type", + "com.arsdigita.cms.contenttypes.PublicPersonalProfile.show_unfinished_parts", Parameter.REQUIRED, - "com.arsdigita.cms.contenttypes.GenericPerson"); - + Boolean.FALSE); + personType = + new StringParameter( + "com.arsdigita.cms.contenttypes.PublicPersonalProfile.person_type", + Parameter.REQUIRED, + "com.arsdigita.cms.contenttypes.GenericPerson"); + register(showUnfinishedParts); register(personType); - + loadInfo(); } - + public final boolean getShowUnFinishedParts() { return (Boolean) get(showUnfinishedParts); } - + public final String getPersonType() { return (String) get(personType); } diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig_parameter.properties b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig_parameter.properties new file mode 100644 index 000000000..616d6c6f1 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileConfig_parameter.properties @@ -0,0 +1,9 @@ +com.arsdigita.cms.contenttypes.PublicPersonalProfile.show_unfinished_parts.title = Show parts of the PublicPersonalProfile which do not work yet. +com.arsdigita.cms.contenttypes.PublicPersonalProfile.show_unfinished_parts.purpose = Show parts of the PublicPersonalProfile which do not work yet. +com.arsdigita.cms.contenttypes.PublicPersonalProfile.show_unfinished_parts.example = false +com.arsdigita.cms.contenttypes.PublicPersonalProfile.show_unfinished_parts.format = [boolean] + +com.arsdigita.cms.contenttypes.PublicPersonalProfile.person_type.title = Class to restrict the selectable persons to. +com.arsdigita.cms.contenttypes.PublicPersonalProfile.person_type.purpose = Class to restrict the selectable persons to. +com.arsdigita.cms.contenttypes.PublicPersonalProfile.person_type.example = com.arsdigita.cms.contenttypes.GenericPerson +com.arsdigita.cms.contenttypes.PublicPersonalProfile.person_type.format = [string] \ No newline at end of file diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileInitializer.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileInitializer.java similarity index 50% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileInitializer.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileInitializer.java index 1a5cf8f89..10ee7b0fc 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileInitializer.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileInitializer.java @@ -7,25 +7,25 @@ import org.apache.log4j.Logger; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileInitializer extends ContentTypeInitializer { +public class PublicPersonalProfileInitializer extends ContentTypeInitializer { - private static final Logger logger = Logger.getLogger(SciPublicPersonalProfileInitializer.class); + private static final Logger logger = Logger.getLogger(PublicPersonalProfileInitializer.class); - public SciPublicPersonalProfileInitializer() { - super("ccm-sci-publicpersonalprofile.pdl.mf", - SciPublicPersonalProfile.BASE_DATA_OBJECT_TYPE); + public PublicPersonalProfileInitializer() { + super("ccm-cms-publicpersonalprofile.pdl.mf", + PublicPersonalProfile.BASE_DATA_OBJECT_TYPE); } @Override public String[] getStylesheets() { return new String[]{ - "/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl" + "/static/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xsl" }; } @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml"; } } diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileLoader.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileLoader.java similarity index 68% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileLoader.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileLoader.java index 0baadd849..2d5550051 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileLoader.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileLoader.java @@ -5,15 +5,15 @@ package com.arsdigita.cms.contenttypes; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileLoader extends AbstractContentTypeLoader { +public class PublicPersonalProfileLoader extends AbstractContentTypeLoader { - public SciPublicPersonalProfileLoader() { + public PublicPersonalProfileLoader() { super(); } private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/" - + "SciPublicPersonalProfile.xml" + + "PublicPersonalProfile.xml" }; @Override diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileCreate.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java similarity index 87% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileCreate.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java index 4828abb15..3590fd49c 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileCreate.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java @@ -20,8 +20,8 @@ import com.arsdigita.cms.ContentTypeCollection; import com.arsdigita.cms.Folder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.GenericPerson; -import com.arsdigita.cms.contenttypes.SciPublicPersonalProfile; -import com.arsdigita.cms.contenttypes.SciPublicPersonalProfileConfig; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; +import com.arsdigita.cms.contenttypes.PublicPersonalProfileConfig; import com.arsdigita.cms.ui.authoring.ApplyWorkflowFormSection; import com.arsdigita.cms.ui.authoring.CreationSelector; import com.arsdigita.cms.ui.authoring.LanguageWidget; @@ -39,17 +39,17 @@ import java.util.Date; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileCreate extends PageCreate { +public class PublicPersonalProfileCreate extends PageCreate { private static final String SELECTED_PERSON = "selectedPerson"; - private static final SciPublicPersonalProfileConfig config = - new SciPublicPersonalProfileConfig(); + private static final PublicPersonalProfileConfig config = + new PublicPersonalProfileConfig(); static { config.load(); } - public SciPublicPersonalProfileCreate(final ItemSelectionModel itemModel, + public PublicPersonalProfileCreate(final ItemSelectionModel itemModel, final CreationSelector parent) { super(itemModel, parent); } @@ -67,10 +67,10 @@ public class SciPublicPersonalProfileCreate extends PageCreate { add(new Label(GlobalizationUtil.globalize("cms.ui.language.field"))); add(new LanguageWidget(LANGUAGE)); - add(new Label(SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.create.select_person"))); + add(new Label(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.create.select_person"))); ParameterModel ownerModel = - new StringParameter(SciPublicPersonalProfile.OWNER); + new StringParameter(PublicPersonalProfile.OWNER); SingleSelect ownerSelect = new SingleSelect(ownerModel); ownerSelect.addValidationListener(new NotNullValidationListener()); @@ -118,7 +118,7 @@ public class SciPublicPersonalProfileCreate extends PageCreate { Folder folder = m_parent.getFolder(fse.getPageState()); Assert.exists(folder); String id = (String) fse.getFormData().get( - SciPublicPersonalProfile.OWNER); + PublicPersonalProfile.OWNER); GenericPerson owner = new GenericPerson(new BigDecimal(id)); @@ -139,7 +139,7 @@ public class SciPublicPersonalProfileCreate extends PageCreate { Assert.exists(section, ContentSection.class); String id = (String) fse.getFormData().get( - SciPublicPersonalProfile.OWNER); + PublicPersonalProfile.OWNER); GenericPerson owner = new GenericPerson(new BigDecimal(id)); String name = String.format("%s-profile", @@ -159,7 +159,7 @@ public class SciPublicPersonalProfileCreate extends PageCreate { bundle.setContentSection(m_parent.getContentSection(state)); bundle.save(); - SciPublicPersonalProfile profile = new SciPublicPersonalProfile(item. + PublicPersonalProfile profile = new PublicPersonalProfile(item. getOID()); profile.setOwner(owner); profile.save(); diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileGlobalizationUtil.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileGlobalizationUtil.java similarity index 85% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileGlobalizationUtil.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileGlobalizationUtil.java index 285d56342..7d6b225bb 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileGlobalizationUtil.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileGlobalizationUtil.java @@ -7,10 +7,10 @@ import com.arsdigita.globalization.GlobalizedMessage; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileGlobalizationUtil { +public class PublicPersonalProfileGlobalizationUtil { public static final String BUNDLE_NAME = - "com.arsdigita.cms.contenttypes.ui.SciPublicPersonalProfileResources"; + "com.arsdigita.cms.contenttypes.ui.PublicPersonalProfileResources"; public static GlobalizedMessage globalize(String key) { return new GlobalizedMessage(key, BUNDLE_NAME); diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationAddForm.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java similarity index 79% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationAddForm.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java index 0d9a14bfc..e1ba4c382 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationAddForm.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java @@ -22,32 +22,32 @@ import org.apache.log4j.Logger; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileNavigationAddForm +public class PublicPersonalProfileNavigationAddForm extends BasicItemForm implements FormProcessListener, FormInitListener { private static final Logger logger = Logger.getLogger( - SciPublicPersonalProfileNavigationAddForm.class); - private SciPublicPersonalProfileNavigationStep step; + PublicPersonalProfileNavigationAddForm.class); + private PublicPersonalProfileNavigationStep step; private ItemSearchWidget itemSearch; private final String ITEM_SEARCH = "itemSearch"; private ItemSelectionModel itemModel; private SimpleEditStep editStep; - public SciPublicPersonalProfileNavigationAddForm( + public PublicPersonalProfileNavigationAddForm( ItemSelectionModel itemModel, SimpleEditStep editStep) { - super("SciPublicPersonalProfileNavAddForm", itemModel); + super("PublicPersonalProfileNavAddForm", itemModel); this.itemModel = itemModel; this.editStep = editStep; } @Override public void addWidgets() { - add(new Label((String) SciPublicPersonalProfileGlobalizationUtil. - globalize("scipublicpersonalprofile.ui.nav.select_nav_item"). + add(new Label((String) PublicPersonalProfileGlobalizationUtil. + globalize("publicpersonalprofile.ui.nav.select_nav_item"). localize())); ParameterModel navItemModel = new StringParameter("navItemName"); SingleSelect navItemSelect = new SingleSelect(navItemModel); @@ -59,8 +59,8 @@ public class SciPublicPersonalProfileNavigationAddForm navItemSelect.addOption(new Option(nav)); } - add(new Label((String) SciPublicPersonalProfileGlobalizationUtil. - globalize("scipublicpersonalprofile.ui.nav.select_target"). + add(new Label((String) PublicPersonalProfileGlobalizationUtil. + globalize("publicpersonalprofile.ui.nav.select_target"). localize())); itemSearch = new ItemSearchWidget(ITEM_SEARCH); add(this.itemSearch); diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationStep.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationStep.java similarity index 66% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationStep.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationStep.java index 1724cbca7..bfdae2749 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationStep.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationStep.java @@ -11,29 +11,29 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileNavigationStep extends SimpleEditStep { +public class PublicPersonalProfileNavigationStep extends SimpleEditStep { public static final String EDIT_NAV_SHEET_NAME = "editNav"; - public SciPublicPersonalProfileNavigationStep( + public PublicPersonalProfileNavigationStep( final ItemSelectionModel itemModel, final AuthoringKitWizard parent) { this(itemModel, parent, null); } - public SciPublicPersonalProfileNavigationStep( + public PublicPersonalProfileNavigationStep( final ItemSelectionModel itemModel, final AuthoringKitWizard parent, final String prefix) { super(itemModel, parent, prefix); - BasicItemForm editNavSheet = new SciPublicPersonalProfileNavigationAddForm(itemModel, this); + BasicItemForm editNavSheet = new PublicPersonalProfileNavigationAddForm(itemModel, this); add(EDIT_NAV_SHEET_NAME, - (String) SciPublicPersonalProfileGlobalizationUtil.globalize("scipublicpersonalprofile.ui.profile.nav_add").localize(), + (String) PublicPersonalProfileGlobalizationUtil.globalize("publicpersonalprofile.ui.profile.nav_add").localize(), new WorkflowLockedComponentAccess(editNavSheet, itemModel), editNavSheet.getSaveCancelSection().getCancelButton()); - SciPublicPersonalProfileNavigationTable navTable = new SciPublicPersonalProfileNavigationTable(itemModel, this); + PublicPersonalProfileNavigationTable navTable = new PublicPersonalProfileNavigationTable(itemModel, this); setDisplayComponent(navTable); } diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationTable.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java similarity index 82% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationTable.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java index 1098692b9..9fb822062 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileNavigationTable.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java @@ -22,39 +22,39 @@ import org.apache.log4j.Logger; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfileNavigationTable +public class PublicPersonalProfileNavigationTable extends Table implements TableActionListener { private static final Logger logger = Logger.getLogger( - SciPublicPersonalProfileNavigationTable.class); + PublicPersonalProfileNavigationTable.class); private final String TABLE_COL_EDIT = "table_col_edit"; private final String TABLE_COL_DEL = "table_col_del"; private ItemSelectionModel itemModel; private SimpleEditStep editStep; - public SciPublicPersonalProfileNavigationTable(ItemSelectionModel itemModel, + public PublicPersonalProfileNavigationTable(ItemSelectionModel itemModel, SimpleEditStep editStep) { super(); this.itemModel = itemModel; this.editStep = editStep; - setEmptyView(new Label(SciPublicPersonalProfileGlobalizationUtil. - globalize("scipublicpersonalprofile.ui.nav.empty"))); + setEmptyView(new Label(PublicPersonalProfileGlobalizationUtil. + globalize("publicpersonalprofile.ui.nav.empty"))); TableColumnModel colModel = getColumnModel(); colModel.add(new TableColumn( 0, - SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.nav.target").localize(), + PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.nav.target").localize(), TABLE_COL_EDIT)); colModel.add(new TableColumn( 1, - SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.nav.remove").localize(), + PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.nav.remove").localize(), TABLE_COL_DEL)); - setModelBuilder(new SciPublicPersonalProfileNavigationTableModelBuilder( + setModelBuilder(new PublicPersonalProfileNavigationTableModelBuilder( itemModel)); colModel.get(0).setCellRenderer(new EditCellRenderer()); @@ -63,13 +63,13 @@ public class SciPublicPersonalProfileNavigationTable addTableActionListener(this); } - private class SciPublicPersonalProfileNavigationTableModelBuilder + private class PublicPersonalProfileNavigationTableModelBuilder extends LockableImpl implements TableModelBuilder { private ItemSelectionModel itemModel; - public SciPublicPersonalProfileNavigationTableModelBuilder( + public PublicPersonalProfileNavigationTableModelBuilder( ItemSelectionModel itemModel) { this.itemModel = itemModel; } @@ -77,11 +77,11 @@ public class SciPublicPersonalProfileNavigationTable @Override public TableModel makeModel(Table table, PageState state) { table.getRowSelectionModel().clearSelection(state); - return new SciPublicPersonalProfileNavigationTableModel(table, state); + return new PublicPersonalProfileNavigationTableModel(table, state); } } - private class SciPublicPersonalProfileNavigationTableModel + private class PublicPersonalProfileNavigationTableModel implements TableModel { private Table table; @@ -91,7 +91,7 @@ public class SciPublicPersonalProfileNavigationTable private int index = -1; private String mockNavItem; - public SciPublicPersonalProfileNavigationTableModel(Table table, + public PublicPersonalProfileNavigationTableModel(Table table, PageState state) { this.table = table; } @@ -117,8 +117,8 @@ public class SciPublicPersonalProfileNavigationTable case 0: return mockNav[index]; case 1: - return SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.nav.remove").localize(); + return PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.nav.remove").localize(); default: return null; } diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertiesStep.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertiesStep.java similarity index 66% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertiesStep.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertiesStep.java index e543e0353..7af2524de 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertiesStep.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertiesStep.java @@ -6,7 +6,7 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SegmentedPanel; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.GenericPerson; -import com.arsdigita.cms.contenttypes.SciPublicPersonalProfile; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; import com.arsdigita.domain.DomainObject; import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; @@ -19,11 +19,11 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfilePropertiesStep extends SimpleEditStep { +public class PublicPersonalProfilePropertiesStep extends SimpleEditStep { public static final String EDIT_SHEET_NAME = "edit"; - public SciPublicPersonalProfilePropertiesStep( + public PublicPersonalProfilePropertiesStep( final ItemSelectionModel itemModel, final AuthoringKitWizard parent) { super(itemModel, parent); @@ -38,40 +38,40 @@ public class SciPublicPersonalProfilePropertiesStep extends SimpleEditStep { EDIT_SHEET_NAME); BasicPageForm editBasicSheet = - new SciPublicPersonalProfilePropertyForm(itemModel, + new PublicPersonalProfilePropertyForm(itemModel, this); basicProperties.add(EDIT_SHEET_NAME, - (String) SciPublicPersonalProfileGlobalizationUtil. + (String) PublicPersonalProfileGlobalizationUtil. globalize( - "scipublicpersonalprofile.ui.profile.edit_basic_properties"). + "publicpersonalprofile.ui.profile.edit_basic_properties"). localize(), new WorkflowLockedComponentAccess(editBasicSheet, itemModel), editBasicSheet.getSaveCancelSection(). getCancelButton()); - basicProperties.setDisplayComponent(getSciPublicPersonalProfilePropertySheet( + basicProperties.setDisplayComponent(getPublicPersonalProfilePropertySheet( itemModel)); - segmentedPanel.addSegment(new Label((String) SciPublicPersonalProfileGlobalizationUtil. - globalize("scipublicpersonalprofile.ui.profile.basic_properties"). + segmentedPanel.addSegment(new Label((String) PublicPersonalProfileGlobalizationUtil. + globalize("publicpersonalprofile.ui.profile.basic_properties"). localize()), basicProperties); setDisplayComponent(segmentedPanel); } - public static Component getSciPublicPersonalProfilePropertySheet( + public static Component getPublicPersonalProfilePropertySheet( ItemSelectionModel itemModel) { DomainObjectPropertySheet sheet = new DomainObjectPropertySheet( itemModel); - sheet.add(SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.owner"), - SciPublicPersonalProfile.OWNER, new OwnerFormatter()); + sheet.add(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.owner"), + PublicPersonalProfile.OWNER, new OwnerFormatter()); - sheet.add(SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.profile_url"), - SciPublicPersonalProfile.PROFILE_URL); + sheet.add(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.profile_url"), + PublicPersonalProfile.PROFILE_URL); return sheet; } @@ -80,7 +80,7 @@ public class SciPublicPersonalProfilePropertiesStep extends SimpleEditStep { DomainObjectPropertySheet.AttributeFormatter { public String format(DomainObject obj, String attribute, PageState state) { - SciPublicPersonalProfile profile = (SciPublicPersonalProfile) obj; + PublicPersonalProfile profile = (PublicPersonalProfile) obj; GenericPerson owner = profile.getOwner(); diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertyForm.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java similarity index 63% rename from ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertyForm.java rename to ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java index 4d362944a..3f9d22d95 100644 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfilePropertyForm.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java @@ -11,7 +11,7 @@ import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.contenttypes.SciPublicPersonalProfile; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; import com.arsdigita.cms.ui.authoring.BasicPageForm; /** @@ -19,21 +19,21 @@ import com.arsdigita.cms.ui.authoring.BasicPageForm; * @author Jens Pelzetter * @version $Id$ */ -public class SciPublicPersonalProfilePropertyForm +public class PublicPersonalProfilePropertyForm extends BasicPageForm implements FormProcessListener, FormInitListener { - private SciPublicPersonalProfilePropertiesStep step; - public static final String ID = "SciPublicPersonalProfile_edit"; + private PublicPersonalProfilePropertiesStep step; + public static final String ID = "PublicPersonalProfile_edit"; - public SciPublicPersonalProfilePropertyForm(ItemSelectionModel itemModel) { + public PublicPersonalProfilePropertyForm(ItemSelectionModel itemModel) { this(itemModel, null); } - public SciPublicPersonalProfilePropertyForm( + public PublicPersonalProfilePropertyForm( ItemSelectionModel itemModel, - SciPublicPersonalProfilePropertiesStep step) { + PublicPersonalProfilePropertiesStep step) { super(ID, itemModel); this.step = step; } @@ -42,10 +42,10 @@ public class SciPublicPersonalProfilePropertyForm public void addWidgets() { super.addWidgets(); - add(new Label(SciPublicPersonalProfileGlobalizationUtil.globalize( - "scipublicpersonalprofile.ui.profile.url"))); + add(new Label(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.profile.url"))); ParameterModel profileUrlParam = - new StringParameter(SciPublicPersonalProfile.PROFILE_URL); + new StringParameter(PublicPersonalProfile.PROFILE_URL); TextField profileUrl = new TextField(profileUrlParam); add(profileUrl); } @@ -54,17 +54,17 @@ public class SciPublicPersonalProfilePropertyForm public void init(FormSectionEvent fse) throws FormProcessException { final PageState state = fse.getPageState(); final FormData data = fse.getFormData(); - final SciPublicPersonalProfile profile = - (SciPublicPersonalProfile) super. + final PublicPersonalProfile profile = + (PublicPersonalProfile) super. initBasicWidgets(fse); - data.put(SciPublicPersonalProfile.PROFILE_URL, profile.getProfileUrl()); + data.put(PublicPersonalProfile.PROFILE_URL, profile.getProfileUrl()); } @Override public void process(FormSectionEvent fse) throws FormProcessException { - final SciPublicPersonalProfile profile = - (SciPublicPersonalProfile) processBasicWidgets( + final PublicPersonalProfile profile = + (PublicPersonalProfile) processBasicWidgets( fse); final FormData data = fse.getFormData(); final PageState state = fse.getPageState(); @@ -72,7 +72,7 @@ public class SciPublicPersonalProfilePropertyForm if ((profile != null) && getSaveCancelSection().getSaveButton().isSelected(state)) { profile.setProfileUrl((String) data.get( - SciPublicPersonalProfile.PROFILE_URL)); + PublicPersonalProfile.PROFILE_URL)); profile.save(); } diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties new file mode 100644 index 000000000..dc9fb9928 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties @@ -0,0 +1,9 @@ +publicpersonalprofile.ui.profile.basic_properties=Basic properties +publicpersonalprofile.ui.profile.edit_basic_properties=Edit basic properties +publicpersonalprofile.ui.owner=Profile of +publicpersonalprofile.ui.profile_url=URL fragement +publicpersonalprofile.ui.nav.target=Navigation item +publicpersonalprofile.ui.nav.remove=Remove +publicpersonalprofile.ui.profile_properties.title=Basic properties +publicpersonalprofile.ui.profile_nav.title=Navigation +publicpersonalprofile.ui.profile.nav_add=Add item diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties new file mode 100644 index 000000000..250217417 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties @@ -0,0 +1,9 @@ +publicpersonalprofile.ui.profile.basic_properties=Basiseigenschaften +publicpersonalprofile.ui.profile.edit_basic_properties=Basiseigenschaften bearbeiten +publicpersonalprofile.ui.owner=Profil von +publicpersonalprofile.ui.profile_url=URL Fragment +publicpersonalprofile.ui.nav.target=Navigationspunkt +publicpersonalprofile.ui.nav.remove=Entfernen +publicpersonalprofile.ui.profile_properties.title=Basiseigenschaften +publicpersonalprofile.ui.profile_nav.title=Navigation +publicpersonalprofile.ui.profile.nav_add=Navigationspunkt hinzuf\u00fcgen diff --git a/ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl b/ccm-cms-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xsl similarity index 65% rename from ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl rename to ccm-cms-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xsl index e35c529a5..daeea1a45 100644 --- a/ccm-sci-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/SciPublicPersonalProfile.xsl +++ b/ccm-cms-publicpersonalprofile/web/static/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xsl @@ -6,13 +6,13 @@ xmlns:cms="http://www.arsdigita.com/cms/1.0" version="1.0"> - +

- +

diff --git a/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java b/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java index f6b645382..8f39bc41c 100755 --- a/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java +++ b/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java @@ -308,11 +308,9 @@ public class ConfigRegistry { } private Properties getProperties(ClassLoader ldr, String resource) { - Properties props = new Properties(); - s_log.error(String.format(">>>Trying to get properties from '%s'...", resource)); + Properties props = new Properties(); InputStream is = ldr.getResourceAsStream(resource); - if (is != null) { - s_log.error(">>>Create input stream successfully, resource exists..."); + if (is != null) { try { props.load(is); } catch (IOException e) { @@ -324,8 +322,6 @@ public class ConfigRegistry { throw new UncheckedWrapperException(e); } } - } else { - s_log.error(">>>Resource does not exist."); } return props; } diff --git a/ccm-sci-publicpersonalprofile/application.xml b/ccm-sci-publicpersonalprofile/application.xml deleted file mode 100644 index 06c8a632d..000000000 --- a/ccm-sci-publicpersonalprofile/application.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Aggreates informations about a SciMember item. In the content center it provides - a form for editing the contact associates with the SciMember item. Also a form - is provided to link articles or other content items with a person. The view is - provided by an special content panel for SciMember which has to be added - to the template of the SciMember content type (an example JSP is provided - with this module). - - diff --git a/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/SciPublicPersonalProfile.pdl b/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/SciPublicPersonalProfile.pdl deleted file mode 100644 index f9ff57b4d..000000000 --- a/ccm-sci-publicpersonalprofile/pdl/com/arsdigita/content-types/SciPublicPersonalProfile.pdl +++ /dev/null @@ -1,27 +0,0 @@ -model com.arsdigita.cms.contenttypes; - -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.cms.*; - -object type SciPublicPersonalProfile extends ContentPage { - - String[0..1] profileUrl = ct_sci_public_personal_profiles.profile_url VARCHAR(256); - Boolean[0..1] showPublicationList = ct_sci_public_personal_profiles.show_publication_list BIT; - Boolean[0..1] showProjectList = ct_sci_public_personal_profiles.show_project_list BIT; - - reference key (ct_sci_public_personal_profiles.profile_id); -} - -association { - - SciPublicPersonalProfile[0..n] profile = join cms_persons.person_id - to ct_sci_public_personal_profile_owner_map.owner_id, - join ct_sci_public_personal_profile_owner_map.profile_id - to ct_sci_public_personal_profiles.profile_id; - - GenericPerson[0..n] owner = join ct_sci_public_personal_profiles.profile_id - to ct_sci_public_personal_profile_owner_map.profile_id, - join ct_sci_public_personal_profile_owner_map.owner_id - to cms_persons.person_id; -} - diff --git a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config deleted file mode 100644 index beaacb957..000000000 --- a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load b/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load deleted file mode 100644 index 7914916ac..000000000 --- a/ccm-sci-publicpersonalprofile/src/ccm-sci-publicpersonalprofile.load +++ /dev/null @@ -1,26 +0,0 @@ - - -
-
-
- - - -
-
- - - - - - - - -
- - - - - - - \ No newline at end of file diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig_parameter.properties b/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig_parameter.properties deleted file mode 100644 index 1597c6048..000000000 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/SciPublicPersonalProfileConfig_parameter.properties +++ /dev/null @@ -1,9 +0,0 @@ -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.show_unfinished_parts.title = Show parts of the SciPublicPersonalProfile which do not work yet. -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.show_unfinished_parts.purpose = Show parts of the SciPublicPersonalProfile which do not work yet. -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.show_unfinished_parts.example = false -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.show_unfinished_parts.format = [boolean] - -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.person_type.title = Class to restrict the selectable persons to. -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.person_type.purpose = Class to restrict the selectable persons to. -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.person_type.example = com.arsdigita.cms.contenttypes.GenericPerson -com.arsdigita.cms.contenttypes.SciPublicPersonalProfile.person_type.format = [string] \ No newline at end of file diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources.properties b/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources.properties deleted file mode 100644 index aed672e01..000000000 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources.properties +++ /dev/null @@ -1,9 +0,0 @@ -scipublicpersonalprofile.ui.profile.basic_properties=Basic properties -scipublicpersonalprofile.ui.profile.edit_basic_properties=Edit basic properties -scipublicpersonalprofile.ui.owner=Profile of -scipublicpersonalprofile.ui.profile_url=URL fragement -scipublicpersonalprofile.ui.nav.target=Navigation item -scipublicpersonalprofile.ui.nav.remove=Remove -scipublicpersonalprofile.ui.profile_properties.title=Basic properties -scipublicpersonalprofile.ui.profile_nav.title=Navigation -scipublicpersonalprofile.ui.profile.nav_add=Add item diff --git a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources_de.properties b/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources_de.properties deleted file mode 100644 index a6df56c3a..000000000 --- a/ccm-sci-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/SciPublicPersonalProfileResources_de.properties +++ /dev/null @@ -1,12 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -scipublicpersonalprofile.ui.profile.basic_properties=Basiseigenschaften -scipublicpersonalprofile.ui.profile.edit_basic_properties=Basiseigenschaften bearbeiten -scipublicpersonalprofile.ui.owner=Profil von -scipublicpersonalprofile.ui.profile_url=URL Fragment -scipublicpersonalprofile.ui.nav.target=Navigationspunkt -scipublicpersonalprofile.ui.nav.remove=Entfernen -scipublicpersonalprofile.ui.profile_properties.title=Basiseigenschaften -scipublicpersonalprofile.ui.profile_nav.title=Navigation -scipublicpersonalprofile.ui.profile.nav_add=Navigationspunkt hinzuf\u00fcgen