Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mb...@re...> - 2005-03-20 23:15:46
|
Author: mbooth Date: 2005-03-21 00:13:32 +0100 (Mon, 21 Mar 2005) New Revision: 477 Modified: ccm-cms-types-formitem/trunk/ ccm-cms-types-formitem/trunk/application.xml ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItemLoader.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-formitem/ Property changes on: ccm-cms-types-formitem/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-formitem/:1-318 + /releases/1.0.2/ccm-cms-types-formitem/:1-431 Modified: ccm-cms-types-formitem/trunk/application.xml =================================================================== --- ccm-cms-types-formitem/trunk/application.xml 2005-03-20 23:13:29 UTC (rev 476) +++ ccm-cms-types-formitem/trunk/application.xml 2005-03-20 23:13:32 UTC (rev 477) @@ -1,29 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-formitem" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-formitem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="9" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="11" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.0"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Form Item Content Type for the Red Hat CCM CMS. </ccm:description> Modified: ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItemLoader.java =================================================================== --- ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItemLoader.java 2005-03-20 23:13:29 UTC (rev 476) +++ ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItemLoader.java 2005-03-20 23:13:32 UTC (rev 477) @@ -39,7 +39,7 @@ private final Parameter m_contentSections = new StringParameter ("com.arsdigita.cms.formbuilder.FormItem.sections", - Parameter.REQUIRED, "forms"); + Parameter.REQUIRED, "content"); { register(m_contentSections); |
|
From: <mb...@re...> - 2005-03-20 23:15:41
|
Author: mbooth Date: 2005-03-21 00:13:25 +0100 (Mon, 21 Mar 2005) New Revision: 475 Modified: ccm-ldn-portal/trunk/ ccm-ldn-portal/trunk/application.xml ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Initializer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/WorkspaceConfig.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-portal/ Property changes on: ccm-ldn-portal/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-portal/:1-318 + /releases/1.0.2/ccm-ldn-portal/:1-431 Modified: ccm-ldn-portal/trunk/application.xml =================================================================== --- ccm-ldn-portal/trunk/application.xml 2005-03-20 23:13:22 UTC (rev 474) +++ ccm-ldn-portal/trunk/application.xml 2005-03-20 23:13:25 UTC (rev 475) @@ -1,28 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-portal" - prettyName="Portal" - version="1.4.2" - release="3" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-portal" + prettyName="Portal" + version="1.4.2" + release="5" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> - <ccm:requires name="ccm-ldn-util" version="1.4.1"/> <ccm:requires name="ccm-forum" version="1.4.1"/> + <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/> <ccm:requires name="ccm-ldn-rss" version="1.4.1"/> + <ccm:requires name="ccm-ldn-util" version="1.4.1"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> Modified: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Initializer.java =================================================================== --- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Initializer.java 2005-03-20 23:13:22 UTC (rev 474) +++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Initializer.java 2005-03-20 23:13:25 UTC (rev 475) @@ -46,6 +46,9 @@ import com.arsdigita.kernel.ui.ResourceConfigFormSection; import com.arsdigita.bebop.RequestLocal; +import com.arsdigita.london.navigation.ApplicationNavigationModel; +import com.arsdigita.london.navigation.DefaultNavigationModel; + import com.arsdigita.london.portal.portlet.TimeOfDayPortlet; import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet; import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet; @@ -53,7 +56,6 @@ import com.arsdigita.london.portal.portlet.RSSFeedPortlet; import com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet; import com.arsdigita.london.portal.portlet.WorkspaceDirectoryPortlet; - import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditor; import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditorForm; import com.arsdigita.london.portal.ui.portlet.FreeformHTMLPortletEditor; @@ -258,5 +260,7 @@ } }; + ApplicationNavigationModel.register(Workspace.class.getName(), + new DefaultNavigationModel()); } } Modified: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/WorkspaceConfig.java =================================================================== --- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/WorkspaceConfig.java 2005-03-20 23:13:22 UTC (rev 474) +++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/WorkspaceConfig.java 2005-03-20 23:13:25 UTC (rev 475) @@ -59,7 +59,7 @@ PageLayout.FORMAT_THREE_COLUMNS); m_createUserWorkspaces = new BooleanParameter - ("com.runtimecollective.portal.create_user_workspaces", + ("com.arsdigita.portal.create_user_workspaces", Parameter.REQUIRED, Boolean.TRUE); |
|
From: <mb...@re...> - 2005-03-20 23:15:35
|
Author: mbooth Date: 2005-03-21 00:13:22 +0100 (Mon, 21 Mar 2005) New Revision: 474 Modified: ccm-cms-types-filestorageitem/trunk/ ccm-cms-types-filestorageitem/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-filestorageitem/ Property changes on: ccm-cms-types-filestorageitem/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-filestorageitem/:1-318 + /releases/1.0.2/ccm-cms-types-filestorageitem/:1-431 Modified: ccm-cms-types-filestorageitem/trunk/application.xml =================================================================== --- ccm-cms-types-filestorageitem/trunk/application.xml 2005-03-20 23:13:19 UTC (rev 473) +++ ccm-cms-types-filestorageitem/trunk/application.xml 2005-03-20 23:13:22 UTC (rev 474) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-filestorageitem" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-filestorageitem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="8" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="10" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The File Storage Item Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:15:33
|
Author: mbooth Date: 2005-03-21 00:13:19 +0100 (Mon, 21 Mar 2005) New Revision: 473 Added: ccm-cms-types-agenda/trunk/src/ccm-cms-types-agenda.upgrade Modified: ccm-cms-types-agenda/trunk/ ccm-cms-types-agenda/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-agenda/ Property changes on: ccm-cms-types-agenda/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-agenda/:1-318 + /releases/1.0.2/ccm-cms-types-agenda/:1-431 Modified: ccm-cms-types-agenda/trunk/application.xml =================================================================== --- ccm-cms-types-agenda/trunk/application.xml 2005-03-20 23:13:17 UTC (rev 472) +++ ccm-cms-types-agenda/trunk/application.xml 2005-03-20 23:13:19 UTC (rev 473) @@ -1,28 +1,23 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-agenda" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-agenda" prettyName="Red Hat CCM Content Types" version="6.1.1" - release="1" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="3" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Agenda Content Type for the Red Hat CCM CMS. </ccm:description> Copied: ccm-cms-types-agenda/trunk/src/ccm-cms-types-agenda.upgrade (from rev 431, releases/1.0.2/ccm-cms-types-agenda/src/ccm-cms-types-agenda.upgrade) |
|
From: <mb...@re...> - 2005-03-20 23:15:31
|
Author: mbooth Date: 2005-03-21 00:13:17 +0100 (Mon, 21 Mar 2005) New Revision: 472 Modified: ccm-cms-types-htmlform/trunk/ ccm-cms-types-htmlform/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-htmlform/ Property changes on: ccm-cms-types-htmlform/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-htmlform/:1-318 + /releases/1.0.2/ccm-cms-types-htmlform/:1-431 Modified: ccm-cms-types-htmlform/trunk/application.xml =================================================================== --- ccm-cms-types-htmlform/trunk/application.xml 2005-03-20 23:13:13 UTC (rev 471) +++ ccm-cms-types-htmlform/trunk/application.xml 2005-03-20 23:13:17 UTC (rev 472) @@ -1,28 +1,23 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-htmlform" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-htmlform" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="3" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="5" + webapp="ROOT"> <ccm:dependencies> - <ccm:requires name="ccm-core" version="6.1.0"/> - <ccm:requires name="ccm-cms" version="6.1.0"/> + <ccm:requires name="ccm-core" version="6.1.1"/> + <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-cms-types-article" version="6.1.0"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The HTML For Content Type for the Red Hat CCM CMS. </ccm:description> |
|
From: <mb...@re...> - 2005-03-20 23:15:31
|
Author: mbooth Date: 2005-03-21 00:13:13 +0100 (Mon, 21 Mar 2005) New Revision: 471 Modified: ccm-cms/trunk/ ccm-cms/trunk/application.xml ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms/ Property changes on: ccm-cms/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms/:1-318 + /releases/1.0.2/ccm-cms/:1-431 Modified: ccm-cms/trunk/application.xml =================================================================== --- ccm-cms/trunk/application.xml 2005-03-20 23:13:05 UTC (rev 470) +++ ccm-cms/trunk/application.xml 2005-03-20 23:13:13 UTC (rev 471) @@ -1,24 +1,19 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms" prettyName="Red Hat CCM Content Management System" version="6.1.1" - release="1" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="3" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The CMS applications provides a flexible Content Management System for the CCM platform. </ccm:description> - </ccm:application> Modified: ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init 2005-03-20 23:13:05 UTC (rev 470) +++ ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init 2005-03-20 23:13:13 UTC (rev 471) @@ -253,88 +253,88 @@ } -init com.arsdigita.cms.installer.SectionInitializer { - // Name of the content section (used to form URL) - name = "forms"; +//init com.arsdigita.cms.installer.SectionInitializer { +// // Name of the content section (used to form URL) +// name = "forms"; +// +// // List of roles to create. First field is role name, +// // second is the description, third is a list of +// // privileges, and (optional) fourth is the workflow +// // task to assign to +// roles = { +// { +// "Author", "Creates new content", +// { "new_item", "read_item", "preview_item" }, +// "Authoring" +// }, +// { +// "Editor", "Approves the author's work", +// { "edit_item", "new_item", "delete_item", +// "read_item", "preview_item" }, +// "Approval" +// }, +// { +// "Publisher", "Deploys the content to the web site", +// { "edit_item", "new_item", "delete_item", +// "publish", "read_item", "preview_item" }, +// "Publishing" +// }, +// { +// "Manager", "Manages the overall content section", +// { "delete_item", "edit_item", "new_item", +// "staff_admin", "content_type_admin", "lifecycle_admin", +// "workflow_admin", "category_admin", "publish", +// "read_item", "preview_item" } +// // NB, manager doesn't have any assigned task for workflow +// } +// }; +// +// // List of content types to register +// types = { +// }; +// +// // Category tree to load +// categories = { "/WEB-INF/resources/form-categories.xml" }; +// +// // Whether to make content viewable to 'The Public', ie non-registered users +// public = true; +// +// +// // When to generate email alerts: by default, generate email alerts +// // on enable, finish, and rollback (happens on rejection) +// // changes. There are four action types for each task type: enable, +// // disable, finish, and rollback. Note that the values below are +// // based on the task labels, and as such are not globalized. +// taskAlerts = { +// { "Authoring", +// { "enable", "finish", "rollback" } +// }, +// { "Approval", +// { "enable", "finish", "rollback" } +// }, +// { "Deploy", +// { "enable", "finish", "rollback" } +// } +// }; +// +// // Parameters controlling Overdue Task alerts: +// +// // sendOverdueAlerts: Should we send alerts about overdue tasks at +// // all? +// // taskDuration: The time between when a task is enabled (it is made +// // available for completion) and when it is +// // considered overdue (in HOURS) +// // alertInterval: The time to wait between sending successive alerts on the same +// // overdue task (in HOURS) +// // maxAlerts: The maximum number of alerts to send about any one +// // overdue task +// sendOverdueAlerts = false; +// taskDuration = 96; +// alertInterval = 24; +// maxAlerts = 5; +// +//} - // List of roles to create. First field is role name, - // second is the description, third is a list of - // privileges, and (optional) fourth is the workflow - // task to assign to - roles = { - { - "Author", "Creates new content", - { "new_item", "read_item", "preview_item" }, - "Authoring" - }, - { - "Editor", "Approves the author's work", - { "edit_item", "new_item", "delete_item", - "read_item", "preview_item" }, - "Approval" - }, - { - "Publisher", "Deploys the content to the web site", - { "edit_item", "new_item", "delete_item", - "publish", "read_item", "preview_item" }, - "Publishing" - }, - { - "Manager", "Manages the overall content section", - { "delete_item", "edit_item", "new_item", - "staff_admin", "content_type_admin", "lifecycle_admin", - "workflow_admin", "category_admin", "publish", - "read_item", "preview_item" } - // NB, manager doesn't have any assigned task for workflow - } - }; - - // List of content types to register - types = { - }; - - // Category tree to load - categories = { "/WEB-INF/resources/form-categories.xml" }; - - // Whether to make content viewable to 'The Public', ie non-registered users - public = true; - - - // When to generate email alerts: by default, generate email alerts - // on enable, finish, and rollback (happens on rejection) - // changes. There are four action types for each task type: enable, - // disable, finish, and rollback. Note that the values below are - // based on the task labels, and as such are not globalized. - taskAlerts = { - { "Authoring", - { "enable", "finish", "rollback" } - }, - { "Approval", - { "enable", "finish", "rollback" } - }, - { "Deploy", - { "enable", "finish", "rollback" } - } - }; - - // Parameters controlling Overdue Task alerts: - - // sendOverdueAlerts: Should we send alerts about overdue tasks at - // all? - // taskDuration: The time between when a task is enabled (it is made - // available for completion) and when it is - // considered overdue (in HOURS) - // alertInterval: The time to wait between sending successive alerts on the same - // overdue task (in HOURS) - // maxAlerts: The maximum number of alerts to send about any one - // overdue task - sendOverdueAlerts = false; - taskDuration = 96; - alertInterval = 24; - maxAlerts = 5; - -} - init com.arsdigita.cms.lifecycle.Initializer { // How long do we wait (in seconds) after system startup // before we start processing lifecycles? Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java 2005-03-20 23:13:05 UTC (rev 470) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java 2005-03-20 23:13:13 UTC (rev 471) @@ -62,11 +62,11 @@ * <p> * To use this component, you can copy this example:<br> * <define:component name="folderContent" - * classname="com.runtimecollective.cms.ui.FolderContent" /> + * classname="com.arsdigita.cms.ui.FolderContent" /> * <jsp:scriptlet><br> - * ((com.runtimecollective.cms.ui.FolderContent) folderContent).setContentSection("content");<br> - * ((com.runtimecollective.cms.ui.FolderContent) folderContent).setFolderName("myfolder");<br> - * ((com.runtimecollective.cms.ui.FolderContent) folderContent).setRandomOne("true");<br> + * ((com.arsdigita.cms.ui.FolderContent) folderContent).setContentSection("content");<br> + * ((com.arsdigita.cms.ui.FolderContent) folderContent).setFolderName("myfolder");<br> + * ((com.arsdigita.cms.ui.FolderContent) folderContent).setRandomOne("true");<br> * <jsp:scriptlet> * <p> * |
|
From: <mb...@re...> - 2005-03-20 23:15:28
|
Author: mbooth Date: 2005-03-21 00:13:05 +0100 (Mon, 21 Mar 2005) New Revision: 470 Added: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgal-0.01.xml Modified: ccm-ldn-aplaws/trunk/ ccm-ldn-aplaws/trunk/application.xml ccm-ldn-aplaws/trunk/doc/generic-content/items/term-mapping.xml ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-aplaws/ Property changes on: ccm-ldn-aplaws/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-aplaws/:1-318 + /releases/1.0.2/ccm-ldn-aplaws/:1-431 Modified: ccm-ldn-aplaws/trunk/application.xml =================================================================== --- ccm-ldn-aplaws/trunk/application.xml 2005-03-20 23:12:56 UTC (rev 469) +++ ccm-ldn-aplaws/trunk/application.xml 2005-03-20 23:13:05 UTC (rev 470) @@ -1,30 +1,25 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-aplaws" - prettyName="APLAWS" - version="1.9.1" - release="8" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-aplaws" + prettyName="APLAWS" + version="1.9.1" + release="10" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-ldn-subsite" version="1.4.1"/> <ccm:requires name="ccm-ldn-portal" version="1.4.2"/> - <ccm:requires name="ccm-ldn-terms" version="1.0.1"/> + <ccm:requires name="ccm-ldn-terms" version="1.0.2"/> <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/> <ccm:requires name="ccm-cms-types-article" version="6.1.0"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> Modified: ccm-ldn-aplaws/trunk/doc/generic-content/items/term-mapping.xml =================================================================== --- ccm-ldn-aplaws/trunk/doc/generic-content/items/term-mapping.xml 2005-03-20 23:12:56 UTC (rev 469) +++ ccm-ldn-aplaws/trunk/doc/generic-content/items/term-mapping.xml 2005-03-20 23:13:05 UTC (rev 470) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <terms:itemMapping xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"> - <terms:domain resource="http://www.esd.org.uk/standards/lgsl/2.00/lgsltermslist.xml"/> + <terms:domain resource="http://www.esd.org.uk/standards/lgsl/2.01/lgsltermslist.xml"/> <terms:mapping> <terms:term id="1"/> <terms:item path="/content/generic-content/education/help-for-nursery-primary-and-secondary-school-pupils/education-2-1"/> Copied: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/domain-lgal-0.01.xml (from rev 431, releases/1.0.2/ccm-ldn-aplaws/src/WEB-INF/esd-toolkit/domain-lgal-0.01.xml) Modified: ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml =================================================================== --- ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml 2005-03-20 23:12:56 UTC (rev 469) +++ ccm-ldn-aplaws/trunk/src/WEB-INF/esd-toolkit/hierarchy-lgil-0.01.xml 2005-03-20 23:13:05 UTC (rev 470) @@ -11,16 +11,6 @@ <terms:term id="7"/> <terms:term id="8"/> <terms:term id="9"/> - <terms:term id="10"/> - <terms:term id="11"/> - <terms:term id="12"/> - <terms:term id="13"/> - <terms:term id="14"/> - <terms:term id="15"/> - <terms:term id="16"/> - <terms:term id="17"/> - <terms:term id="18"/> - <terms:term id="19"/> <terms:orderedPair> <terms:source> <terms:term id="0"/> Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig.java =================================================================== --- ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig.java 2005-03-20 23:12:56 UTC (rev 469) +++ ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig.java 2005-03-20 23:13:05 UTC (rev 470) @@ -35,7 +35,7 @@ public final static String versionId = "$Id$"; private final Parameter m_overrideAnavFromLGCLMappings = new BooleanParameter - ("com.runtimecollective.aplaws.override_anav_from_lgcl_mappings", Parameter.OPTIONAL, new Boolean(false)); + ("com.arsdigita.aplaws.override_anav_from_lgcl_mappings", Parameter.OPTIONAL, new Boolean(false)); public AplawsConfig() { register(m_overrideAnavFromLGCLMappings); Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties =================================================================== --- ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties 2005-03-20 23:12:56 UTC (rev 469) +++ ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties 2005-03-20 23:13:05 UTC (rev 470) @@ -1,4 +1,4 @@ -com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.title=Whether LGCL categorisation should overwrite (delete) ANav categorisation (mappings) -com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.purpose=If set to true, assigning one/some LGCL categories to an item will erase its existing ANav categories (and replace them with ANav categories linked to the LGCL ones, if any) -com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.example=true|false -com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.format=[boolean] +com.arsdigita.aplaws.override_anav_from_lgcl_mappings.title=Whether LGCL categorisation should overwrite (delete) ANav categorisation (mappings) +com.arsdigita.aplaws.override_anav_from_lgcl_mappings.purpose=If set to true, assigning one/some LGCL categories to an item will erase its existing ANav categories (and replace them with ANav categories linked to the LGCL ones, if any) +com.arsdigita.aplaws.override_anav_from_lgcl_mappings.example=true|false +com.arsdigita.aplaws.override_anav_from_lgcl_mappings.format=[boolean] Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java =================================================================== --- ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java 2005-03-20 23:12:56 UTC (rev 469) +++ ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java 2005-03-20 23:13:05 UTC (rev 470) @@ -80,6 +80,7 @@ "WEB-INF/esd-toolkit/domain-lgdl-2.01.xml", "WEB-INF/esd-toolkit/domain-lgil-0.01.xml", "WEB-INF/esd-toolkit/domain-lgsl-2.01.xml", + "WEB-INF/esd-toolkit/domain-lgal-0.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgcl-1.04.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01.xml", @@ -100,6 +101,7 @@ "WEB-INF/esd-toolkit/domain-lgdl-2.01.xml", "WEB-INF/esd-toolkit/domain-lgil-0.01.xml", "WEB-INF/esd-toolkit/domain-lgsl-2.01.xml", + "WEB-INF/esd-toolkit/domain-lgal-0.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgcl-lite-1.04.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01-lgsl-2.01.xml", "WEB-INF/esd-toolkit/hierarchy-lgdl-2.01.xml", @@ -244,23 +246,20 @@ registerDomain(navigationKey, "/navigation/", null); registerDomain(navigationKey, "/content/", null); - registerDomain(navigationKey, "/forms/", null); registerDomain(navigationKey, "/portal/", null); + //registerDomain(navigationKey, "/atoz/", null); + //registerDomain(navigationKey, "/admin/subsite/", null); - registerDomain(interactionKey, "/content/", null); - registerDomain(interactionKey, "/forms/", null); - registerDomain(subjectKey, "/search/", null); registerDomain(subjectKey, "/content/", "subject"); - registerDomain(subjectKey, "/forms/", "subject"); registerDomain(servicesKey, "/services/", null); registerDomain(servicesKey, "/content/", "services"); - registerDomain(servicesKey, "/forms/", "services"); registerDomain(rssKey, "/channels/", null); registerDomain(rssKey, "/content/", "rss"); - registerDomain(rssKey, "/forms/", "rss"); + + registerDomain(interactionKey, "/content/", "interaction"); registerServicesTemplate("/services/"); registerPortalTemplate(); @@ -270,13 +269,12 @@ String customNavUseContext = (String)get(m_customNavUseContext); URL customNavDomainURL = (URL)get(m_customNavDomainURL); - Domain.create( customNavKey, customNavDomainURL, - customNavTitle, customNavDesc, "1.0.0", new Date() ); + Domain.create(customNavKey, customNavDomainURL, + customNavTitle, customNavDesc, "1.0.0", new Date()); - registerDomain( customNavKey, '/'+customNavPath+'/', null ); - registerDomain( customNavKey, "/content/", customNavUseContext ); + registerDomain(customNavKey, '/'+customNavPath+'/', null); + registerDomain(customNavKey, "/content/", customNavUseContext); - // Switch /portal/ to use 1 column layout for funky aplaws stuff. Workspace portal = (Workspace)Application .retrieveApplicationForPath("/portal/"); @@ -348,8 +346,6 @@ Category.MAP_DESCRIPTOR); } } - - } } } |
|
From: <mb...@re...> - 2005-03-20 23:15:10
|
Author: mbooth Date: 2005-03-21 00:12:56 +0100 (Mon, 21 Mar 2005) New Revision: 469 Modified: ccm-cms-types-address/trunk/ ccm-cms-types-address/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-address/ Property changes on: ccm-cms-types-address/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-address/:1-318 + /releases/1.0.2/ccm-cms-types-address/:1-431 Modified: ccm-cms-types-address/trunk/application.xml =================================================================== --- ccm-cms-types-address/trunk/application.xml 2005-03-20 23:12:53 UTC (rev 468) +++ ccm-cms-types-address/trunk/application.xml 2005-03-20 23:12:56 UTC (rev 469) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-address" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-address" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Address Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:15:07
|
Author: mbooth Date: 2005-03-21 00:12:53 +0100 (Mon, 21 Mar 2005) New Revision: 468 Modified: ccm-cms-types-legalnotice/trunk/ ccm-cms-types-legalnotice/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-legalnotice/ Property changes on: ccm-cms-types-legalnotice/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-legalnotice/:1-318 + /releases/1.0.2/ccm-cms-types-legalnotice/:1-431 Modified: ccm-cms-types-legalnotice/trunk/application.xml =================================================================== --- ccm-cms-types-legalnotice/trunk/application.xml 2005-03-20 23:12:44 UTC (rev 467) +++ ccm-cms-types-legalnotice/trunk/application.xml 2005-03-20 23:12:53 UTC (rev 468) @@ -1,28 +1,23 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-legalnotice" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-legalnotice" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Legal Notice Content Type for the Red Hat CCM CMS. </ccm:description> |
Author: mbooth Date: 2005-03-21 00:12:44 +0100 (Mon, 21 Mar 2005) New Revision: 467 Removed: ccm-core/trunk/lib/postgresql.jar Modified: ccm-core/trunk/ ccm-core/trunk/application.xml ccm-core/trunk/sql/ccm-core/default/search/table-search_content.sql ccm-core/trunk/sql/ccm-core/fixes/messaging/update-thread-replies.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql ccm-core/trunk/src/com/arsdigita/search/lucene/Indexer.java ccm-core/trunk/src/com/arsdigita/templating/TemplatingConfig_parameter.properties ccm-core/trunk/src/com/arsdigita/ui/NowDateTime.java Log: Merged revisions 316-431 via svnmerge from /releases/1.0.2/ccm-core/ Property changes on: ccm-core/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-core/:1-315 + /releases/1.0.2/ccm-core/:1-431 Modified: ccm-core/trunk/application.xml =================================================================== --- ccm-core/trunk/application.xml 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/application.xml 2005-03-20 23:12:44 UTC (rev 467) @@ -1,13 +1,11 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-core" - prettyName="Core" - version="6.1.1" - release="1" - webapp="ROOT" - buildHooks="build-hooks.xml" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-core" + prettyName="Core" + version="6.1.1" + release="3" + webapp="ROOT" + buildHooks="build-hooks.xml"> <ccm:dependencies> <ccm:buildRequires name="httpunit" version="1.5.4" relation="ge"/> <ccm:buildRequires name="junit" version="3.8" relation="ge"/> @@ -15,16 +13,13 @@ <ccm:buildRequires name="servletapi4" version="4.0.4" relation="ge"/> <ccm:runRequires name="servletapi4" version="4.0.4" relation="ge"/> </ccm:dependencies> - <ccm:systemPackages> <ccm:package path="com/arsdigita/util/protocol/"/> </ccm:systemPackages> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. Deleted: ccm-core/trunk/lib/postgresql.jar Modified: ccm-core/trunk/sql/ccm-core/default/search/table-search_content.sql =================================================================== --- ccm-core/trunk/sql/ccm-core/default/search/table-search_content.sql 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/sql/ccm-core/default/search/table-search_content.sql 2005-03-20 23:12:44 UTC (rev 467) @@ -30,5 +30,6 @@ summary varchar(4000), xml_content clob, -- xml content to be indexed raw_content blob, -- non-xml content to be indexed - language varchar(3) + language varchar(3), + content_section varchar(300) ); Modified: ccm-core/trunk/sql/ccm-core/fixes/messaging/update-thread-replies.sql =================================================================== --- ccm-core/trunk/sql/ccm-core/fixes/messaging/update-thread-replies.sql 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/sql/ccm-core/fixes/messaging/update-thread-replies.sql 2005-03-20 23:12:44 UTC (rev 467) @@ -1,6 +1,6 @@ - update message_threads t + update message_threads set num_replies = ( select count( m.message_id ) from messages m - where m.root_id = t.root_id + where m.root_id = message_threads.root_id ); Modified: ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql =================================================================== --- ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql 2005-03-20 23:12:44 UTC (rev 467) @@ -20,6 +20,8 @@ PROMPT Red Hat WAF 6.1.0 -> 6.1.1 Upgrade Script (Oracle) -@@ ../../ccm-core/oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql -@@ ../../ccm-core/oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql +@@ ../oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql +@@ ../oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql +@@ ../fixes/formbuilder/delete-bogus-form-widgets.sql +@@ ../fixes/messaging/update-thread-replies.sql Modified: ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql =================================================================== --- ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql 2005-03-20 23:12:44 UTC (rev 467) @@ -21,3 +21,6 @@ \echo Red Hat WAF 6.1.0 -> 6.1.1 Upgrade Script (PostgreSQL) \i ../../ccm-core/postgres/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql + +\i ../fixes/formbuilder/delete-bogus-form-widgets.sql +\i ../fixes/messaging/update-thread-replies.sql Modified: ccm-core/trunk/src/com/arsdigita/search/lucene/Indexer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/search/lucene/Indexer.java 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/src/com/arsdigita/search/lucene/Indexer.java 2005-03-20 23:12:44 UTC (rev 467) @@ -199,7 +199,8 @@ toString(doc.getLastModifiedDate()))); result.add(Field.Keyword(Document.LAST_MODIFIED_PARTY, toString(doc.getLastModifiedParty()))); - result.add(Field.Keyword(Document.CONTENT_SECTION, doc.getContentSection())); + result.add(Field.Keyword(Document.CONTENT_SECTION, + toString(doc.getContentSection()))); return result; } Modified: ccm-core/trunk/src/com/arsdigita/templating/TemplatingConfig_parameter.properties =================================================================== --- ccm-core/trunk/src/com/arsdigita/templating/TemplatingConfig_parameter.properties 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/src/com/arsdigita/templating/TemplatingConfig_parameter.properties 2005-03-20 23:12:44 UTC (rev 467) @@ -6,3 +6,11 @@ waf.templating.stylesheet_resolver.purpose=Specifies a particular implementation of StylesheetResolver interface waf.templating.stylesheet_resolver.example=com.arsdigita.templating.PatternStylesheetResolver waf.templating.stylesheet_resolver.format=[classname] +waf.templating.stylesheet_cache_size.title=Stylesheet cache size +waf.templating.stylesheet_cache_size.purpose=Set the number of stylesheets cached +waf.templating.stylesheet_cache_size.example=10 +waf.templating.stylesheet_cache_size.format=[integer] +waf.templating.stylesheet_cache_age.title=Stylesheet cache age +waf.templating.stylesheet_cache_age.purpose=Set the duration of the stylesheet cache, in seconds +waf.templating.stylesheet_cache_age.example=3600 +waf.templating.stylesheet_cache_age.format=[integer] Modified: ccm-core/trunk/src/com/arsdigita/ui/NowDateTime.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/ui/NowDateTime.java 2005-03-20 23:12:37 UTC (rev 466) +++ ccm-core/trunk/src/com/arsdigita/ui/NowDateTime.java 2005-03-20 23:12:44 UTC (rev 467) @@ -43,7 +43,7 @@ * <p> * To activate this component in a jsp, add the following:<br> * <define:component name="contentList" - * classname="com.runtimecollective.ui.NowDateTime" /> + * classname="com.arsdigita.ui.NowDateTime" /> * </ul> * * @version $Revision: 1.2 $ $Date: 2005/01/07 18:48:45 $ |
|
From: <mb...@re...> - 2005-03-20 23:14:50
|
Author: mbooth Date: 2005-03-21 00:12:37 +0100 (Mon, 21 Mar 2005) New Revision: 466 Modified: ccm-cms-assets-fileattachment/trunk/ ccm-cms-assets-fileattachment/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-assets-fileattachment/ Property changes on: ccm-cms-assets-fileattachment/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-assets-fileattachment/:1-318 + /releases/1.0.2/ccm-cms-assets-fileattachment/:1-431 Modified: ccm-cms-assets-fileattachment/trunk/application.xml =================================================================== --- ccm-cms-assets-fileattachment/trunk/application.xml 2005-03-20 23:12:34 UTC (rev 465) +++ ccm-cms-assets-fileattachment/trunk/application.xml 2005-03-20 23:12:37 UTC (rev 466) @@ -1,28 +1,23 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-assets-fileattachment" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-assets-fileattachment" prettyName="Red Hat CMS Content Asset File Attachment" version="6.1.0" - release="8" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="10" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Related Link Asset for the Red Hat CMS. </ccm:description> |
|
From: <mb...@re...> - 2005-03-20 23:14:47
|
Author: mbooth Date: 2005-03-21 00:12:34 +0100 (Mon, 21 Mar 2005) New Revision: 465 Modified: ccm-cms-types-job/trunk/ ccm-cms-types-job/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-job/ Property changes on: ccm-cms-types-job/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-job/:1-318 + /releases/1.0.2/ccm-cms-types-job/:1-431 Modified: ccm-cms-types-job/trunk/application.xml =================================================================== --- ccm-cms-types-job/trunk/application.xml 2005-03-20 23:12:31 UTC (rev 464) +++ ccm-cms-types-job/trunk/application.xml 2005-03-20 23:12:34 UTC (rev 465) @@ -1,28 +1,23 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-job" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-job" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Job Content Type for the Red Hat CCM CMS. </ccm:description> |
|
From: <mb...@re...> - 2005-03-20 23:14:45
|
Author: mbooth Date: 2005-03-21 00:12:31 +0100 (Mon, 21 Mar 2005) New Revision: 464 Modified: ccm-forum/trunk/ ccm-forum/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-forum/ Property changes on: ccm-forum/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-forum/:1-318 + /releases/1.0.2/ccm-forum/:1-431 Modified: ccm-forum/trunk/application.xml =================================================================== --- ccm-forum/trunk/application.xml 2005-03-20 23:12:28 UTC (rev 463) +++ ccm-forum/trunk/application.xml 2005-03-20 23:12:31 UTC (rev 464) @@ -1,23 +1,18 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-forum" - prettyName="Forum" - version="1.4.1" - release="15" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-forum" + prettyName="Forum" + version="1.4.1" + release="17"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:14:41
|
Author: mbooth Date: 2005-03-21 00:12:28 +0100 (Mon, 21 Mar 2005) New Revision: 463 Modified: ccm-ldn-search/trunk/ ccm-ldn-search/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-search/ Property changes on: ccm-ldn-search/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-search/:1-318 + /releases/1.0.2/ccm-ldn-search/:1-431 Modified: ccm-ldn-search/trunk/application.xml =================================================================== --- ccm-ldn-search/trunk/application.xml 2005-03-20 23:12:25 UTC (rev 462) +++ ccm-ldn-search/trunk/application.xml 2005-03-20 23:12:28 UTC (rev 463) @@ -1,25 +1,20 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-search" - prettyName="Search" - version="1.4.2" - release="1" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-search" + prettyName="Search" + version="1.4.2" + release="3"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-ldn-util" version="1.4.1"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:14:39
|
Author: mbooth Date: 2005-03-21 00:12:25 +0100 (Mon, 21 Mar 2005) New Revision: 462 Modified: ccm-ldn-freeform/trunk/ ccm-ldn-freeform/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-freeform/ Property changes on: ccm-ldn-freeform/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-freeform/:1-318 + /releases/1.0.2/ccm-ldn-freeform/:1-431 Modified: ccm-ldn-freeform/trunk/application.xml =================================================================== --- ccm-ldn-freeform/trunk/application.xml 2005-03-20 23:12:22 UTC (rev 461) +++ ccm-ldn-freeform/trunk/application.xml 2005-03-20 23:12:25 UTC (rev 462) @@ -1,25 +1,20 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-freeform" - prettyName="Freeform" - version="1.4.1" - release="3" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-freeform" + prettyName="Freeform" + version="1.4.1" + release="5" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:14:38
|
Author: mbooth Date: 2005-03-21 00:12:19 +0100 (Mon, 21 Mar 2005) New Revision: 460 Modified: ccm-cms-types-inlinesite/trunk/ ccm-cms-types-inlinesite/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-inlinesite/ Property changes on: ccm-cms-types-inlinesite/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-inlinesite/:1-318 + /releases/1.0.2/ccm-cms-types-inlinesite/:1-431 Modified: ccm-cms-types-inlinesite/trunk/application.xml =================================================================== --- ccm-cms-types-inlinesite/trunk/application.xml 2005-03-20 23:12:15 UTC (rev 459) +++ ccm-cms-types-inlinesite/trunk/application.xml 2005-03-20 23:12:19 UTC (rev 460) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-inlinesite" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-inlinesite" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Glossary Item Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:14:35
|
Author: mbooth Date: 2005-03-21 00:12:22 +0100 (Mon, 21 Mar 2005) New Revision: 461 Modified: ccm-simplesurvey/trunk/ ccm-simplesurvey/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-simplesurvey/ Property changes on: ccm-simplesurvey/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-simplesurvey/:1-318 + /releases/1.0.2/ccm-simplesurvey/:1-431 Modified: ccm-simplesurvey/trunk/application.xml =================================================================== --- ccm-simplesurvey/trunk/application.xml 2005-03-20 23:12:19 UTC (rev 460) +++ ccm-simplesurvey/trunk/application.xml 2005-03-20 23:12:22 UTC (rev 461) @@ -1,24 +1,19 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-simplesurvey" - prettyName="Core" - version="1.4.1" - release="7" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-simplesurvey" + prettyName="Core" + version="1.4.1" + release="9"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:14:34
|
Author: mbooth Date: 2005-03-21 00:12:15 +0100 (Mon, 21 Mar 2005) New Revision: 459 Modified: ccm-cms-types-mparticle/trunk/ ccm-cms-types-mparticle/trunk/application.xml ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ArticleSection.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-mparticle/ Property changes on: ccm-cms-types-mparticle/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-mparticle/:1-318 + /releases/1.0.2/ccm-cms-types-mparticle/:1-431 Modified: ccm-cms-types-mparticle/trunk/application.xml =================================================================== --- ccm-cms-types-mparticle/trunk/application.xml 2005-03-20 23:12:08 UTC (rev 458) +++ ccm-cms-types-mparticle/trunk/application.xml 2005-03-20 23:12:15 UTC (rev 459) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-mparticle" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-mparticle" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Multi-Part Article Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> Modified: ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ArticleSection.java =================================================================== --- ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ArticleSection.java 2005-03-20 23:12:08 UTC (rev 458) +++ ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ArticleSection.java 2005-03-20 23:12:15 UTC (rev 459) @@ -20,9 +20,12 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.cms.CMS; +import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; +import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ImageAsset; import com.arsdigita.cms.TextAsset; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.permissions.PermissionService; @@ -175,4 +178,33 @@ PermissionService.setContext( this, getMPArticle() ); } + + + /** + * This overrides the method on ContentItem, the API of which + * says that this method can return a null eg. if the method is + * called on an Article's ImageAsset. + * + * However there seems to be a problem with ArticleSections returning + * null when they shouldn't. If that happens we are going to look up the + * parent which we check is a MultiPartArticle and call getContentSection + * on that. + * + * @return The content section to which this item belongs + */ + public ContentSection getContentSection() { + ContentSection ct = super.getContentSection(); + if (ct != null) { + return ct; + } else { + ACSObject parent = getParent(); + if (parent != null && parent instanceof MultiPartArticle) { + ct = ((ContentItem)parent).getContentSection(); + return ct; + } + } + // this will be picked up by ContentItem.beforeSave() + // where upon setDefaultContentSection will be called.. + return null; + } } |
|
From: <mb...@re...> - 2005-03-20 23:14:26
|
Author: mbooth Date: 2005-03-21 00:12:08 +0100 (Mon, 21 Mar 2005) New Revision: 458 Modified: ccm-cms-types-service/trunk/ ccm-cms-types-service/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-service/ Property changes on: ccm-cms-types-service/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-service/:1-318 + /releases/1.0.2/ccm-cms-types-service/:1-431 Modified: ccm-cms-types-service/trunk/application.xml =================================================================== --- ccm-cms-types-service/trunk/application.xml 2005-03-20 23:11:45 UTC (rev 457) +++ ccm-cms-types-service/trunk/application.xml 2005-03-20 23:12:08 UTC (rev 458) @@ -1,28 +1,23 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-service" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-service" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/> <ccm:contact uri="mailto:cc...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Service Content Type for the Red Hat CCM CMS. </ccm:description> |
|
From: <mb...@re...> - 2005-03-20 23:14:21
|
Author: mbooth Date: 2005-03-21 00:11:45 +0100 (Mon, 21 Mar 2005) New Revision: 457 Added: ccm-ldn-terms/trunk/doc/esd/xml-1.04/ ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-gcl-2.10.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgal-0.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-lite-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgdl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgil-0.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgsl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-lite-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01-lgsl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgil-0.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-gcl-2.10.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-lgsl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgsl-2.00-lgcl-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/related-lgcl-1.04.xml ccm-ldn-terms/trunk/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql Removed: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-gcl-2.10.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgal-0.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-lite-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgdl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgil-0.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgsl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-lite-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01-lgsl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgil-0.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-gcl-2.10.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-lgsl-2.01.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgsl-2.00-lgcl-1.04.xml ccm-ldn-terms/trunk/doc/esd/xml-1.04/related-lgcl-1.04.xml ccm-ldn-terms/trunk/pdl/com/arsdigita/london/terms/atoz/ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/atoz/ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/atoz/ Modified: ccm-ldn-terms/trunk/ ccm-ldn-terms/trunk/application.xml ccm-ldn-terms/trunk/doc/esd/files-1.04.txt ccm-ldn-terms/trunk/doc/esd/generate.pl ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl ccm-ldn-terms/trunk/src/WEB-INF/resources/terms-adapters.xml ccm-ldn-terms/trunk/src/ccm-ldn-terms.load ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Initializer.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/RelatedBuilder.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-terms/ Property changes on: ccm-ldn-terms/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-terms/:1-318 + /releases/1.0.2/ccm-ldn-terms/:1-431 Modified: ccm-ldn-terms/trunk/application.xml =================================================================== --- ccm-ldn-terms/trunk/application.xml 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/application.xml 2005-03-20 23:11:45 UTC (rev 457) @@ -1,26 +1,20 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-terms" - prettyName="Terms" - version="1.0.1" - release="4" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-terms" + prettyName="Terms" + version="1.0.2" + release="3"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-ldn-util" version="1.4.1"/> - <ccm:requires name="ccm-ldn-atoz" version="1.0.1"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> Modified: ccm-ldn-terms/trunk/doc/esd/files-1.04.txt =================================================================== --- ccm-ldn-terms/trunk/doc/esd/files-1.04.txt 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/doc/esd/files-1.04.txt 2005-03-20 23:11:45 UTC (rev 457) @@ -17,3 +17,4 @@ http://www.esd.org.uk/standards/lgcl/1.04/lgclhierarchy.xml,hierarchy-lgcl-lite-1.04.xml,xslt-1.04/ItemsHierarchy2hierarchyLite.xsl http://www.esd.org.uk/standards/lgil/lgil.xml,domain-lgil-0.01.xml,xslt-1.04/ControlledList2domain.xsl http://www.esd.org.uk/standards/lgil/lgil.xml,hierarchy-lgil-0.01.xml,xslt-1.04/ControlledList2hierarchy.xsl +http://www.esd.org.uk/standards/lgal/0.01/lgal.xml,domain-lgal-0.01.xml,xslt-1.04/ControlledList2domain.xsl Modified: ccm-ldn-terms/trunk/doc/esd/generate.pl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/generate.pl 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/doc/esd/generate.pl 2005-03-20 23:11:45 UTC (rev 457) @@ -11,12 +11,12 @@ my $xsl = $3; if (-x "/usr/bin/xsltproc") { - print "wget -q -O /dev/stdout $src | /usr/bin/xsltproc $xsl /dev/stdin | xmllint -format /dev/stdin > $dst\n"; - (system "wget -q -O /dev/stdout $src | /usr/bin/xsltproc $xsl /dev/stdin | xmllint -format /dev/stdin > $dst") == 0 + print "wget -q -O - $src | /usr/bin/xsltproc $xsl - | xmllint -format - > $dst\n"; + (system "wget -q -O - $src | /usr/bin/xsltproc $xsl - | xmllint -format - > $dst") == 0 or die "cannot run xsltproc: $@"; } else { - print "wget -q -O /dev/stdout $src | ccm-run com.arsdigita.templating.ApplyTemplates $xsl /dev/stdin /dev/stdout | xmllint -format /dev/stdin > $dst\n"; - (system "wget -q -O /dev/stdout $src | ccm-run com.arsdigita.templating.ApplyTemplates $xsl /dev/stdin /dev/stdout | xmllint -format /dev/stdin > $dst") == 0 + print "wget -q -O - $src | ccm-run com.arsdigita.templating.ApplyTemplates $xsl - - | xmllint -format - > $dst\n"; + (system "wget -q -O - $src | ccm-run com.arsdigita.templating.ApplyTemplates $xsl - - | - > $dst") == 0 or die "cannot can ApplyTemplates: $@"; } } Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04 (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-gcl-2.10.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-gcl-2.10.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-gcl-2.10.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgal-0.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgal-0.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-lgal-0.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-1.04.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-1.04.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-lgcl-1.04.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-lite-1.04.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgcl-lite-1.04.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-lgcl-lite-1.04.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgdl-2.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgdl-2.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-lgdl-2.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgil-0.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgil-0.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-lgil-0.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgsl-2.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/domain-lgsl-2.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/domain-lgsl-2.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-1.04.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-1.04.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/hierarchy-lgcl-1.04.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-lite-1.04.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgcl-lite-1.04.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/hierarchy-lgcl-lite-1.04.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01-lgsl-2.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01-lgsl-2.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/hierarchy-lgdl-2.01-lgsl-2.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgdl-2.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/hierarchy-lgdl-2.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgil-0.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/hierarchy-lgil-0.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/hierarchy-lgil-0.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-gcl-2.10.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-gcl-2.10.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/mapping-lgcl-1.04-gcl-2.10.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-lgsl-2.01.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgcl-1.04-lgsl-2.01.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/mapping-lgcl-1.04-lgsl-2.01.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgsl-2.00-lgcl-1.04.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/mapping-lgsl-2.00-lgcl-1.04.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/mapping-lgsl-2.00-lgcl-1.04.xml) Deleted: ccm-ldn-terms/trunk/doc/esd/xml-1.04/related-lgcl-1.04.xml Copied: ccm-ldn-terms/trunk/doc/esd/xml-1.04/related-lgcl-1.04.xml (from rev 431, releases/1.0.2/ccm-ldn-terms/doc/esd/xml-1.04/related-lgcl-1.04.xml) Modified: ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl =================================================================== --- ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/doc/esd/xslt-1.04/ControlledList2hierarchy.xsl 2005-03-20 23:11:45 UTC (rev 457) @@ -8,7 +8,7 @@ <xsl:template match="esd:ControlledList"> <terms:hierarchy> <terms:domain resource="{@HomeLocation}"/> - <xsl:apply-templates select="esd:Item"/> + <xsl:apply-templates select="esd:Item[not(esd:BroaderItem)]"/> <xsl:apply-templates select="esd:Item/esd:BroaderItem"/> </terms:hierarchy> </xsl:template> Copied: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql (from rev 431, releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql) Copied: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql (from rev 431, releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql) Copied: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql (from rev 431, releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql) Modified: ccm-ldn-terms/trunk/src/WEB-INF/resources/terms-adapters.xml =================================================================== --- ccm-ldn-terms/trunk/src/WEB-INF/resources/terms-adapters.xml 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/src/WEB-INF/resources/terms-adapters.xml 2005-03-20 23:11:45 UTC (rev 457) @@ -4,16 +4,6 @@ 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.london.atoz.ui.admin.ProviderDetails"> - <xrd:adapter objectType="com.arsdigita.london.terms.atoz.DomainProvider"> - <xrd:attributes rule="exclude"> - <xrd:property name="/object/id"/> - <xrd:property name="/object/defaultDomainClass"/> - <xrd:property name="/object/displayName"/> - </xrd:attributes> - </xrd:adapter> - </xrd:context> - <xrd:context name="com.arsdigita.london.terms.ui.AbstractTermDetails"> <xrd:adapter objectType="com.arsdigita.london.terms.Term"> <xrd:attributes rule="exclude"> Modified: ccm-ldn-terms/trunk/src/ccm-ldn-terms.load =================================================================== --- ccm-ldn-terms/trunk/src/ccm-ldn-terms.load 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/src/ccm-ldn-terms.load 2005-03-20 23:11:45 UTC (rev 457) @@ -2,10 +2,8 @@ <requires> <table name="inits"/> <table name="acs_objects"/> - <table name="atoz_provider"/> <initializer class="com.arsdigita.core.Initializer"/> <initializer class="com.arsdigita.london.util.Initializer"/> - <initializer class="com.arsdigita.london.atoz.Initializer"/> </requires> <provides> <table name="trm_app"/> Modified: ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade =================================================================== --- ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade 2005-03-20 23:11:45 UTC (rev 457) @@ -3,4 +3,7 @@ <script sql="ccm-ldn-terms/upgrade/::database::-1.0.0-1.0.1.sql"/> <script class="com.arsdigita.london.terms.upgrade.Upgrade100to101"/> </version> + <version from="1.0.1" to="1.0.2"> + <script sql="ccm-ldn-terms/upgrade/::database::-1.0.1-1.0.2.sql"/> + </version> </upgrade> Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Initializer.java =================================================================== --- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Initializer.java 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Initializer.java 2005-03-20 23:11:45 UTC (rev 457) @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - package com.arsdigita.london.terms; import com.arsdigita.domain.DomainObject; @@ -43,19 +42,8 @@ import com.arsdigita.kernel.URLFinder; import com.arsdigita.kernel.NoValidURLException; -import com.arsdigita.london.atoz.AtoZProviderType; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.terms.ui.atoz.DomainProviderAdmin; -import com.arsdigita.london.terms.ui.atoz.DomainProviderForm; -import com.arsdigita.london.terms.atoz.DomainProvider; - import com.arsdigita.xml.XML; -import com.arsdigita.util.UncheckedWrapperException; - -import java.net.URL; - - public class Initializer extends CompoundInitializer { public Initializer() { @@ -135,16 +123,6 @@ } }); - AtoZ.getConfig().registerProviderType( - new AtoZProviderType( - "ESD Toolkit Domain Provider", - "Provides a ESD Toolkit A-Z", - DomainProvider.class, - DomainProviderForm.class, - DomainProviderAdmin.class - ) - ); - XML.parse(Terms.getConfig().getTraversalAdapters(), new TraversalHandler()); } Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java =================================================================== --- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java 2005-03-20 23:11:45 UTC (rev 457) @@ -5,12 +5,12 @@ * 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 @@ -34,17 +34,17 @@ /** * Instances of this class represent entries in a domain * of terms. - * - * Although terms are currently modelled using the + * + * Although terms are currently modelled using the * categorization service, it is not neccessarily going - * remain this way, hence the getModel() method is - * protected. + * remain this way, hence the getModel() method is + * protected. */ public class Term extends ACSObject { private static final Logger s_log = Logger.getLogger(Term.class); - public static final String BASE_DATA_OBJECT_TYPE = + public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.terms.Term"; public static final String UNIQUE_ID = "uniqueID"; @@ -60,7 +60,7 @@ Term() { this(BASE_DATA_OBJECT_TYPE); } - + protected Term(String type) { super(type); } @@ -71,12 +71,12 @@ public void initialize() { super.initialize(); - + if (isNew()) { set(MODEL, new Category()); } } - + /** * Creates a new term within a domain. All * parameters are required except for shortcut @@ -99,29 +99,29 @@ term.setName(name); term.setInAtoZ(inAtoZ); - term.setShortcut(shortcut); + term.setShortcut(shortcut); if (s_log.isDebugEnabled()) { - s_log.debug("Created term " + term.getID() + " with unique id " + + s_log.debug("Created term " + term.getID() + " with unique id " + uniqueID + " and name " + name + " in domain " + domain); } - + return term; } - + private void setUniqueID(Integer uniqueID) { Assert.exists(uniqueID, Integer.class); set(UNIQUE_ID, uniqueID); } - + /** * Retrieves the unique identifier for this term. */ public Integer getUniqueID() { return (Integer)get(UNIQUE_ID); } - + /** * Updates the name of this term * @param name the term's new name @@ -131,7 +131,7 @@ getModel().setName(name); getModel().setURL(cleanURL(name)); } - + /** * Retrieves the name of this term * @return the name of the term @@ -139,7 +139,7 @@ public String getName() { return getModel().getName(); } - + /** * Updates the description of this term * @param description the term's new description @@ -148,7 +148,7 @@ Assert.exists(description, String.class); getModel().setDescription(description); } - + /** * Retrieves the description of this term * @return the description of the term @@ -156,7 +156,7 @@ public String getDescription() { return getModel().getDescription(); } - + /** * Update the flag indicating whether this * term is suitable for inclusion in an A-Z @@ -165,7 +165,7 @@ public void setInAtoZ(boolean inAtoZ) { set(IN_ATOZ, new Boolean(inAtoZ)); } - + /** * Determines whether the term is suitable * for inclusion in an A-Z @@ -181,7 +181,7 @@ public void setShortcut(String shortcut) { set(SHORTCUT, shortcut); } - + /** * Retrieves the URL fragment forming a shortcut * to this term @@ -189,12 +189,12 @@ public String getShortcut() { return (String)get(SHORTCUT); } - + private void setDomain(Domain domain) { Assert.exists(domain, Domain.class); setAssociation(DOMAIN, domain); } - + /** * Retrieves the domain containing this term * @return the domain containing this term @@ -203,13 +203,13 @@ return (Domain)DomainObjectFactory .newInstance((DataObject)get(DOMAIN)); } - + public Category getModel() { return (Category)DomainObjectFactory .newInstance((DataObject)get(MODEL)); } - + /** * Adds a narrower term to this term * @param term the narrower term @@ -222,28 +222,28 @@ // "narrower term is in this domain"); if (s_log.isDebugEnabled()) { - s_log.debug("Adding narrower term " + term + " to " + + s_log.debug("Adding narrower term " + term + " to " + this + " isDefault?" + isDefault); } getModel().addChild(term.getModel()); term.getModel().setEnabled(isPreferred); - + if (isDefault) { term.getModel().setDefaultParentCategory(getModel()); } } - + /** * Removes a narrower term from this term * @param term the narrower term to remove */ public void removeNarrowerTerm(Term term) { if (s_log.isDebugEnabled()) { - s_log.debug("Removing narrower term " + term + " from " + + s_log.debug("Removing narrower term " + term + " from " + this); } - + getModel().removeChild(term.getModel()); } @@ -257,22 +257,8 @@ terms.addEqualsFilter("model.parents.link.relationType", "child"); return terms; } - - + /** - * Retrieves the collection of narrower terms - * for which this term is the default parent - * @return a collection of narrower terms - * - */ - public DomainCollection getDefaultNarrowerTerms() { - DomainCollection terms = getNarrowerTerms(); - terms.addEqualsFilter("model.parents.link.isDefault", Boolean.TRUE); - return terms; - } - - - /** * Retrieves the collection of broader terms * @return a collection of broader terms */ @@ -280,9 +266,9 @@ DomainCollection terms = getDomain().getTerms(); terms.addEqualsFilter("model.related.id", getModel().getID()); terms.addEqualsFilter("model.related.link.relationType", "child"); - return terms; + return terms; } - + /** * Retrieves the default broader term * @return the default broader term @@ -298,33 +284,33 @@ throw new DataObjectNotFoundException( "No default broader term for " + getID()); } - + /** * Adds a related term to this term * @param term the related term */ public void addRelatedTerm(Term term) { if (s_log.isDebugEnabled()) { - s_log.debug("Adding related term " + term + " to " + + s_log.debug("Adding related term " + term + " to " + this); } getModel().addRelatedCategory(term.getModel()); } - + /** * Removes a related term to this term * @param term the related term */ public void removeRelatedTerm(Term term) { if (s_log.isDebugEnabled()) { - s_log.debug("Removing related term " + term + "from " + + s_log.debug("Removing related term " + term + "from " + this); } getModel().removeRelatedCategory(term.getModel()); } - + /** * Retrieves the related terms within this terms * domain @@ -336,7 +322,7 @@ terms.addEqualsFilter("model.parents.link.relationType", "related"); return terms; } - + /** * Retrieves the related terms within this terms * domain @@ -369,7 +355,7 @@ public void addObject(ACSObject obj) { getModel().addChild(obj); } - + /** * Unclassifies an object against this term * @param obj the object to unclassify Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/RelatedBuilder.java =================================================================== --- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/RelatedBuilder.java 2005-03-20 23:11:41 UTC (rev 456) +++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/RelatedBuilder.java 2005-03-20 23:11:45 UTC (rev 457) @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; +import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainCollection; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Term; @@ -36,7 +37,7 @@ private Domain m_src_domain; private Domain m_dst_domain; - private boolean m_removed_related_terms = false; + private boolean m_removed_related_terms = false; public void findSourceDomain(String url) throws Exception { @@ -61,47 +62,62 @@ * */ private void removeRelatedTerms() { - Assert.exists(m_src_domain); - s_log.debug("removing related terms from domain "+m_src_domain); - if(m_removed_related_terms) { - //done this!! - s_log.warn("This method has been called twice. This is unexpected."); - return; - } - m_removed_related_terms = true; - DomainCollection srcTerms = m_src_domain.getTerms(); - s_log.debug("got terms "+srcTerms); - Domain domain = m_dst_domain; - if(m_dst_domain == null) { - s_log.debug("destination domain is null. Assume related terms within a single domain"); - domain = m_src_domain; - - } - while(srcTerms.next()) { - Term srcTerm = (Term)srcTerms.getDomainObject(); - DomainCollection relatedTerms = srcTerm.getRelatedTerms(domain); - while(relatedTerms.next()){ - Term related = (Term)relatedTerms.getDomainObject(); - srcTerm.removeRelatedTerm(related); - } - } + Assert.exists(m_src_domain); + s_log.debug("removing related terms from domain "+m_src_domain); + if(m_removed_related_terms) { + //done this!! + s_log.warn("This method has been called twice. This is unexpected."); + return; + } + m_removed_related_terms = true; + DomainCollection srcTerms = m_src_domain.getTerms(); + s_log.debug("got terms "+srcTerms); + Domain domain = m_dst_domain; + if(m_dst_domain == null) { + s_log.debug("destination domain is null. Assume related terms within a single domain"); + domain = m_src_domain; + + } + while(srcTerms.next()) { + Term srcTerm = (Term)srcTerms.getDomainObject(); + DomainCollection relatedTerms = srcTerm.getRelatedTerms(domain); + while(relatedTerms.next()){ + Term related = (Term)relatedTerms.getDomainObject(); + srcTerm.removeRelatedTerm(related); + } + } } - public void addRelatedTerm(Integer srcID, + public void addRelatedTerm(Integer srcID, Integer dstID) { Assert.exists(m_src_domain, Domain.class); Assert.exists(srcID, Integer.class); Assert.exists(dstID, Integer.class); if(!m_removed_related_terms) { - removeRelatedTerms(); - } - Term srcTerm = m_src_domain.getTerm(srcID); - Term dstTerm = m_dst_domain == null ? - m_src_domain.getTerm(dstID) : - m_dst_domain.getTerm(dstID); + removeRelatedTerms(); + } + Term srcTerm; + try { + srcTerm = m_src_domain.getTerm(srcID); + } catch (DataObjectNotFoundException ex) { + s_log.warn("Not mapping from non-existent term " + srcID + + " in domain " + m_src_domain.getKey()); + return; + } + + Domain dst_domain = m_dst_domain == null ? m_src_domain : m_dst_domain; + Term dstTerm; + try { + dstTerm = dst_domain.getTerm(dstID); + } catch (DataObjectNotFoundException ex) { + s_log.warn("Not mapping to non-existent term " + dstID + + " in domain " + dst_domain.getKey()); + return; + } + srcTerm.addRelatedTerm(dstTerm); s_log.debug("Term " + srcTerm + " related " + dstTerm); srcTerm.save(); |
|
From: <mb...@re...> - 2005-03-20 23:13:55
|
Author: mbooth Date: 2005-03-21 00:11:41 +0100 (Mon, 21 Mar 2005) New Revision: 456 Modified: ccm-ldn-util/trunk/ ccm-ldn-util/trunk/application.xml ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantCheck.java Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-util/ Property changes on: ccm-ldn-util/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-util/:1-318 + /releases/1.0.2/ccm-ldn-util/:1-431 Modified: ccm-ldn-util/trunk/application.xml =================================================================== --- ccm-ldn-util/trunk/application.xml 2005-03-20 23:11:38 UTC (rev 455) +++ ccm-ldn-util/trunk/application.xml 2005-03-20 23:11:41 UTC (rev 456) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-util" - prettyName="Util" - version="1.4.1" - release="10" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-util" + prettyName="Util" + version="1.4.1" + release="12"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="src"/> <ccm:directory name="test"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> Modified: ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantCheck.java =================================================================== --- ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantCheck.java 2005-03-20 23:11:38 UTC (rev 455) +++ ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantCheck.java 2005-03-20 23:11:41 UTC (rev 456) @@ -30,7 +30,7 @@ private static final Logger s_log = Logger.getLogger(InvariantCheck.class); public InvariantCheck() { - super("Bulk Publish", + super("Invariant Check", "1.0.0", ""); } |
|
From: <mb...@re...> - 2005-03-20 23:13:51
|
Author: mbooth Date: 2005-03-21 00:11:38 +0100 (Mon, 21 Mar 2005) New Revision: 455 Modified: ccm-ldn-rss/trunk/ ccm-ldn-rss/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-ldn-rss/ Property changes on: ccm-ldn-rss/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-ldn-rss/:1-318 + /releases/1.0.2/ccm-ldn-rss/:1-431 Modified: ccm-ldn-rss/trunk/application.xml =================================================================== --- ccm-ldn-rss/trunk/application.xml 2005-03-20 23:11:35 UTC (rev 454) +++ ccm-ldn-rss/trunk/application.xml 2005-03-20 23:11:38 UTC (rev 455) @@ -1,26 +1,21 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-rss" - prettyName="RSS" - version="1.4.1" - release="8" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-rss" + prettyName="RSS" + version="1.4.1" + release="10"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-ldn-util" version="1.4.1"/> - <ccm:requires name="ccm-ldn-terms" version="1.0.1"/> + <ccm:requires name="ccm-ldn-terms" version="1.0.2"/> </ccm:dependencies> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Red Hat Web Application Framework is a platform for writing database-backed web applications in Java. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:13:48
|
Author: mbooth Date: 2005-03-21 00:11:35 +0100 (Mon, 21 Mar 2005) New Revision: 454 Modified: ccm-cms-types-motditem/trunk/ ccm-cms-types-motditem/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-motditem/ Property changes on: ccm-cms-types-motditem/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-motditem/:1-318 + /releases/1.0.2/ccm-cms-types-motditem/:1-431 Modified: ccm-cms-types-motditem/trunk/application.xml =================================================================== --- ccm-cms-types-motditem/trunk/application.xml 2005-03-20 23:11:32 UTC (rev 453) +++ ccm-cms-types-motditem/trunk/application.xml 2005-03-20 23:11:35 UTC (rev 454) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-motditem" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-motditem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Message of the Day Item Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:13:47
|
Author: mbooth Date: 2005-03-21 00:11:28 +0100 (Mon, 21 Mar 2005) New Revision: 451 Modified: ccm-cms-types-bookmark/trunk/ ccm-cms-types-bookmark/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-bookmark/ Property changes on: ccm-cms-types-bookmark/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-bookmark/:1-318 + /releases/1.0.2/ccm-cms-types-bookmark/:1-431 Modified: ccm-cms-types-bookmark/trunk/application.xml =================================================================== --- ccm-cms-types-bookmark/trunk/application.xml 2005-03-20 23:11:26 UTC (rev 450) +++ ccm-cms-types-bookmark/trunk/application.xml 2005-03-20 23:11:28 UTC (rev 451) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-bookmark" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-bookmark" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The FAQ Item Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> |
|
From: <mb...@re...> - 2005-03-20 23:13:45
|
Author: mbooth Date: 2005-03-21 00:11:32 +0100 (Mon, 21 Mar 2005) New Revision: 453 Modified: ccm-cms-types-siteproxy/trunk/ ccm-cms-types-siteproxy/trunk/application.xml Log: Merged revisions 319-431 via svnmerge from /releases/1.0.2/ccm-cms-types-siteproxy/ Property changes on: ccm-cms-types-siteproxy/trunk ___________________________________________________________________ Name: svnmerge-integrated - /releases/1.0.2/ccm-cms-types-siteproxy/:1-318 + /releases/1.0.2/ccm-cms-types-siteproxy/:1-431 Modified: ccm-cms-types-siteproxy/trunk/application.xml =================================================================== --- ccm-cms-types-siteproxy/trunk/application.xml 2005-03-20 23:11:30 UTC (rev 452) +++ ccm-cms-types-siteproxy/trunk/application.xml 2005-03-20 23:11:32 UTC (rev 453) @@ -1,30 +1,24 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-cms-types-siteproxy" +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-cms-types-siteproxy" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - + release="9" + webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> </ccm:dependencies> - <ccm:directories> <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> </ccm:directories> - <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="mailto:rh...@re..." type="support"/> </ccm:contacts> - <ccm:description> The Glossary Item Content Type for the Red Hat CCM CMS. </ccm:description> - </ccm:application> |
18 messages has been excluded from this view by a project administrator.
