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: <ss...@vh...> - 2005-08-09 19:22:06
|
Author: sshinde
Date: 2005-08-09 16:25:17 +0200 (Tue, 09 Aug 2005)
New Revision: 691
Modified:
releases/1.0.2/ccm-ldn-navigation/application.xml
releases/1.0.2/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Category.pdl
releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java
Log:
Merged back the changes for revision 595 from the trunk to
fix issues with the navigation not taking into cosideration
the usecontext of the categories.
Modified: releases/1.0.2/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/application.xml 2005-08-08 14:42:09 UTC (rev 690)
+++ releases/1.0.2/ccm-ldn-navigation/application.xml 2005-08-09 14:25:17 UTC (rev 691)
@@ -3,7 +3,7 @@
name="ccm-ldn-navigation"
prettyName="Navigation"
version="1.4.4"
- release="7"
+ release="8"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
Modified: releases/1.0.2/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Category.pdl
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Category.pdl 2005-08-08 14:42:09 UTC (rev 690)
+++ releases/1.0.2/ccm-ldn-navigation/pdl/com/arsdigita/london/navigation/Category.pdl 2005-08-09 14:25:17 UTC (rev 691)
@@ -111,20 +111,3 @@
id = m.related_category_id;
}
}
-
-
-query getAppPathForCategory {
- String primaryURL;
- do {
- select a.primary_url
- from applications a,
- application_types t,
- cat_root_cat_object_map m
- where m.category_id in :categoryIDs
- and m.object_id = a.application_id
- and a.application_type_id = t.application_type_id
- and t.object_type = :objectType
- } map {
- primaryURL = a.primary_url;
- }
-}
Modified: releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java 2005-08-08 14:42:09 UTC (rev 690)
+++ releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/Initializer.java 2005-08-09 14:25:17 UTC (rev 691)
@@ -22,6 +22,8 @@
import com.arsdigita.categorization.CategoryCollection;
import com.arsdigita.db.DbHelper;
+import com.arsdigita.cms.TemplateContext;
+
import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainObjectInstantiator;
@@ -31,8 +33,9 @@
import com.arsdigita.kernel.URLFinder;
import com.arsdigita.kernel.ACSObjectInstantiator;
+import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.DataQuery;
+import com.arsdigita.persistence.Filter;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.pdl.ManifestSource;
@@ -44,6 +47,7 @@
import com.arsdigita.runtime.PDLInitializer;
import com.arsdigita.runtime.DomainInitEvent;
+import com.arsdigita.web.Application;
import com.arsdigita.web.ParameterMap;
import com.arsdigita.web.URL;
import com.arsdigita.web.Web;
@@ -64,6 +68,8 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import org.apache.log4j.Logger;
@@ -216,7 +222,7 @@
ancestors.addOrder(Category.DEFAULT_ANCESTORS);
List ids = new ArrayList();
- StringBuffer path = new StringBuffer();
+ List paths = new LinkedList();
boolean first = true;
while (ancestors.next()) {
Category anc = ancestors.getCategory();
@@ -226,45 +232,71 @@
ids.add(anc.getID());
if (first) {
first = false;
+ paths.add("");
continue;
}
- if (path != null) {
+ if (paths != null) {
String url = anc.getURL();
if (url != null && !"".equals(url)) {
s_log.debug("Appending '" + url + "' for anc");
- path.append(url).append("/");
+ paths.add(url);
} else {
if (s_log.isInfoEnabled()) {
s_log.info("Cat " + anc + " has no url ");
}
- path = null;
+ paths = null;
}
} else {
s_log.debug("Path is null");
}
}
- if (s_log.isInfoEnabled()) {
- s_log.info("Path is now " + path);
+ if (s_log.isDebugEnabled() && null != paths) {
+ StringBuffer buf = new StringBuffer();
+ Iterator idsit = ids.iterator();
+ Iterator pathsit = paths.iterator();
+ while(idsit.hasNext()) {
+ buf.append(idsit.next().toString()).append(' ');
+ buf.append(pathsit.next().toString()).append('/');
+ }
+ s_log.debug("Full path is " + buf.toString());
}
- DataQuery q = SessionManager.getSession().retrieveQuery(
- "com.arsdigita.categorization.getAppPathForCategory");
- q.setParameter("categoryIDs", ids);
- q.setParameter("objectType", Navigation.BASE_DATA_OBJECT_TYPE);
+ TemplateContext tContext =
+ Navigation.getContext().getTemplateContext();
+ String useContext = null == tContext ?
+ null : tContext.getContext();
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Use Context: " + useContext);
+ }
+
+ DataCollection apps = SessionManager.getSession().retrieve
+ (Application.BASE_DATA_OBJECT_TYPE);
+ apps.addEqualsFilter("objectType", Navigation.BASE_DATA_OBJECT_TYPE);
+ apps.addEqualsFilter("rootUseContext.useContext", useContext);
+ Filter f = apps.addFilter("rootUseContext.rootCategory in :ids");
+ f.set("ids", ids);
+
+ apps.addPath("rootUseContext.rootCategory.id");
String appURL = null;
- if (!q.next()) {
+ BigDecimal rootCatID = null;
+
+ if (!apps.next()) {
appURL = Navigation.getConfig().getDefaultCategoryRootPath();
// We can only use named paths if the category is mapped
- // to a navigation app instance in public use context
- path = null;
+ // to a navigation app instance in the current
+ // use context
+ paths = null;
if (s_log.isDebugEnabled()) {
s_log.debug("Using default nav path " + appURL);
}
} else {
- appURL = (String)q.get("primaryURL");
- q.close();
+ Application app = (Application)
+ DomainObjectFactory.newInstance(apps.getDataObject());
+ appURL = app.getPrimaryURL();
+ rootCatID = (BigDecimal) apps.get("rootUseContext.rootCategory.id");
+ apps.close();
}
if (s_log.isInfoEnabled()) {
@@ -275,12 +307,30 @@
Assert.truth(appURL.endsWith("/"), "url ends with '/'");
ParameterMap map = new ParameterMap();
- if (path == null) {
+ String path;
+ if (paths == null) {
map.setParameter("categoryID", cat.getID());
- path = new StringBuffer("category.jsp");
+ path = "category.jsp";
+ } else {
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Generating path from category " +
+ rootCatID);
+ }
+ StringBuffer buf = new StringBuffer();
+ Iterator pathsit = paths.iterator();
+ Iterator idsit = ids.iterator();
+ boolean gotRoot = false;
+ while(pathsit.hasNext()) {
+ String frag = (String)pathsit.next();
+ BigDecimal id = (BigDecimal)idsit.next();
+ if (gotRoot) buf.append(frag).append('/');
+ else if (id.equals(rootCatID)) gotRoot = true;
+ }
+ path = buf.toString();
}
+
String url = URL.there(Web.getRequest(),
- appURL + path.toString(), map).toString();
+ appURL + path, map).toString();
if (s_log.isInfoEnabled()) {
s_log.info("Final url is " + url);
}
|
Author: sskracic
Date: 2005-08-08 16:42:09 +0200 (Mon, 08 Aug 2005)
New Revision: 690
Modified:
releases/1.0.2/ccm-cms/application.xml
releases/1.0.2/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl
releases/1.0.2/ccm-ldn-navigation/application.xml
releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
Log:
Integrating r689 from trunk (Category.isEnabled and isAbstract semantics fix).
Modified: releases/1.0.2/ccm-cms/application.xml
===================================================================
--- releases/1.0.2/ccm-cms/application.xml 2005-08-08 14:38:48 UTC (rev 689)
+++ releases/1.0.2/ccm-cms/application.xml 2005-08-08 14:42:09 UTC (rev 690)
@@ -3,7 +3,7 @@
name="ccm-cms"
prettyName="Red Hat CCM Content Management System"
version="6.1.1"
- release="9"
+ release="10"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
Modified: releases/1.0.2/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl
===================================================================
--- releases/1.0.2/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl 2005-08-08 14:38:48 UTC (rev 689)
+++ releases/1.0.2/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl 2005-08-08 14:42:09 UTC (rev 690)
@@ -149,7 +149,7 @@
]]>
</script>
<div>
- <xsl:apply-templates select="cms:category[@isEnabled = '1']" mode="cms:javascriptCat">
+ <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
<xsl:with-param name="expand" select="'block'"/>
</xsl:apply-templates>
</div>
@@ -185,10 +185,10 @@
<div id="catSelf{@id}">
<xsl:choose>
- <xsl:when test="count(cms:category[@isEnabled = '1']) > 0 and $expand='none'">
+ <xsl:when test="count(cms:category) > 0 and $expand='none'">
<a href="#" onClick="catToggle('{@id}');"><img id="catTog{@id}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
</xsl:when>
- <xsl:when test="count(cms:category[@isEnabled = '1']) > 0 and $expand!='none'">
+ <xsl:when test="count(cms:category) > 0 and $expand!='none'">
<a href="#" onClick="catToggle('{@id}');"><img id="catTog{@id}" src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
</xsl:when>
<xsl:otherwise>
@@ -217,7 +217,7 @@
</span>
</div>
<div id="catCh{@id}" style="margin-left: 20px; display: {$expand}">
- <xsl:apply-templates select="cms:category[@isEnabled = '1']" mode="cms:javascriptCat">
+ <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
<xsl:sort data-type="number" select="@sortKey"/>
</xsl:apply-templates>
</div>
@@ -229,7 +229,7 @@
<xsl:template match="cms:categoryWidget" mode="cms:plain">
<select name="{@name}" size="30" multiple="multiple">
- <xsl:apply-templates select="cms:category[position() = 1]/cms:category[@isEnabled = '1' and @isAbstract = '0']" mode="cms:plainCat"/>
+ <xsl:apply-templates select="cms:category[position() = 1]/cms:category[@isAbstract = '0']" mode="cms:plainCat"/>
</select>
</xsl:template>
@@ -238,7 +238,7 @@
<option value="{@id}"><xsl:value-of select="@fullname"/></option>
</xsl:if>
- <xsl:apply-templates select="cms:category[@isEnabled = '1' and @isAbstract = '0']" mode="cms:plainCat">
+ <xsl:apply-templates select="cms:category[@isAbstract = '0']" mode="cms:plainCat">
<xsl:sort data-type="number" select="@sortKey"/>
</xsl:apply-templates>
</xsl:template>
Modified: releases/1.0.2/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/application.xml 2005-08-08 14:38:48 UTC (rev 689)
+++ releases/1.0.2/ccm-ldn-navigation/application.xml 2005-08-08 14:42:09 UTC (rev 690)
@@ -3,7 +3,7 @@
name="ccm-ldn-navigation"
prettyName="Navigation"
version="1.4.4"
- release="6"
+ release="7"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
Modified: releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java 2005-08-08 14:38:48 UTC (rev 689)
+++ releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java 2005-08-08 14:42:09 UTC (rev 690)
@@ -219,6 +219,7 @@
CategoryCollection children = cat.getChildren();
children.addEqualsFilter(Category.URL, bits[i]);
+ children.addEqualsFilter(Category.IS_ENABLED, Boolean.TRUE);
if (children.next()) {
cat = children.getCategory();
if (s_log.isDebugEnabled()) {
|
|
From: <ssk...@vh...> - 2005-08-08 14:46:40
|
Author: sskracic
Date: 2005-08-08 16:38:48 +0200 (Mon, 08 Aug 2005)
New Revision: 689
Modified:
ccm-cms/trunk/web/__ccm__/static/cms/admin/category-step/category-step.xsl
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationFileResolver.java
Log:
Fixing the isEnabled/isAbstract semantics. If a category is enabled,
then it'll be shown on category navigation and navigation file resolver
will consider it as a resolving target. If a category is abstract, then
it's not available for content authors to categorise the content
against it.
Modified: ccm-cms/trunk/web/__ccm__/static/cms/admin/category-step/category-step.xsl
===================================================================
--- ccm-cms/trunk/web/__ccm__/static/cms/admin/category-step/category-step.xsl 2005-08-05 15:40:32 UTC (rev 688)
+++ ccm-cms/trunk/web/__ccm__/static/cms/admin/category-step/category-step.xsl 2005-08-08 14:38:48 UTC (rev 689)
@@ -149,7 +149,7 @@
]]>
</script>
<div>
- <xsl:apply-templates select="cms:category[@isEnabled = '1']" mode="cms:javascriptCat">
+ <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
<xsl:with-param name="expand" select="'block'"/>
</xsl:apply-templates>
</div>
@@ -185,10 +185,10 @@
<div id="catSelf{@id}">
<xsl:choose>
- <xsl:when test="count(cms:category[@isEnabled = '1']) > 0 and $expand='none'">
+ <xsl:when test="count(cms:category) > 0 and $expand='none'">
<a href="#" onClick="catToggle('{@id}');"><img id="catTog{@id}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
</xsl:when>
- <xsl:when test="count(cms:category[@isEnabled = '1']) > 0 and $expand!='none'">
+ <xsl:when test="count(cms:category) > 0 and $expand!='none'">
<a href="#" onClick="catToggle('{@id}');"><img id="catTog{@id}" src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
</xsl:when>
<xsl:otherwise>
@@ -217,7 +217,7 @@
</span>
</div>
<div id="catCh{@id}" style="margin-left: 20px; display: {$expand}">
- <xsl:apply-templates select="cms:category[@isEnabled = '1']" mode="cms:javascriptCat">
+ <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
<xsl:sort data-type="number" select="@sortKey"/>
</xsl:apply-templates>
</div>
@@ -229,7 +229,7 @@
<xsl:template match="cms:categoryWidget" mode="cms:plain">
<select name="{@name}" size="30" multiple="multiple">
- <xsl:apply-templates select="cms:category[position() = 1]/cms:category[@isEnabled = '1' and @isAbstract = '0']" mode="cms:plainCat"/>
+ <xsl:apply-templates select="cms:category[position() = 1]/cms:category[@isAbstract = '0']" mode="cms:plainCat"/>
</select>
</xsl:template>
@@ -238,7 +238,7 @@
<option value="{@id}"><xsl:value-of select="@fullname"/></option>
</xsl:if>
- <xsl:apply-templates select="cms:category[@isEnabled = '1' and @isAbstract = '0']" mode="cms:plainCat">
+ <xsl:apply-templates select="cms:category[@isAbstract = '0']" mode="cms:plainCat">
<xsl:sort data-type="number" select="@sortKey"/>
</xsl:apply-templates>
</xsl:template>
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationFileResolver.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationFileResolver.java 2005-08-05 15:40:32 UTC (rev 688)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationFileResolver.java 2005-08-08 14:38:48 UTC (rev 689)
@@ -219,6 +219,7 @@
CategoryCollection children = cat.getChildren();
children.addEqualsFilter(Category.URL, bits[i]);
+ children.addEqualsFilter(Category.IS_ENABLED, Boolean.TRUE);
if (children.next()) {
cat = children.getCategory();
if (s_log.isDebugEnabled()) {
|
|
From: <ss...@vh...> - 2005-08-05 15:48:10
|
Author: sshinde
Date: 2005-08-05 17:40:32 +0200 (Fri, 05 Aug 2005)
New Revision: 688
Removed:
ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/default/content-section/table-cms_form_item.sql
Modified:
ccm-cms-types-formitem/trunk/pdl/com/arsdigita/content-section/FormItem.pdl
ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se-create.sql
ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se/upgrade/6.1.1-6.1.2/add-remote.sql
ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItem.java
Log:
Use the persistence generated SQL files rather that custom one.
Removed the on delete cascade constraint in the process on the
cms_form_item.form_id foreging key constraint column.
The on delete cascade was causing self cascading of the formitem and
hence was failing with deletion of XMLFeed which extends FormItem.
Upgrade script for oracle only at the moment.Will be comming shortly for
the postgres.
Modified: ccm-cms-types-formitem/trunk/pdl/com/arsdigita/content-section/FormItem.pdl
===================================================================
--- ccm-cms-types-formitem/trunk/pdl/com/arsdigita/content-section/FormItem.pdl 2005-08-05 14:57:11 UTC (rev 687)
+++ ccm-cms-types-formitem/trunk/pdl/com/arsdigita/content-section/FormItem.pdl 2005-08-05 15:40:32 UTC (rev 688)
@@ -23,11 +23,12 @@
import com.arsdigita.formbuilder.FormSection;
object type FormItem extends ContentPage {
- component FormSection[1..1] form = join cms_form_item.form_id to bebop_form_sections.form_section_id;
String[0..1] css = cms_form_item.css VARCHAR(700);
Boolean remote = cms_form_item.remote_action;
String remoteUrl = cms_form_item.remote_url VARCHAR(700);
+ component FormSection[1..1] form = join cms_form_item.form_id
+ to bebop_form_sections.form_section_id;
reference key (cms_form_item.item_id);
}
Deleted: ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/default/content-section/table-cms_form_item.sql
Modified: ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se/upgrade/6.1.1-6.1.2/add-remote.sql
===================================================================
--- ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se/upgrade/6.1.1-6.1.2/add-remote.sql 2005-08-05 14:57:11 UTC (rev 687)
+++ ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se/upgrade/6.1.1-6.1.2/add-remote.sql 2005-08-05 15:40:32 UTC (rev 688)
@@ -3,3 +3,8 @@
alter table cms_form_item add constraint cms_form_item_remt_act_ck check (remote_action in ('0', '1'));
alter table cms_form_item add remote_url varchar2(700);
+
+alter table cms_form_item drop constraint CMS_FORM_ITEM_FRM_FK;
+
+alter table cms_form_item add constraint CMS_FORM_ITEM_FORM_ID_F_FRZIF
+foreign key (FORM_ID) references BEBOP_FORM_SECTIONS(FORM_SECTION_ID);
Modified: ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se-create.sql
===================================================================
--- ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se-create.sql 2005-08-05 14:57:11 UTC (rev 687)
+++ ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/oracle-se-create.sql 2005-08-05 15:40:32 UTC (rev 688)
@@ -20,7 +20,6 @@
@@ ddl/oracle-se/create.sql
-@@ default/content-section/table-cms_form_item.sql
@@ default/content-section/index-cms_form_item.sql
@@ ddl/oracle-se/deferred.sql
Modified: ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItem.java
===================================================================
--- ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItem.java 2005-08-05 14:57:11 UTC (rev 687)
+++ ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItem.java 2005-08-05 15:40:32 UTC (rev 688)
@@ -35,16 +35,12 @@
import com.arsdigita.cms.dispatcher.XMLGenerator;
import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.formbuilder.PersistentComponent;
import com.arsdigita.formbuilder.PersistentForm;
-import com.arsdigita.formbuilder.PersistentFormSection;
import com.arsdigita.formbuilder.ui.BaseAddObserver;
import com.arsdigita.formbuilder.ui.PlaceholdersInitListener;
import com.arsdigita.formbuilder.ui.FormBuilderXMLRenderer;
import com.arsdigita.formbuilder.ui.ComponentTraverse;
import com.arsdigita.formbuilder.util.FormBuilderUtil;
-import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
@@ -105,27 +101,6 @@
super.beforeSave();
}
- protected void beforeDelete() {
- PersistentForm form = getForm();
- form.delete();
-
- super.beforeDelete();
- }
-
- private void deleteSection(PersistentFormSection form) {
- DataAssociationCursor children = form.getComponents();
-
- while (children.next()) {
- PersistentComponent c = (PersistentComponent)
- DomainObjectFactory.newInstance( children.getDataObject() );
-
- c.delete();
- }
-
- form.clearComponents();
- form.delete();
- }
-
public boolean copyProperty(CustomCopy src,
Property property,
ItemCopier copier) {
|
|
From: <cl...@vh...> - 2005-08-05 15:04:51
|
Author: clasohm
Date: 2005-08-05 16:57:11 +0200 (Fri, 05 Aug 2005)
New Revision: 687
Modified:
contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl
Log:
added download link for uploaded documents
Modified: contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl 2005-08-05 13:41:38 UTC (rev 686)
+++ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl 2005-08-05 14:57:11 UTC (rev 687)
@@ -112,7 +112,9 @@
<th>Methodology Documents</th>
<td class="contentText" align="left" valign="top">
<xsl:for-each select="./methodologyDocuments">
- <a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={id}"><xsl:value-of select="name" /></a><br />
+ <xsl:value-of select="name" />
+ (<a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={id}">view</a>,
+ <a href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={id}">download</a>)<br />
</xsl:for-each>
</td>
</tr>
@@ -128,7 +130,9 @@
<th>Feedback Documents</th>
<td class="contentText" align="left" valign="top">
<xsl:for-each select="./feedbackDocuments">
- <a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={id}"><xsl:value-of select="name" /></a><br />
+ <xsl:value-of select="name" />
+ (<a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={id}">view</a>,
+ <a href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={id}">download</a>)<br />
</xsl:for-each>
</td>
</tr>
|
|
From: <cl...@vh...> - 2005-08-05 13:49:17
|
Author: clasohm
Date: 2005-08-05 15:41:38 +0200 (Fri, 05 Aug 2005)
New Revision: 686
Modified:
contrib/ccm-ldn-camden-consultation/trunk/application.xml
Log:
bumped release number
Modified: contrib/ccm-ldn-camden-consultation/trunk/application.xml
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/application.xml 2005-08-05 12:45:31 UTC (rev 685)
+++ contrib/ccm-ldn-camden-consultation/trunk/application.xml 2005-08-05 13:41:38 UTC (rev 686)
@@ -3,7 +3,7 @@
name="ccm-ldn-camden-consultation"
prettyName="Red Hat CCM Content Types"
version="1.0.0"
- release="1"
+ release="2"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
|
|
From: <cl...@vh...> - 2005-08-05 12:53:06
|
Author: clasohm Date: 2005-08-05 14:45:31 +0200 (Fri, 05 Aug 2005) New Revision: 685 Removed: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/ Log: restored original XSL directory structure |
|
From: <cl...@vh...> - 2005-08-05 12:51:50
|
Author: clasohm Date: 2005-08-05 14:44:10 +0200 (Fri, 05 Aug 2005) New Revision: 684 Added: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/index.xsl Removed: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl Log: restored original XSL directory structure Copied: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/index.xsl (from rev 681, contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl) Deleted: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl |
|
From: <cl...@vh...> - 2005-08-05 12:50:58
|
Author: clasohm Date: 2005-08-05 14:43:22 +0200 (Fri, 05 Aug 2005) New Revision: 683 Modified: ccm-ldn-theme/trunk/ Log: added .classpath and .project to svn:ignore Property changes on: ccm-ldn-theme/trunk ___________________________________________________________________ Name: svn:ignore - build + build .classpath .project |
|
From: <cl...@vh...> - 2005-08-05 12:50:12
|
Author: clasohm Date: 2005-08-05 14:42:35 +0200 (Fri, 05 Aug 2005) New Revision: 682 Added: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl Log: added default XSL stylesheet for Camden Consultations application to make it themeable Added: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl 2005-08-05 11:53:46 UTC (rev 681) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl 2005-08-05 12:42:35 UTC (rev 682) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:bebop="http://www.arsdigita.com/bebop/1.0" + xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" + xmlns:ui="http://www.arsdigita.com/ui/1.0" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + xmlns:nav="http://ccm.redhat.com/london/navigation" + version="1.0"> + + <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/navigation-index.xsl"/> + + <xsl:template name="pageContent"> + <a class="intLink" name="top" /> + <xsl:call-template name="greeting" /> + <xsl:call-template name="contentLinks" /> + <xsl:call-template name="dimensionalNavbars" /> + <xsl:call-template name="dataTables" /> + <xsl:call-template name="boxPanels1" /> + <xsl:call-template name="forms" /> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/DataTable.xsl --> + <xsl:template name="dataTables"> + <xsl:for-each select="bebop:table[@class='dataTable']"> + <table cellpadding="1" cellspacing="2" border="0"> + <xsl:for-each select="thead|bebop:thead"> + <xsl:call-template name="dataTableHead"> + <xsl:with-param name="orderColumn" select="../@order"/> + <xsl:with-param name="direction" select="../@direction"/> + </xsl:call-template> + </xsl:for-each> + <xsl:for-each select="bebop:tbody"> + <xsl:call-template name="dataTableBody"/> + </xsl:for-each> + </table> + </xsl:for-each> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/BoxPanel.xsl --> + <xsl:template name="boxPanels1"> + <xsl:for-each select="bebop:boxPanel[@axis='1']"> + <table> + <xsl:if test="string-length(@width)>0"> + <xsl:attribute name="width"> + <xsl:value-of select="@width"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="string-length(@border)>0"> + <xsl:attribute name="border"> + <xsl:value-of select="@border"/> + </xsl:attribute> + </xsl:if> + <tr> + <xsl:for-each select="bebop:cell"> + <td> + <xsl:for-each select="*/@class|*/@style"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="." /> + </xsl:attribute> + </xsl:for-each> + <xsl:apply-templates/> + </td> + </xsl:for-each> + </tr> + </table> + </xsl:for-each> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl --> + <xsl:template name="dimensionalNavbars"> + <xsl:for-each select="bebop:dimensionalNavbar"> + <xsl:comment>bebop:dimensionalNavbar</xsl:comment> + <xsl:value-of select="@startTag"/> + <xsl:for-each select="*"> + <xsl:apply-templates select="."/> + <xsl:if test="position()!=last()"> + <xsl:choose> + <xsl:when test="string-length(../@delimiter)=0"> +  >  + </xsl:when> + <xsl:otherwise><xsl:value-of select="../@delimiter"/></xsl:otherwise> + </xsl:choose> + </xsl:if> + </xsl:for-each> + <xsl:value-of select="@endTag"/> + <xsl:comment>/bebop:dimensionalNavbar</xsl:comment> + </xsl:for-each> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/Form.xsl --> + <xsl:template name="forms"> + <xsl:for-each select="bebop:form"> + <xsl:value-of select="@message"/> + <form> + <xsl:for-each select="@*[not(self::method)]"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + <xsl:attribute name="method"> + <xsl:choose> + <xsl:when test="string-length(../@method)=0">post</xsl:when> + <xsl:otherwise><xsl:value-of select="../@method"/></xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:for-each> + <xsl:apply-templates /> + </form> + </xsl:for-each> + </xsl:template> + + <xsl:output method="html"/> +</xsl:stylesheet> |
|
From: <cl...@vh...> - 2005-08-05 12:01:32
|
Author: clasohm Date: 2005-08-05 13:53:46 +0200 (Fri, 05 Aug 2005) New Revision: 681 Added: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl Removed: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/ Log: moved XSL stylesheet Copied: contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl (from rev 680, contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/index.xsl) =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/index.xsl 2005-08-05 08:23:34 UTC (rev 680) +++ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/themes/aplaws/consultations-index.xsl 2005-08-05 11:53:46 UTC (rev 681) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:bebop="http://www.arsdigita.com/bebop/1.0" + xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" + xmlns:ui="http://www.arsdigita.com/ui/1.0" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + xmlns:nav="http://ccm.redhat.com/london/navigation" + version="1.0"> + + <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/navigation-index.xsl"/> + + <xsl:template name="pageContent"> + <a class="intLink" name="top" /> + <xsl:call-template name="greeting" /> + <xsl:call-template name="contentLinks" /> + <xsl:call-template name="dimensionalNavbars" /> + <xsl:call-template name="dataTables" /> + <xsl:call-template name="boxPanels1" /> + <xsl:call-template name="forms" /> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/DataTable.xsl --> + <xsl:template name="dataTables"> + <xsl:for-each select="bebop:table[@class='dataTable']"> + <table cellpadding="1" cellspacing="2" border="0"> + <xsl:for-each select="thead|bebop:thead"> + <xsl:call-template name="dataTableHead"> + <xsl:with-param name="orderColumn" select="../@order"/> + <xsl:with-param name="direction" select="../@direction"/> + </xsl:call-template> + </xsl:for-each> + <xsl:for-each select="bebop:tbody"> + <xsl:call-template name="dataTableBody"/> + </xsl:for-each> + </table> + </xsl:for-each> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/BoxPanel.xsl --> + <xsl:template name="boxPanels1"> + <xsl:for-each select="bebop:boxPanel[@axis='1']"> + <table> + <xsl:if test="string-length(@width)>0"> + <xsl:attribute name="width"> + <xsl:value-of select="@width"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="string-length(@border)>0"> + <xsl:attribute name="border"> + <xsl:value-of select="@border"/> + </xsl:attribute> + </xsl:if> + <tr> + <xsl:for-each select="bebop:cell"> + <td> + <xsl:for-each select="*/@class|*/@style"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="." /> + </xsl:attribute> + </xsl:for-each> + <xsl:apply-templates/> + </td> + </xsl:for-each> + </tr> + </table> + </xsl:for-each> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl --> + <xsl:template name="dimensionalNavbars"> + <xsl:for-each select="bebop:dimensionalNavbar"> + <xsl:comment>bebop:dimensionalNavbar</xsl:comment> + <xsl:value-of select="@startTag"/> + <xsl:for-each select="*"> + <xsl:apply-templates select="."/> + <xsl:if test="position()!=last()"> + <xsl:choose> + <xsl:when test="string-length(../@delimiter)=0"> +  >  + </xsl:when> + <xsl:otherwise><xsl:value-of select="../@delimiter"/></xsl:otherwise> + </xsl:choose> + </xsl:if> + </xsl:for-each> + <xsl:value-of select="@endTag"/> + <xsl:comment>/bebop:dimensionalNavbar</xsl:comment> + </xsl:for-each> + </xsl:template> + + <!-- Copied from ccm-core/web/packages/bebop/xsl/Form.xsl --> + <xsl:template name="forms"> + <xsl:for-each select="bebop:form"> + <xsl:value-of select="@message"/> + <form> + <xsl:for-each select="@*[not(self::method)]"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + <xsl:attribute name="method"> + <xsl:choose> + <xsl:when test="string-length(../@method)=0">post</xsl:when> + <xsl:otherwise><xsl:value-of select="../@method"/></xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:for-each> + <xsl:apply-templates /> + </form> + </xsl:for-each> + </xsl:template> + + <xsl:output method="html"/> +</xsl:stylesheet> |
|
From: <cl...@vh...> - 2005-08-05 08:31:11
|
Author: clasohm Date: 2005-08-05 10:23:34 +0200 (Fri, 05 Aug 2005) New Revision: 680 Modified: contrib/ccm-ldn-camden-consultation/trunk/ Log: added build, .classpath and .project to svn:ignore Property changes on: contrib/ccm-ldn-camden-consultation/trunk ___________________________________________________________________ Name: svn:ignore + build .classpath .project |
|
From: <cl...@vh...> - 2005-08-05 08:30:14
|
Author: clasohm
Date: 2005-08-05 10:22:32 +0200 (Fri, 05 Aug 2005)
New Revision: 679
Modified:
contrib/ccm-ldn-camden-consultation/trunk/application.xml
Log:
fixed version numbers for dependencies
Modified: contrib/ccm-ldn-camden-consultation/trunk/application.xml
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/application.xml 2005-08-04 16:01:19 UTC (rev 678)
+++ contrib/ccm-ldn-camden-consultation/trunk/application.xml 2005-08-05 08:22:32 UTC (rev 679)
@@ -6,9 +6,11 @@
release="1"
webapp="ROOT">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.2"/>
- <ccm:requires name="ccm-cms" version="6.1.2"/>
- <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+ <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
+ <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
+ <ccm:requires name="ccm-ldn-aplaws" version="1.9.1" relation="ge"/>
+ <ccm:requires name="ccm-ldn-navigation" version="1.4.4" relation="ge"/>
+ <ccm:requires name="ccm-ldn-util" version="1.4.1" relation="ge"/>
</ccm:dependencies>
<ccm:directories>
<ccm:directory name="pdl"/>
|
Author: clasohm Date: 2005-08-04 18:01:19 +0200 (Thu, 04 Aug 2005) New Revision: 678 Added: contrib/ccm-ldn-camden-consultation/ contrib/ccm-ldn-camden-consultation/trunk/ contrib/ccm-ldn-camden-consultation/trunk/application.xml contrib/ccm-ldn-camden-consultation/trunk/pdl/ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/Consultation.pdl contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.pdl contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationApp.pdl contrib/ccm-ldn-camden-consultation/trunk/sql/ contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/ contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/oracle-se-create.sql contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/postgres-create.sql contrib/ccm-ldn-camden-consultation/trunk/src/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xml contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Consultation.xml contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.config contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.load contrib/ccm-ldn-camden-consultation/trunk/src/com/ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/Consultation.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationApp.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationConfig.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationConfig_parameter.properties contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationLoader.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationMetadataProvider.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationResources.properties contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationTextContentProvider.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationUtil.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/GeoAreaFormatter.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/TargetFormatter.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/TopicFormatter.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/TypeFormatter.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAboutForm.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAboutStep.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAlertForm.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationHowForm.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationHowStep.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationPropertiesForm.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationPropertiesStep.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationResultsForm.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationResultsStep.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationWhoForm.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationWhoStep.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsFilter.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsList.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsNavigationModel.java contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java contrib/ccm-ldn-camden-consultation/trunk/web/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/ contrib/ccm-ldn-camden-consultation/trunk/web/__ccm__/apps/consultations/xsl/index.xsl contrib/ccm-ldn-camden-consultation/trunk/web/packages/ contrib/ccm-ldn-camden-consultation/trunk/web/packages/consultations/ contrib/ccm-ldn-camden-consultation/trunk/web/packages/consultations/templates/ contrib/ccm-ldn-camden-consultation/trunk/web/packages/consultations/templates/consultations-index.jsp contrib/ccm-ldn-camden-consultation/trunk/web/packages/consultations/www/ contrib/ccm-ldn-camden-consultation/trunk/web/packages/consultations/www/alert-new.jsp contrib/ccm-ldn-camden-consultation/trunk/web/packages/consultations/www/index.jsp contrib/ccm-ldn-camden-consultation/trunk/web/static/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-consultation/trunk/web/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl Log: imported Camden Consultation content type Added: contrib/ccm-ldn-camden-consultation/trunk/application.xml =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/application.xml 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/application.xml 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" + name="ccm-ldn-camden-consultation" + prettyName="Red Hat CCM Content Types" + version="1.0.0" + release="1" + webapp="ROOT"> + <ccm:dependencies> + <ccm:requires name="ccm-core" version="6.1.2"/> + <ccm:requires name="ccm-cms" version="6.1.2"/> + <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/> + </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 Camden Consultation Content Type for the Red Hat CCM CMS. + </ccm:description> +</ccm:application> Added: contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/Consultation.pdl =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/Consultation.pdl 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/Consultation.pdl 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,103 @@ +// +// Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// $Id: Consultation.pdl 21 2005-08-02 14:10:20Z clasohm $ + +model com.arsdigita.camden.cms.contenttypes; + +import com.arsdigita.cms.*; + +object type Consultation extends ContentPage { + + String[0..1] purpose = cam_consultations.purpose CLOB; + String[0..1] contact = cam_consultations.contact CLOB; + Integer[0..1] topic = cam_consultations.topic; + Integer[0..1] consultationType = cam_consultations.consultation_type; + Date[0..1] startDate = cam_consultations.start_date; + Date[0..1] completionDate = cam_consultations.completion_date; + Date[0..1] resultsDate = cam_consultations.results_date; + Boolean[0..1] statutory = cam_consultations.statutory; + Integer[0..1] targetAudience = cam_consultations.target_audience; + Integer[0..1] geoArea = cam_consultations.geo_area; + String[0..1] methodology = cam_consultations.methodology CLOB; + String[0..1] feedback = cam_consultations.feedback CLOB; + + reference key (cam_consultations.consultation_id); +} + +association { + Consultation[0..1] methodologyConsultation = + join cms_files.file_id + to cam_consult_method_file_map.file_id, + join cam_consult_method_file_map.consultation_id + to cam_consultations.consultation_id; + + FileAsset[0..n] methodologyDocuments = + join cam_consultations.consultation_id + to cam_consult_method_file_map.consultation_id, + join cam_consult_method_file_map.file_id + to cms_files.file_id; +} + +association { + Consultation[0..1] feedbackConsultation = + join cms_files.file_id + to cam_consult_feedback_file_map.file_id, + join cam_consult_feedback_file_map.consultation_id + to cam_consultations.consultation_id; + + FileAsset[0..n] feedbackDocuments = + join cam_consultations.consultation_id + to cam_consult_feedback_file_map.consultation_id, + join cam_consult_feedback_file_map.file_id + to cms_files.file_id; +} + +query getLatestConsultations { + Consultation consultation; + + do { + select * + from + (select i.*, co.*, l.start_date_time, + row_number() over (order by l.start_date_time desc) as rn + from cam_consultations co, cms_items i, + acs_object_lifecycle_map olm, lifecycles l + where i.item_id = co.consultation_id + and i.version = 'live' + and olm.item_id = i.item_id + and l.cycle_id = olm.cycle_id) + where rn <= :maxCount + order by start_date_time desc + } map { + consultation.id = consultation_id; + consultation.purpose = purpose; + consultation.contact = contact; + consultation.topic = topic; + consultation.consultationType = consultation_type; + consultation.startDate = start_date; + consultation.completionDate = completion_date; + consultation.resultsDate = results_date; + consultation.statutory = statutory; + consultation.targetAudience = target_audience; + consultation.geoArea = geo_area; + consultation.methodology = methodology; + consultation.feedback = feedback; + consultation.name = name; + consultation.type = type; + } +} Added: contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.pdl =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.pdl 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.pdl 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,34 @@ +// +// Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// $Id: ConsultationAlert.pdl 23 2005-08-02 14:11:47Z clasohm $ + +model com.arsdigita.camden.cms.contenttypes; + +import com.arsdigita.kernel.*; + +object type ConsultationAlert extends ACSObject { + String[0..1] firstNames = cam_consultation_alerts.first_names VARCHAR(100); + String[0..1] lastName = cam_consultation_alerts.last_name VARCHAR(100); + String[1..1] email = cam_consultation_alerts.email VARCHAR(100); + Date[1..1] creationDate = cam_consultation_alerts.creation_date; + String[1..1] confirmationToken = cam_consultation_alerts.confirmation_token VARCHAR(100); + String[1..1] cancellationToken = cam_consultation_alerts.cancellation_token VARCHAR(100); + Boolean[1..1] emailConfirmed = cam_consultation_alerts.email_confirmed; + + reference key (cam_consultation_alerts.alert_id); +} Added: contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationApp.pdl =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationApp.pdl 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ConsultationApp.pdl 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,7 @@ +model com.arsdigita.camden.cms.contenttypes; + +import com.arsdigita.web.Application; + +object type ConsultationApp extends Application { + reference key (cam_consultation_app.application_id); +} Added: contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/oracle-se-create.sql =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/oracle-se-create.sql 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/oracle-se-create.sql 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,22 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +@@ ddl/oracle-se/create.sql + +@@ ddl/oracle-se/deferred.sql Property changes on: contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/oracle-se-create.sql ___________________________________________________________________ Name: svn:keywords + Id Added: contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/postgres-create.sql =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/postgres-create.sql 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/postgres-create.sql 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,22 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +\i ddl/postgres/create.sql + +\i ddl/postgres/deferred.sql Property changes on: contrib/ccm-ldn-camden-consultation/trunk/sql/ccm-ldn-camden-consultation/postgres-create.sql ___________________________________________________________________ Name: svn:keywords + Id Added: contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xml =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xml 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xml 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> + <ctd:content-type label="Consultation" description="An content type for Camden consultations." objectType="com.arsdigita.camden.cms.contenttypes.Consultation" classname="com.arsdigita.camden.cms.contenttypes.Consultation"> + <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate"> + <ctd:authoring-step + labelKey="cms.contenttypes.shared.basic_properties.title" + labelBundle="com.arsdigita.cms.ui.CMSResources" + descriptionKey="cms.contenttypes.shared.basic_properties.description" + descriptionBundle="com.arsdigita.cms.ui.CMSResources" + component="com.arsdigita.camden.cms.contenttypes.ui.ConsultationPropertiesStep"/> + + <ctd:authoring-step + labelKey="about.title" + labelBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + descriptionKey="about.description" + descriptionBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + component="com.arsdigita.camden.cms.contenttypes.ui.ConsultationAboutStep"/> + + <ctd:authoring-step + labelKey="who.title" + labelBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + descriptionKey="who.description" + descriptionBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + component="com.arsdigita.camden.cms.contenttypes.ui.ConsultationWhoStep"/> + + <ctd:authoring-step + labelKey="how.title" + labelBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + descriptionKey="how.description" + descriptionBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + component="com.arsdigita.camden.cms.contenttypes.ui.ConsultationHowStep"/> + + <ctd:authoring-step + labelKey="results.title" + labelBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + descriptionKey="results.description" + descriptionBundle="com.arsdigita.camden.cms.contenttypes.ConsultationResources" + component="com.arsdigita.camden.cms.contenttypes.ui.ConsultationResultsStep"/> + + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> + </ctd:authoring-kit> + </ctd:content-type> +</ctd:content-types> Added: contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Consultation.xml =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Consultation.xml 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Consultation.xml 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8"?> +<xrd:adapters xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd"> +<!-- No need to list all the content types here. Only + need to list a type if is adds associations that + were not in the parent type, or to remove attributes + --> + + <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"> + <xrd:adapter objectType="com.arsdigita.camden.cms.contenttypes.Consultation" + extends="com.arsdigita.cms.ContentPage" + traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter"> + <xrd:attributes rule="exclude"> + <xrd:property name="/object/methodologyDocuments/ancestors"/> + <xrd:property name="/object/methodologyDocuments/isDeleted"/> + <xrd:property name="/object/methodologyDocuments/objectType"/> + <xrd:property name="/object/methodologyDocuments/defaultDomainClass"/> + <xrd:property name="/object/methodologyDocuments/content"/> + <xrd:property name="/object/feedbackDocuments/ancestors"/> + <xrd:property name="/object/feedbackDocuments/isDeleted"/> + <xrd:property name="/object/feedbackDocuments/objectType"/> + <xrd:property name="/object/feedbackDocuments/defaultDomainClass"/> + <xrd:property name="/object/feedbackDocuments/content"/> + </xrd:attributes> + <xrd:associations rule="include"> + <xrd:property name="/object/methodologyDocuments"/> + <xrd:property name="/object/feedbackDocuments"/> + </xrd:associations> + <xrd:formatter property="/object/startDate" + class="com.arsdigita.xml.formatters.DateFormatter"/> + <xrd:formatter property="/object/completionDate" + class="com.arsdigita.xml.formatters.DateFormatter"/> + <xrd:formatter property="/object/resultsDate" + class="com.arsdigita.xml.formatters.DateFormatter"/> + <xrd:formatter property="/object/topic" + class="com.arsdigita.camden.cms.contenttypes.TopicFormatter"/> + <xrd:formatter property="/object/consultationType" + class="com.arsdigita.camden.cms.contenttypes.TypeFormatter"/> + <xrd:formatter property="/object/targetAudience" + class="com.arsdigita.camden.cms.contenttypes.TargetFormatter"/> + <xrd:formatter property="/object/geoArea" + class="com.arsdigita.camden.cms.contenttypes.GeoAreaFormatter"/> + </xrd:adapter> + </xrd:context> + + <xrd:context name="com.arsdigita.camden.cms.contenttypes.ConsultationMetadataProvider"> + <xrd:adapter + objectType="com.arsdigita.camden.cms.contenttypes.Consultation" + traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter"> + <xrd:attributes rule="exclude"> + <xrd:property name="/object/startDate"/> + <xrd:property name="/object/completionDate"/> + <xrd:property name="/object/resultsDate"/> + <xrd:property name="/object/statutory"/> + <xrd:property name="/object/version"/> + <xrd:property name="/object/name"/> + <xrd:property name="/object/language"/> + <xrd:property name="/object/ancestors"/> + <xrd:property name="/object/isDeleted"/> + <xrd:property name="/object/id"/> + <xrd:property name="/object/objectType"/> + <xrd:property name="/object/displayName"/> + <xrd:property name="/object/defaultDomainClass"/> + <xrd:property name="/object/methodologyDocuments/length"/> + <xrd:property name="/object/methodologyDocuments/language"/> + <xrd:property name="/object/methodologyDocuments/ancestors"/> + <xrd:property name="/object/methodologyDocuments/isDeleted"/> + <xrd:property name="/object/methodologyDocuments/id"/> + <xrd:property name="/object/methodologyDocuments/objectType"/> + <xrd:property name="/object/methodologyDocuments/displayName"/> + <xrd:property name="/object/methodologyDocuments/defaultDomainClass"/> + <xrd:property name="/object/methodologyDocuments/version"/> + <xrd:property name="/object/methodologyDocuments/content"/> + <xrd:property name="/object/feedbackDocuments/length"/> + <xrd:property name="/object/feedbackDocuments/language"/> + <xrd:property name="/object/feedbackDocuments/ancestors"/> + <xrd:property name="/object/feedbackDocuments/isDeleted"/> + <xrd:property name="/object/feedbackDocuments/id"/> + <xrd:property name="/object/feedbackDocuments/objectType"/> + <xrd:property name="/object/feedbackDocuments/displayName"/> + <xrd:property name="/object/feedbackDocuments/defaultDomainClass"/> + <xrd:property name="/object/feedbackDocuments/version"/> + <xrd:property name="/object/feedbackDocuments/content"/> + </xrd:attributes> + <xrd:associations rule="include"> + <xrd:property name="/object/methodologyDocuments"/> + <xrd:property name="/object/feedbackDocuments"/> + </xrd:associations> + </xrd:adapter> + </xrd:context> +</xrd:adapters> Added: contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.config =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.config 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.config 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<registry> + <config class="com.arsdigita.camden.cms.contenttypes.ConsultationConfig" + storage="ccm-ldn-camden-consultation/consultations.properties"/> +</registry> Added: contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.load =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.load 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/ccm-ldn-camden-consultation.load 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,16 @@ +<load> + <requires> + <table name="inits"/> + <table name="acs_objects"/> + <table name="cms_items"/> + <initializer class="com.arsdigita.cms.Initializer"/> + </requires> + <provides> + <table name="cam_consultations"/> + <initializer class="com.arsdigita.camden.cms.contenttypes.ConsultationInitializer"/> + </provides> + <scripts> + <schema directory="ccm-ldn-camden-consultation"/> + <data class="com.arsdigita.camden.cms.contenttypes.ConsultationLoader"/> + </scripts> +</load> Added: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/Consultation.java =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/Consultation.java 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/Consultation.java 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,299 @@ +/* + * Copyright (C) 2005 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.camden.cms.contenttypes; + +import java.math.BigDecimal; +import java.util.Date; + +import com.arsdigita.cms.ContentPage; +import com.arsdigita.cms.FileAsset; +import com.arsdigita.cms.FileAssetCollection; +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.globalization.GlobalizedMessage; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.util.StringUtils; + +/** + * The Camden Consultation content type. + * + * @author Carsten Clasohm + * @version $Id: Consultation.java 25 2005-08-03 16:01:08Z clasohm $ + */ +public class Consultation extends ContentPage { + + public static final String versionId = "$Id: Consultation.java 25 2005-08-03 16:01:08Z clasohm $"; + + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.camden.cms.contenttypes.Consultation"; + + public static final String NAME = "name"; + public static final String TITLE = "title"; + public static final String STATUS = "status"; + public static final String PURPOSE = "purpose"; + public static final String CONTACT = "contact"; + public static final String TOPIC = "topic"; + public static final String CONSULTATION_TYPE = "consultationType"; + public static final String START_DATE = "startDate"; + public static final String COMPLETION_DATE = "completionDate"; + public static final String RESULTS_DATE = "resultsDate"; + public static final String STATUTORY = "statutory"; + public static final String TARGET_AUDIENCE = "targetAudience"; + public static final String GEO_AREA = "geoArea"; + public static final String METHODOLOGY = "methodology"; + public static final String METHODOLOGY_DOCUMENTS = "methodologyDocuments"; + public static final String FEEDBACK = "feedback"; + public static final String FEEDBACK_DOCUMENTS = "feedbackDocuments"; + + public Consultation() { + super(BASE_DATA_OBJECT_TYPE); + } + + public Consultation(OID oid) throws DataObjectNotFoundException { + super(oid); + } + + public Consultation(BigDecimal id) throws DataObjectNotFoundException { + this(new OID(BASE_DATA_OBJECT_TYPE, id)); + } + + public Consultation(DataObject obj) { + super(obj); + } + + public Consultation(String type) { + super(type); + } + + /** + * @return the base PDL object type for this item. Child classes + * should override this method to return the correct value. + */ + public String getBaseDataObjectType() { + return BASE_DATA_OBJECT_TYPE; + } + + public String getPurpose() { + return (String) get(PURPOSE); + } + + public void setPurpose(String value) { + set(PURPOSE, value); + } + + public String getContact() { + return (String) get(CONTACT); + } + + public void setContact(String value) { + set(CONTACT, value); + } + + public Integer getTopic() { + return (Integer) get(TOPIC); + } + + public GlobalizedMessage getPrettyTopic() { + Integer i = getTopic(); + if (i == null) + return null; + + return ConsultationUtil.globalize("topicOption" + i); + } + + public static GlobalizedMessage getPrettyTopic(Integer i) { + return ConsultationUtil.globalize("topicOption" + i); + } + + public void setTopic(Integer value) { + set(TOPIC, value); + } + + public Integer getConsultationType() { + return (Integer) get(CONSULTATION_TYPE); + } + + public GlobalizedMessage getPrettyType() { + Integer i = getConsultationType(); + if (i == null) + return null; + + return ConsultationUtil.globalize("typeOption" + i); + } + + public static GlobalizedMessage getPrettyType(Integer i) { + return ConsultationUtil.globalize("typeOption" + i); + } + + public void setConsultationType(Integer value) { + set(CONSULTATION_TYPE, value); + } + + public Date getStartDate() { + return (Date) get(START_DATE); + } + + public void setStartDate(Date value) { + set(START_DATE, value); + } + + public Date getCompletionDate() { + return (Date) get(COMPLETION_DATE); + } + + public void setCompletionDate(Date value) { + set(COMPLETION_DATE, value); + } + + public Date getResultsDate() { + return (Date) get(RESULTS_DATE); + } + + public void setResultsDate(Date value) { + set(RESULTS_DATE, value); + } + + public Boolean getStatutory() { + return (Boolean) get(STATUTORY); + } + + public void setStatutory(Boolean value) { + set(STATUTORY, value); + } + + public void setStatutory(boolean value) { + setStatutory(new Boolean(value)); + } + + public Integer getTargetAudience() { + return (Integer) get(TARGET_AUDIENCE); + } + + public GlobalizedMessage getPrettyTarget() { + Integer i = getTargetAudience(); + if (i == null) + return null; + + return ConsultationUtil.globalize("targetOption" + i); + } + + public static GlobalizedMessage getPrettyTarget(Integer i) { + return ConsultationUtil.globalize("targetOption" + i); + } + + public void setTargetAudience(Integer value) { + set(TARGET_AUDIENCE, value); + } + + public Integer getGeoArea() { + return (Integer) get(GEO_AREA); + } + + public GlobalizedMessage getPrettyGeoArea() { + Integer i = getGeoArea(); + if (i == null) + return null; + + return ConsultationUtil.globalize("geoOption" + i); + } + + public static GlobalizedMessage getPrettyGeoArea(Integer i) { + return ConsultationUtil.globalize("geoOption" + i); + } + + public void setGeoArea(Integer value) { + set(GEO_AREA, value); + } + + public String getMethodology() { + return (String) get(METHODOLOGY); + } + + public void setMethodology(String value) { + set(METHODOLOGY, value); + } + + public FileAssetCollection getMethodologyDocuments() { + DataCollection dataCollection = + (DataCollection)get(METHODOLOGY_DOCUMENTS); + + if (dataCollection == null) + return null; + + dataCollection.addOrder("name"); + return new FileAssetCollection(dataCollection); + } + + public void addMethodologyDocument(FileAsset fileAsset) { + add(METHODOLOGY_DOCUMENTS, fileAsset); + } + + public void removeMethodologyDocument(FileAsset fileAsset) { + remove(METHODOLOGY_DOCUMENTS, fileAsset); + } + + public String getFeedback() { + return (String) get(FEEDBACK); + } + + public void setFeedback(String value) { + set(FEEDBACK, value); + } + + public FileAssetCollection getFeedbackDocuments() { + DataCollection dataCollection = + (DataCollection)get(FEEDBACK_DOCUMENTS); + + if (dataCollection == null) + return null; + + return new FileAssetCollection(dataCollection); + } + + public void addFeedbackDocument(FileAsset fileAsset) { + add(FEEDBACK_DOCUMENTS, fileAsset); + } + + public void removeFeedbackDocument(FileAsset fileAsset) { + remove(FEEDBACK_DOCUMENTS, fileAsset); + } + + public GlobalizedMessage getStatus() { + Date startDate = getStartDate(); + Date completionDate = getCompletionDate(); + + if (startDate == null || completionDate == null) + return null; + + Date currentDate = new Date(); + + if (startDate.after(currentDate)) + return ConsultationUtil.globalize("status.forthcoming"); + else if (completionDate.before(currentDate)) + return ConsultationUtil.globalize("status.past"); + else + return ConsultationUtil.globalize("status.current"); + } + + public String getSearchSummary() { + return StringUtils.truncateString(getPurpose(), 200); + } +} Added: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,144 @@ +package com.arsdigita.camden.cms.contenttypes; + +import java.math.BigDecimal; +import java.security.GeneralSecurityException; +import java.util.Date; + +import org.apache.commons.codec.binary.Base64; + +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.kernel.security.Crypto; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.metadata.ObjectType; + +/** + * Alert requests for the Camden Consultation content type. + * Requests must be confirmed via email before they become + * active. Old pending requests are deleted periodically. + * + * @author Carsten Clasohm + * @version $Id: ConsultationAlert.java 25 2005-08-03 16:01:08Z clasohm $ + */ +public class ConsultationAlert extends ACSObject { + + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.camden.cms.contenttypes.ConsultationAlert"; + + public static final String FIRST_NAMES = "firstNames"; + public static final String LAST_NAME = "lastName"; + public static final String EMAIL = "email"; + public static final String CREATION_DATE = "creationDate"; + public static final String CONFIRMATION_TOKEN = "confirmationToken"; + public static final String CANCELLATION_TOKEN = "cancellationToken"; + public static final String EMAIL_CONFIRMED = "emailConfirmed"; + + public ConsultationAlert() { + this(BASE_DATA_OBJECT_TYPE); + } + + public ConsultationAlert(OID oid) throws DataObjectNotFoundException { + super(oid); + } + + public ConsultationAlert(BigDecimal id) throws DataObjectNotFoundException { + this(new OID(BASE_DATA_OBJECT_TYPE, id)); + } + + public ConsultationAlert(DataObject obj) { + super(obj); + } + + public ConsultationAlert(String type) { + super(type); + + setConfirmationToken(getRandomString()); + setCancellationToken(getRandomString()); + setEmailConfirmed(Boolean.FALSE); + setCreationDate(new Date()); + } + + /** + * @return the base PDL object type for this item. Child classes + * should override this method to return the correct value. + */ + public String getBaseDataObjectType() { + return BASE_DATA_OBJECT_TYPE; + } + + public String getFirstNames() { + return (String) get(FIRST_NAMES); + } + + public void setFirstNames(String value) { + set(FIRST_NAMES, value); + } + + public String getLastName() { + return (String) get(LAST_NAME); + } + + public void setLastName(String value) { + set(LAST_NAME, value); + } + + public String getEmail() { + return (String) get(EMAIL); + } + + public void setEmail(String value) { + set(EMAIL, value); + } + + public Date getCreationDate() { + return (Date) get(CREATION_DATE); + } + + public void setCreationDate(Date value) { + set(CREATION_DATE, value); + } + + public String getConfirmationToken() { + return (String) get(CONFIRMATION_TOKEN); + } + + public void setConfirmationToken(String value) { + set(CONFIRMATION_TOKEN, value); + } + + public String getCancellationToken() { + return (String) get(CANCELLATION_TOKEN); + } + + public void setCancellationToken(String value) { + set(CANCELLATION_TOKEN, value); + } + + public Boolean getEmailConfirmed() { + return (Boolean) get(EMAIL_CONFIRMED); + } + + public void setEmailConfirmed(Boolean value) { + set(EMAIL_CONFIRMED, value); + } + + private String getRandomString() { + byte[] salt = new byte[16]; + try { + Crypto.getRandom().nextBytes(salt); + } catch (GeneralSecurityException e) { + throw new RuntimeException(e); + } + + String result = new String((new Base64()).encode(salt)); + + // Convert characters which could be problematic in a URL. + result = result.replace('+', 'p'). + replace('=', 'e'). + replace('/', 's'); + + return result; + } + +} Added: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationApp.java =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationApp.java 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationApp.java 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,43 @@ +package com.arsdigita.camden.cms.contenttypes; + +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.web.Application; + +/** + * This application contains the browsing and alerting UI + * for the Camden Consultations content type. The JSPs can + * be found in web/packages/consultations/www. + * + * @author Carsten Clasohm + * @version $Id: ConsultationApp.java 32 2005-08-04 16:06:03Z clasohm $ + */ +public class ConsultationApp extends Application { + + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.camden.cms.contenttypes.ConsultationApp"; + + public ConsultationApp(DataObject obj) { + super(obj); + } + + public ConsultationApp(OID oid) { + super(oid); + } + + static public ConsultationApp retrieveApplication() { + DataCollection apps = + SessionManager.getSession().retrieve(BASE_DATA_OBJECT_TYPE); + + if (!apps.next()) + return null; + + DataObject obj = apps.getDataObject(); + apps.close(); + + return new ConsultationApp(obj); + } + +} Added: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationConfig.java =================================================================== --- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationConfig.java 2005-08-04 08:17:57 UTC (rev 677) +++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationConfig.java 2005-08-04 16:01:19 UTC (rev 678) @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2005 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.camden.cms.contenttypes; + +import com.arsdigita.runtime.AbstractConfig; +import com.arsdigita.util.parameter.BooleanParameter; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.StringParameter; + +/** + * Defines the configuration parameters for the Camden Consultations + * content type. + * + * @author Carsten Clasohm + * @version $Id$ + */ +public class ConsultationConfig extends AbstractConfig { + + private final Parameter m_consultationsTermUrl = new StringParameter( + "com.arsdigita.cms.camden.contenttypes.consultations_term_url", + Parameter.OPTIONAL, + "consultations"); + + public ConsultationConfig() { + register(m_consultationsTermUrl); + loadInfo(); + } + + public String getConsultationsTermUrl() { + return (String) get(m_consultationsTermUrl); + } + +} Added: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationConfig_parameter.properties =================================================================== .. |
|
From: <cl...@vh...> - 2005-08-04 08:25:44
|
Author: clasohm Date: 2005-08-04 10:17:57 +0200 (Thu, 04 Aug 2005) New Revision: 677 Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl Log: removed the remainder of what I previously added Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-03 15:43:37 UTC (rev 676) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-04 08:17:57 UTC (rev 677) @@ -10,8 +10,6 @@ exclude-result-prefixes="xsl bebop aplaws ui nav cms terms" version="1.0"> -<xsl:import href="../../../../../ROOT/packages/bebop/xsl/DataTable.xsl"/> - <xsl:param name="theme-prefix"/> |
|
From: <ss...@vh...> - 2005-08-03 15:51:05
|
Author: sshinde
Date: 2005-08-03 17:43:37 +0200 (Wed, 03 Aug 2005)
New Revision: 676
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java
Log:
The default context in the system is live, if not explicitly
specified.No need to have redundancy in URLs with &context=live
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-08-03 15:25:41 UTC (rev 675)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-08-03 15:43:37 UTC (rev 676)
@@ -85,13 +85,16 @@
}
}
+ /**
+ * The default context is Live.No need to append &context=live explicitly.
+ */
public static String getItemURL(HttpServletRequest request, OID oid) {
// redirect doesn't use /ccm prefix for some reason, so just returning the raw string.
//ParameterMap map = new ParameterMap();
//map.setParameter("oid", oid.toString());
//return URL.there(request, "/redirect/", map).toString();
// Always link directly to the live version.
- return "/redirect/?oid="+oid.toString() + "&context=live";
+ return "/redirect/?oid="+oid.toString();
}
private static class PopupResultsPane extends ResultsPane {
|
|
From: <cl...@vh...> - 2005-08-03 15:33:10
|
Author: clasohm
Date: 2005-08-03 17:25:41 +0200 (Wed, 03 Aug 2005)
New Revision: 675
Modified:
ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
Log:
found a better way to implement the Camden Consultations UI
Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
===================================================================
--- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-03 07:00:29 UTC (rev 674)
+++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-03 15:25:41 UTC (rev 675)
@@ -172,9 +172,6 @@
<xsl:otherwise>
<xsl:call-template name="greeting" />
<xsl:call-template name="contentLinks" />
-<xsl:call-template name="dimensionalNavbars" />
-<xsl:call-template name="dataTables" />
-<xsl:call-template name="boxPanels1" />
</xsl:otherwise>
</xsl:choose>
</xsl:template>
@@ -182,83 +179,6 @@
-<!-- Copied from ccm-core/web/packages/bebop/xsl/DataTable.xsl -->
-<xsl:template name="dataTables">
- <xsl:for-each select="bebop:table[@class='dataTable']">
- <table cellpadding="1" cellspacing="2" border="0">
- <xsl:for-each select="thead|bebop:thead">
- <xsl:call-template name="dataTableHead">
- <xsl:with-param name="orderColumn" select="../@order"/>
- <xsl:with-param name="direction" select="../@direction"/>
- </xsl:call-template>
- </xsl:for-each>
- <xsl:for-each select="bebop:tbody">
- <xsl:call-template name="dataTableBody"/>
- </xsl:for-each>
- </table>
- </xsl:for-each>
-</xsl:template>
-
-
-
-
-<!-- Copied from ccm-core/web/packages/bebop/xsl/BoxPanel.xsl -->
-<xsl:template name="boxPanels1">
- <xsl:for-each select="bebop:boxPanel[@axis='1']">
- <table>
- <xsl:if test="string-length(@width)>0">
- <xsl:attribute name="width">
- <xsl:value-of select="@width"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="string-length(@border)>0">
- <xsl:attribute name="border">
- <xsl:value-of select="@border"/>
- </xsl:attribute>
- </xsl:if>
- <tr>
- <xsl:for-each select="bebop:cell">
- <td>
- <xsl:for-each select="*/@class|*/@style">
- <xsl:attribute name="{name()}">
- <xsl:value-of select="." />
- </xsl:attribute>
- </xsl:for-each>
- <xsl:apply-templates/>
- </td>
- </xsl:for-each>
- </tr>
- </table>
- </xsl:for-each>
-</xsl:template>
-
-
-
-
-<!-- Copied from ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl -->
-<xsl:template name="dimensionalNavbars">
- <xsl:for-each select="bebop:dimensionalNavbar">
- <xsl:comment>bebop:dimensionalNavbar</xsl:comment>
- <xsl:value-of select="@startTag"/>
- <xsl:for-each select="*">
- <xsl:apply-templates select="."/>
- <xsl:if test="position()!=last()">
- <xsl:choose>
- <xsl:when test="string-length(../@delimiter)=0">
-  > 
- </xsl:when>
- <xsl:otherwise><xsl:value-of select="../@delimiter"/></xsl:otherwise>
- </xsl:choose>
- </xsl:if>
- </xsl:for-each>
- <xsl:value-of select="@endTag"/>
- <xsl:comment>/bebop:dimensionalNavbar</xsl:comment>
- </xsl:for-each>
-</xsl:template>
-
-
-
-
<xsl:template name="Title">
<xsl:choose>
<xsl:when test="cms:contentPanel">
|
Author: sskracic
Date: 2005-08-03 09:00:29 +0200 (Wed, 03 Aug 2005)
New Revision: 674
Added:
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql
Removed:
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/
releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
Modified:
releases/1.0.2/ccm-ldn-theme/application.xml
releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl
releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl
releases/1.0.2/ccm-ldn-theme/src/ccm-ldn-theme.upgrade
Log:
Integrating r672 and r673 from the trunk, Postgres datatype mismatch.
The DATE should actually have been a TIMESTAMP.
Modified: releases/1.0.2/ccm-ldn-theme/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-theme/application.xml 2005-08-03 06:52:24 UTC (rev 673)
+++ releases/1.0.2/ccm-ldn-theme/application.xml 2005-08-03 07:00:29 UTC (rev 674)
@@ -3,7 +3,7 @@
name="ccm-ldn-theme"
prettyName="Theme"
version="1.0.0"
- release="10">
+ release="11">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-ldn-subsite" version="1.4.1"/>
Modified: releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl
===================================================================
--- releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl 2005-08-03 06:52:24 UTC (rev 673)
+++ releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl 2005-08-03 07:00:29 UTC (rev 674)
@@ -39,7 +39,7 @@
unique String[1..1] url = theme_themes.url VARCHAR(700);
String[0..1] description = theme_themes.description VARCHAR(4000);
- Date lastPublishedDate = theme_themes.last_published_date DATE;
+ Date lastPublishedDate = theme_themes.last_published_date TIMESTAMP;
Party lastPublishedUser = join theme_themes.last_published_user_id
to parties.party_id;
Modified: releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl
===================================================================
--- releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl 2005-08-03 06:52:24 UTC (rev 673)
+++ releases/1.0.2/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl 2005-08-03 07:00:29 UTC (rev 674)
@@ -31,7 +31,7 @@
// version can be 'draft' or 'live'
String[1..1] version = theme_files.version VARCHAR(10);
- Date[1..1] lastModifiedDate = theme_files.last_modified_date DATE;
+ Date[1..1] lastModifiedDate = theme_files.last_modified_date TIMESTAMP;
// each theme should only have one file per filePath
// we cannot add this here becuase persistence does not know how to
Copied: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres (from rev 673, ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres)
Copied: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade (from rev 673, ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade)
Copied: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2 (from rev 673, ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2)
Deleted: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
Copied: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql (from rev 673, ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql)
Copied: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql (from rev 673, ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql)
Copied: releases/1.0.2/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql (from rev 673, ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql)
Modified: releases/1.0.2/ccm-ldn-theme/src/ccm-ldn-theme.upgrade
===================================================================
--- releases/1.0.2/ccm-ldn-theme/src/ccm-ldn-theme.upgrade 2005-08-03 06:52:24 UTC (rev 673)
+++ releases/1.0.2/ccm-ldn-theme/src/ccm-ldn-theme.upgrade 2005-08-03 07:00:29 UTC (rev 674)
@@ -2,4 +2,7 @@
<version from="1.0.0" to="1.0.1">
<script sql="ccm-ldn-theme/upgrade/::database::-1.0.0-1.0.1.sql"/>
</version>
+ <version from="1.0.1" to="1.0.2">
+ <script sql="ccm-ldn-theme/upgrade/::database::-1.0.1-1.0.2.sql"/>
+ </version>
</upgrade>
|
|
From: <ssk...@vh...> - 2005-08-03 06:59:55
|
Author: sskracic
Date: 2005-08-03 08:52:24 +0200 (Wed, 03 Aug 2005)
New Revision: 673
Modified:
ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
Log:
theme_themes.last_published_date is nullable.
Modified: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
===================================================================
--- ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql 2005-08-02 17:51:00 UTC (rev 672)
+++ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql 2005-08-03 06:52:24 UTC (rev 673)
@@ -3,7 +3,6 @@
alter table theme_themes rename column last_published_date to last_published_date_save;
alter table theme_themes add last_published_date timestamptz;
update theme_themes set last_published_date = last_published_date_save;
- alter table theme_themes alter last_published_date set not null;
alter table theme_themes drop last_published_date_save;
alter table theme_files rename column last_modified_date to last_modified_date_save;
|
Author: sskracic Date: 2005-08-02 19:51:00 +0200 (Tue, 02 Aug 2005) New Revision: 672 Added: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql Modified: ccm-ldn-theme/trunk/application.xml ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/Theme.pdl ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/ThemeFile.pdl ccm-ldn-theme/trunk/src/ccm-ldn-theme.upgrade Log: The 'DATE' PDL keyword generates the proper SQL DATE type (ie. with no time information) for Postgres. We should use 'TIMESTAMP' instead. Otherwise, things work for Oracle (whose DATE is actually a TIMESTAMP) and don't work for Postgres. On this occassion, it's Theme files syncing which is completely foobared when the time portion of timestamp is not being recorded. Modified: ccm-ldn-theme/trunk/application.xml =================================================================== --- ccm-ldn-theme/trunk/application.xml 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/application.xml 2005-08-02 17:51:00 UTC (rev 672) @@ -2,7 +2,7 @@ <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" name="ccm-ldn-theme" prettyName="Theme" - version="1.0.1" + version="1.0.2" release="1"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.2"/> Modified: ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/Theme.pdl =================================================================== --- ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/Theme.pdl 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/Theme.pdl 2005-08-02 17:51:00 UTC (rev 672) @@ -39,7 +39,7 @@ unique String[1..1] url = theme_themes.url VARCHAR(700); String[0..1] description = theme_themes.description VARCHAR(4000); - Date lastPublishedDate = theme_themes.last_published_date DATE; + Date lastPublishedDate = theme_themes.last_published_date TIMESTAMP; Party lastPublishedUser = join theme_themes.last_published_user_id to parties.party_id; Modified: ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/ThemeFile.pdl =================================================================== --- ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/ThemeFile.pdl 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/ThemeFile.pdl 2005-08-02 17:51:00 UTC (rev 672) @@ -31,7 +31,7 @@ // version can be 'draft' or 'live' String[1..1] version = theme_files.version VARCHAR(10); - Date[1..1] lastModifiedDate = theme_files.last_modified_date DATE; + Date[1..1] lastModifiedDate = theme_files.last_modified_date TIMESTAMP; // each theme should only have one file per filePath // we cannot add this here becuase persistence does not know how to Added: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql =================================================================== --- ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql 2005-08-02 17:51:00 UTC (rev 672) @@ -0,0 +1,17 @@ +begin; + + alter table theme_themes rename column last_published_date to last_published_date_save; + alter table theme_themes add last_published_date timestamptz; + update theme_themes set last_published_date = last_published_date_save; + alter table theme_themes alter last_published_date set not null; + alter table theme_themes drop last_published_date_save; + + alter table theme_files rename column last_modified_date to last_modified_date_save; + alter table theme_files add last_modified_date timestamptz; + update theme_files set last_modified_date = last_modified_date_save; + alter table theme_files alter last_modified_date set not null; + alter table theme_files drop last_modified_date_save; + +commit; + + Property changes on: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql =================================================================== --- ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql 2005-08-02 17:51:00 UTC (rev 672) @@ -0,0 +1,2 @@ + +-- No Oracle data model changes between 1.0.1 and 1.0.2 for ccm-ldn-theme. Property changes on: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql =================================================================== --- ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql 2005-08-02 17:51:00 UTC (rev 672) @@ -0,0 +1 @@ +\i ../postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql Property changes on: ccm-ldn-theme/trunk/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Modified: ccm-ldn-theme/trunk/src/ccm-ldn-theme.upgrade =================================================================== --- ccm-ldn-theme/trunk/src/ccm-ldn-theme.upgrade 2005-08-02 07:45:43 UTC (rev 671) +++ ccm-ldn-theme/trunk/src/ccm-ldn-theme.upgrade 2005-08-02 17:51:00 UTC (rev 672) @@ -2,4 +2,7 @@ <version from="1.0.0" to="1.0.1"> <script sql="ccm-ldn-theme/upgrade/::database::-1.0.0-1.0.1.sql"/> </version> + <version from="1.0.1" to="1.0.2"> + <script sql="ccm-ldn-theme/upgrade/::database::-1.0.1-1.0.2.sql"/> + </version> </upgrade> |
|
From: <ssk...@vh...> - 2005-08-02 07:53:16
|
Author: sskracic
Date: 2005-08-02 09:45:43 +0200 (Tue, 02 Aug 2005)
New Revision: 671
Modified:
releases/1.0.2/ccm-ldn-aplaws/application.xml
releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
Log:
Integrated r669 from trunk: fixed visibility of 'customize' link
on user-customizable workspace portal page (the right-hand side column).
Modified: releases/1.0.2/ccm-ldn-aplaws/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-aplaws/application.xml 2005-08-02 07:44:44 UTC (rev 670)
+++ releases/1.0.2/ccm-ldn-aplaws/application.xml 2005-08-02 07:45:43 UTC (rev 671)
@@ -3,7 +3,7 @@
name="ccm-ldn-aplaws"
prettyName="APLAWS"
version="1.9.1"
- release="11"
+ release="12"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
Modified: releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
===================================================================
--- releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java 2005-08-02 07:44:44 UTC (rev 670)
+++ releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java 2005-08-02 07:45:43 UTC (rev 671)
@@ -140,9 +140,10 @@
global,
party);
boolean hasAdmin = PermissionService.checkPermission(admin);
+ boolean userWorkspaces = Workspace.getConfig().getCreateUserWorkspaces();
if (party == null || m_readOnly ||
- (!hasAdmin && !m_customizable)) {
+ (!hasAdmin && !m_customizable) || (!hasAdmin && !userWorkspaces)) {
m_reset.setVisible(state, false);
m_browse.setVisible(state, false);
m_edit.setVisible(state, false);
|
|
From: <ssk...@vh...> - 2005-08-02 07:52:17
|
Author: sskracic
Date: 2005-08-02 09:44:44 +0200 (Tue, 02 Aug 2005)
New Revision: 670
Modified:
releases/1.0.2/ccm-core/application.xml
releases/1.0.2/ccm-core/src/com/arsdigita/kernel/permissions/PermissionManager.java
releases/1.0.2/ccm-core/src/com/arsdigita/web/Application.java
Log:
Integrated r667 and r668 from trunk: converted perm. query to constructAccessList
and deletion of contained SiteNode when an application is deleted.
Modified: releases/1.0.2/ccm-core/application.xml
===================================================================
--- releases/1.0.2/ccm-core/application.xml 2005-08-02 07:38:59 UTC (rev 669)
+++ releases/1.0.2/ccm-core/application.xml 2005-08-02 07:44:44 UTC (rev 670)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.1"
- release="8"
+ release="9"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Modified: releases/1.0.2/ccm-core/src/com/arsdigita/kernel/permissions/PermissionManager.java
===================================================================
--- releases/1.0.2/ccm-core/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-08-02 07:38:59 UTC (rev 669)
+++ releases/1.0.2/ccm-core/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-08-02 07:44:44 UTC (rev 670)
@@ -112,7 +112,7 @@
query.setParameter(
"objectID",
permission.getACSObjectOID().get("id"));
- query.setParameter("partyID", permission.getPartyOID().get("id"));
+ query.setParameter("partyID", constructAccessList(permission.getPartyOID()));
if (query.next()) {
query.close();
Modified: releases/1.0.2/ccm-core/src/com/arsdigita/web/Application.java
===================================================================
--- releases/1.0.2/ccm-core/src/com/arsdigita/web/Application.java 2005-08-02 07:38:59 UTC (rev 669)
+++ releases/1.0.2/ccm-core/src/com/arsdigita/web/Application.java 2005-08-02 07:44:44 UTC (rev 670)
@@ -572,6 +572,15 @@
super.beforeSave();
}
+ // This should be done through PDL
+ public void beforeDelete() {
+ super.beforeDelete();
+ SiteNode node = getSiteNode();
+ if (node != null) {
+ node.delete();
+ }
+ }
+
public void afterDelete() {
BaseDispatcher.scheduleRefresh();
}
|
|
From: <ssk...@vh...> - 2005-08-02 07:46:27
|
Author: sskracic
Date: 2005-08-02 09:38:59 +0200 (Tue, 02 Aug 2005)
New Revision: 669
Modified:
ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
Log:
Don't show 'customize' link if custom user workspaces are disabled
by the configuration parameter.
Modified: ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
===================================================================
--- ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java 2005-08-02 07:37:25 UTC (rev 668)
+++ ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java 2005-08-02 07:38:59 UTC (rev 669)
@@ -140,9 +140,10 @@
global,
party);
boolean hasAdmin = PermissionService.checkPermission(admin);
+ boolean userWorkspaces = Workspace.getConfig().getCreateUserWorkspaces();
if (party == null || m_readOnly ||
- (!hasAdmin && !m_customizable)) {
+ (!hasAdmin && !m_customizable) || (!hasAdmin && !userWorkspaces)) {
m_reset.setVisible(state, false);
m_browse.setVisible(state, false);
m_edit.setVisible(state, false);
|
|
From: <ssk...@vh...> - 2005-08-02 07:44:59
|
Author: sskracic
Date: 2005-08-02 09:37:25 +0200 (Tue, 02 Aug 2005)
New Revision: 668
Modified:
ccm-core/trunk/application.xml
ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java
Log:
checkDirectPermission() method was not converted to check for
Public and Registered users as well.
Modified: ccm-core/trunk/application.xml
===================================================================
--- ccm-core/trunk/application.xml 2005-08-02 07:28:49 UTC (rev 667)
+++ ccm-core/trunk/application.xml 2005-08-02 07:37:25 UTC (rev 668)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.2"
- release="5"
+ release="6"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Modified: ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-08-02 07:28:49 UTC (rev 667)
+++ ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-08-02 07:37:25 UTC (rev 668)
@@ -112,7 +112,7 @@
query.setParameter(
"objectID",
permission.getACSObjectOID().get("id"));
- query.setParameter("partyID", permission.getPartyOID().get("id"));
+ query.setParameter("partyID", constructAccessList(permission.getPartyOID()));
if (query.next()) {
query.close();
|
|
From: <ssk...@vh...> - 2005-08-02 07:36:48
|
Author: sskracic
Date: 2005-08-02 09:28:49 +0200 (Tue, 02 Aug 2005)
New Revision: 667
Modified:
ccm-core/trunk/src/com/arsdigita/web/Application.java
Log:
Deletes the contained SiteNode when an application is deleted.
Modified: ccm-core/trunk/src/com/arsdigita/web/Application.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/web/Application.java 2005-08-01 20:01:06 UTC (rev 666)
+++ ccm-core/trunk/src/com/arsdigita/web/Application.java 2005-08-02 07:28:49 UTC (rev 667)
@@ -572,6 +572,15 @@
super.beforeSave();
}
+ // This should be done through PDL
+ public void beforeDelete() {
+ super.beforeDelete();
+ SiteNode node = getSiteNode();
+ if (node != null) {
+ node.delete();
+ }
+ }
+
public void afterDelete() {
BaseDispatcher.scheduleRefresh();
}
|
18 messages has been excluded from this view by a project administrator.
