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: <cl...@vh...> - 2005-08-01 20:08:40
|
Author: clasohm Date: 2005-08-01 22:01:06 +0200 (Mon, 01 Aug 2005) New Revision: 666 Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl Log: added bebop:dimensionalNavbar 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-01 13:58:40 UTC (rev 665) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-01 20:01:06 UTC (rev 666) @@ -172,6 +172,7 @@ <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> @@ -234,6 +235,30 @@ +<!-- 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"> |
|
From: <ssk...@vh...> - 2005-08-01 14:06:17
|
Author: sskracic
Date: 2005-08-01 15:58:40 +0200 (Mon, 01 Aug 2005)
New Revision: 665
Modified:
releases/1.0.2/ccm-core/application.xml
releases/1.0.2/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl
releases/1.0.2/ccm-core/src/com/arsdigita/kernel/permissions/PermissionManager.java
Log:
Integrating r664 from trunk (permission checks should take
in account Public Users and Registered Users meta-parties).
Modified: releases/1.0.2/ccm-core/application.xml
===================================================================
--- releases/1.0.2/ccm-core/application.xml 2005-08-01 13:54:08 UTC (rev 664)
+++ releases/1.0.2/ccm-core/application.xml 2005-08-01 13:58:40 UTC (rev 665)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.1"
- release="7"
+ release="8"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Modified: releases/1.0.2/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl
===================================================================
--- releases/1.0.2/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl 2005-08-01 13:54:08 UTC (rev 664)
+++ releases/1.0.2/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl 2005-08-01 13:58:40 UTC (rev 665)
@@ -215,7 +215,7 @@
dnm_group_membership dgm
where dogc.pd_context_id = dgc.pd_object_id
and dgc.pd_context_id = dp.pd_object_id
- and dgm.pd_member_id = :partyID
+ and dgm.pd_member_id in :partyID
and dp.pd_grantee_id = dgm.pd_group_id
} map {
hasPermission = permission_p;
@@ -267,7 +267,7 @@
where dogc.pd_object_id = :objectID
and dogc.pd_context_id = dgc.pd_object_id
and dgc.pd_context_id = dp.pd_object_id
- and dgm.pd_member_id = :partyID
+ and dgm.pd_member_id in :partyID
and dp.pd_grantee_id = dgm.pd_group_id
} map {
hasPermission = permission_p;
@@ -282,7 +282,7 @@
dnm_group_membership dgm
where dp.pd_object_id = :objectID
and dp.pd_grantee_id = dgm.pd_group_id
- and dgm.pd_member_id = :partyID
+ and dgm.pd_member_id in :partyID
} map {
hasPermission = permission_p;
}
@@ -293,7 +293,7 @@
do {
select 1 as permission_p
from dnm_permissions dp
- where dp.pd_grantee_id = :partyID
+ where dp.pd_grantee_id in :partyID
and dp.pd_object_id = :objectID
} map {
hasPermission = permission_p;
@@ -307,7 +307,7 @@
where exists (
select 1
from acs_permissions
- where acs_permissions.grantee_id = :partyID
+ where acs_permissions.grantee_id in :partyID
and acs_permissions.object_id = :objectID
and acs_permissions.privilege = :privilege
)
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-01 13:54:08 UTC (rev 664)
+++ releases/1.0.2/ccm-core/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-08-01 13:58:40 UTC (rev 665)
@@ -142,7 +142,7 @@
+ queryName + " and RAW["
+ permission.getPrivilegeDescriptor().getColumnName() + " = 1 ])");
f.set("objectID", permission.getACSObjectOID().get("id"));
- f.set("partyID", permission.getPartyOID().get("id"));
+ f.set("partyID", constructAccessList(permission.getPartyOID()));//.get("id"));
if (query.next()) {
query.close();
@@ -532,7 +532,7 @@
" exists ( com.arsdigita.kernel.permissions.PartyPermissionFilterQuery"
+ " and RAW[dogc.pd_object_id] = " + propertyName
+ " and RAW[" + privilege.getColumnName() + " = 1 ])");
- f.set("partyID", partyOID.get("id"));
+ f.set("partyID", constructAccessList(partyOID));//partyOID.get("id"));
return f;
}
|
|
From: <ssk...@vh...> - 2005-08-01 14:01:51
|
Author: sskracic
Date: 2005-08-01 15:54:08 +0200 (Mon, 01 Aug 2005)
New Revision: 664
Modified:
ccm-core/trunk/application.xml
ccm-core/trunk/pdl/com/arsdigita/kernel/permissions.pdl
ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java
Log:
Integrating patch supplied by Chris Gilbert about permission checks.
When checking for permission on behalf of some logged-in user, we must
also check for grants issued to 'Public Users' and 'Registered Users'
meta-parties.
Modified: ccm-core/trunk/application.xml
===================================================================
--- ccm-core/trunk/application.xml 2005-07-28 15:02:48 UTC (rev 663)
+++ ccm-core/trunk/application.xml 2005-08-01 13:54:08 UTC (rev 664)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.2"
- release="4"
+ release="5"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Modified: ccm-core/trunk/pdl/com/arsdigita/kernel/permissions.pdl
===================================================================
--- ccm-core/trunk/pdl/com/arsdigita/kernel/permissions.pdl 2005-07-28 15:02:48 UTC (rev 663)
+++ ccm-core/trunk/pdl/com/arsdigita/kernel/permissions.pdl 2005-08-01 13:54:08 UTC (rev 664)
@@ -215,7 +215,7 @@
dnm_group_membership dgm
where dogc.pd_context_id = dgc.pd_object_id
and dgc.pd_context_id = dp.pd_object_id
- and dgm.pd_member_id = :partyID
+ and dgm.pd_member_id in :partyID
and dp.pd_grantee_id = dgm.pd_group_id
} map {
hasPermission = permission_p;
@@ -267,7 +267,7 @@
where dogc.pd_object_id = :objectID
and dogc.pd_context_id = dgc.pd_object_id
and dgc.pd_context_id = dp.pd_object_id
- and dgm.pd_member_id = :partyID
+ and dgm.pd_member_id in :partyID
and dp.pd_grantee_id = dgm.pd_group_id
} map {
hasPermission = permission_p;
@@ -282,7 +282,7 @@
dnm_group_membership dgm
where dp.pd_object_id = :objectID
and dp.pd_grantee_id = dgm.pd_group_id
- and dgm.pd_member_id = :partyID
+ and dgm.pd_member_id in :partyID
} map {
hasPermission = permission_p;
}
@@ -293,7 +293,7 @@
do {
select 1 as permission_p
from dnm_permissions dp
- where dp.pd_grantee_id = :partyID
+ where dp.pd_grantee_id in :partyID
and dp.pd_object_id = :objectID
} map {
hasPermission = permission_p;
@@ -307,7 +307,7 @@
where exists (
select 1
from acs_permissions
- where acs_permissions.grantee_id = :partyID
+ where acs_permissions.grantee_id in :partyID
and acs_permissions.object_id = :objectID
and acs_permissions.privilege = :privilege
)
Modified: ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-07-28 15:02:48 UTC (rev 663)
+++ ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-08-01 13:54:08 UTC (rev 664)
@@ -142,7 +142,7 @@
+ queryName + " and RAW["
+ permission.getPrivilegeDescriptor().getColumnName() + " = 1 ])");
f.set("objectID", permission.getACSObjectOID().get("id"));
- f.set("partyID", permission.getPartyOID().get("id"));
+ f.set("partyID", constructAccessList(permission.getPartyOID()));//.get("id"));
if (query.next()) {
query.close();
@@ -532,7 +532,7 @@
" exists ( com.arsdigita.kernel.permissions.PartyPermissionFilterQuery"
+ " and RAW[dogc.pd_object_id] = " + propertyName
+ " and RAW[" + privilege.getColumnName() + " = 1 ])");
- f.set("partyID", partyOID.get("id"));
+ f.set("partyID", constructAccessList(partyOID));//partyOID.get("id"));
return f;
}
|
Author: sshinde
Date: 2005-07-28 17:02:48 +0200 (Thu, 28 Jul 2005)
New Revision: 663
Added:
releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java
Modified:
releases/1.0.2/ccm-ldn-navigation/application.xml
releases/1.0.2/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp
releases/1.0.2/ccm-ldn-terms/application.xml
releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java
Log:
Merged back the changes from revision 661 to releases branch.
The change output's the <assignedTerms> xml tag.
Bumped the revision numbers.
Modified: releases/1.0.2/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/application.xml 2005-07-28 14:08:52 UTC (rev 662)
+++ releases/1.0.2/ccm-ldn-navigation/application.xml 2005-07-28 15:02:48 UTC (rev 663)
@@ -3,7 +3,7 @@
name="ccm-ldn-navigation"
prettyName="Navigation"
version="1.4.4"
- release="5"
+ release="6"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
Copied: releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java (from rev 661, ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java)
Modified: releases/1.0.2/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp 2005-07-28 14:08:52 UTC (rev 662)
+++ releases/1.0.2/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp 2005-07-28 15:02:48 UTC (rev 663)
@@ -42,7 +42,10 @@
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
</jsp:scriptlet>
+
+ <define:component name="assignedTerms"
+ classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
</define:page>
-
<show:all/>
</jsp:root>
Modified: releases/1.0.2/ccm-ldn-terms/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-terms/application.xml 2005-07-28 14:08:52 UTC (rev 662)
+++ releases/1.0.2/ccm-ldn-terms/application.xml 2005-07-28 15:02:48 UTC (rev 663)
@@ -3,7 +3,7 @@
name="ccm-ldn-terms"
prettyName="Terms"
version="1.0.2"
- release="3">
+ release="4">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
Modified: releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java 2005-07-28 14:08:52 UTC (rev 662)
+++ releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java 2005-07-28 15:02:48 UTC (rev 663)
@@ -33,7 +33,7 @@
public abstract class AbstractAssignedTerms extends SimpleComponent {
private static final String XML_NS = "http://xmlns.redhat.com/london/terms/1.0";
-
+
public void generateXML(PageState state,
Element parent) {
Element content = parent.newChildElement("terms:assignedTerms",
@@ -41,6 +41,13 @@
ACSObject object = getObject(state);
+
+ //Do nothing if object does not exist.avoid NPE and hence make this
+ //class's XML generation optional.
+ if (null == object) {
+ return;
+ }
+
DataCollection terms = SessionManager.getSession()
.retrieve(Term.BASE_DATA_OBJECT_TYPE);
@@ -72,6 +79,6 @@
}
}
-
+
protected abstract ACSObject getObject(PageState state);
}
|
|
From: <ssk...@vh...> - 2005-07-28 14:16:15
|
Author: sskracic
Date: 2005-07-28 16:08:52 +0200 (Thu, 28 Jul 2005)
New Revision: 662
Modified:
releases/1.0.2/ccm-core/application.xml
releases/1.0.2/ccm-core/src/com/arsdigita/kernel/KernelHelper.java
releases/1.0.2/ccm-core/src/com/arsdigita/ui/SiteBanner.java
Log:
Integrating r561-563 from the trunk (SiteBanner showing
wrong parameters).
Modified: releases/1.0.2/ccm-core/application.xml
===================================================================
--- releases/1.0.2/ccm-core/application.xml 2005-07-28 14:00:22 UTC (rev 661)
+++ releases/1.0.2/ccm-core/application.xml 2005-07-28 14:08:52 UTC (rev 662)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.1"
- release="6"
+ release="7"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Modified: releases/1.0.2/ccm-core/src/com/arsdigita/kernel/KernelHelper.java
===================================================================
--- releases/1.0.2/ccm-core/src/com/arsdigita/kernel/KernelHelper.java 2005-07-28 14:00:22 UTC (rev 661)
+++ releases/1.0.2/ccm-core/src/com/arsdigita/kernel/KernelHelper.java 2005-07-28 14:08:52 UTC (rev 662)
@@ -20,6 +20,8 @@
import com.arsdigita.dispatcher.RequestContext;
import com.arsdigita.dispatcher.DispatcherHelper;
+import com.arsdigita.kernel.permissions.ObjectPermissionCollection;
+import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.web.Web;
import javax.servlet.http.HttpServletRequest;
@@ -36,7 +38,7 @@
private static String s_serverName = "";
private static String s_serverPort = "";
- private static String s_systemAdministratorEmailAddress = "";
+ private static String s_systemAdministratorEmailAddress = null;
/**
* Extracts the KernelRequestContext from the given request.
@@ -203,6 +205,21 @@
* @return email address suitable for reply-to in system notifications
*/
public static synchronized String getSystemAdministratorEmailAddress() {
+ if (s_systemAdministratorEmailAddress == null) {
+ ObjectPermissionCollection perms = PermissionService.getGrantedUniversalPermissions();
+ perms.addEqualsFilter("granteeIsUser", Boolean.TRUE);
+ perms.clearOrder();
+ perms.addOrder("granteeID");
+ if (perms.next()) {
+ s_systemAdministratorEmailAddress = perms.getGranteeEmail().toString();
+ perms.close();
+ } else {
+ // Haven't found anything. We don't want to repeat this query
+ // over and over again.
+ s_systemAdministratorEmailAddress = "";
+ }
+ }
+
return s_systemAdministratorEmailAddress;
}
Modified: releases/1.0.2/ccm-core/src/com/arsdigita/ui/SiteBanner.java
===================================================================
--- releases/1.0.2/ccm-core/src/com/arsdigita/ui/SiteBanner.java 2005-07-28 14:00:22 UTC (rev 661)
+++ releases/1.0.2/ccm-core/src/com/arsdigita/ui/SiteBanner.java 2005-07-28 14:08:52 UTC (rev 662)
@@ -20,8 +20,9 @@
import com.arsdigita.bebop.SimpleComponent;
import com.arsdigita.bebop.PageState;
+import com.arsdigita.kernel.KernelHelper;
import com.arsdigita.xml.Element;
-import com.arsdigita.kernel.KernelHelper;
+import com.arsdigita.web.Web;
public class SiteBanner extends SimpleComponent {
@@ -31,11 +32,11 @@
UIConstants.UI_XML_NS);
exportAttributes(content);
- content.addAttribute("hostname",
- KernelHelper.getHostName());
- content.addAttribute("sitename",
- KernelHelper.getSiteName());
- content.addAttribute("admin",
+ content.addAttribute("hostname",
+ Web.getConfig().getServer().toString());
+ content.addAttribute("sitename",
+ Web.getConfig().getSiteName());
+ content.addAttribute("admin",
KernelHelper.getSystemAdministratorEmailAddress());
}
}
|
Author: sshinde
Date: 2005-07-28 16:00:22 +0200 (Thu, 28 Jul 2005)
New Revision: 661
Added:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java
Modified:
ccm-ldn-navigation/trunk/web/packages/navigation/templates/default.jsp
ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java
Log:
Changes to output <assignedTerms/> tag for the index item
of category.
Added: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java 2005-07-28 12:03:51 UTC (rev 660)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/CategoryIndexAssignedTerms.java 2005-07-28 14:00:22 UTC (rev 661)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2001-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.london.navigation.ui;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
+
+/**
+ * Generates </terms:assignedTerms> tag in xml output for the IndexItem
+ * of the category.
+ * Put something like following in your jsp page.
+ *
+ * <define:component name="assignedTerms"
+ * classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+ *
+ * Used in ccm-ldn-navigation/web/packages/navigation/templates/default.jsp
+ */
+public class CategoryIndexAssignedTerms extends AbstractAssignedTerms {
+
+ protected ACSObject getObject(PageState state) {
+ ACSObject ao = Navigation.getConfig().getDefaultModel().getObject();
+ return ao;
+ }
+}
Modified: ccm-ldn-navigation/trunk/web/packages/navigation/templates/default.jsp
===================================================================
--- ccm-ldn-navigation/trunk/web/packages/navigation/templates/default.jsp 2005-07-28 12:03:51 UTC (rev 660)
+++ ccm-ldn-navigation/trunk/web/packages/navigation/templates/default.jsp 2005-07-28 14:00:22 UTC (rev 661)
@@ -42,7 +42,10 @@
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
</jsp:scriptlet>
+
+ <define:component name="assignedTerms"
+ classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
</define:page>
-
<show:all/>
</jsp:root>
Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java
===================================================================
--- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java 2005-07-28 12:03:51 UTC (rev 660)
+++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java 2005-07-28 14:00:22 UTC (rev 661)
@@ -33,7 +33,7 @@
public abstract class AbstractAssignedTerms extends SimpleComponent {
private static final String XML_NS = "http://xmlns.redhat.com/london/terms/1.0";
-
+
public void generateXML(PageState state,
Element parent) {
Element content = parent.newChildElement("terms:assignedTerms",
@@ -41,6 +41,13 @@
ACSObject object = getObject(state);
+
+ //Do nothing if object does not exist.avoid NPE and hence make this
+ //class's XML generation optional.
+ if (null == object) {
+ return;
+ }
+
DataCollection terms = SessionManager.getSession()
.retrieve(Term.BASE_DATA_OBJECT_TYPE);
@@ -72,6 +79,6 @@
}
}
-
+
protected abstract ACSObject getObject(PageState state);
}
|
|
From: <cl...@vh...> - 2005-07-28 12:11:35
|
Author: clasohm
Date: 2005-07-28 14:03:51 +0200 (Thu, 28 Jul 2005)
New Revision: 660
Modified:
ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
Log:
added support for bebop:boxPanel
Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
===================================================================
--- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-07-28 09:26:35 UTC (rev 659)
+++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-07-28 12:03:51 UTC (rev 660)
@@ -173,6 +173,7 @@
<xsl:call-template name="greeting" />
<xsl:call-template name="contentLinks" />
<xsl:call-template name="dataTables" />
+<xsl:call-template name="boxPanels1" />
</xsl:otherwise>
</xsl:choose>
</xsl:template>
@@ -180,6 +181,7 @@
+<!-- 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">
@@ -199,6 +201,39 @@
+<!-- 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>
+
+
+
+
<xsl:template name="Title">
<xsl:choose>
<xsl:when test="cms:contentPanel">
|
|
From: <cl...@vh...> - 2005-07-28 09:33:56
|
Author: clasohm
Date: 2005-07-28 11:26:35 +0200 (Thu, 28 Jul 2005)
New Revision: 659
Modified:
ccm-ldn-aplaws/trunk/application.xml
Log:
bumped release number after modifying lib.xsl
Modified: ccm-ldn-aplaws/trunk/application.xml
===================================================================
--- ccm-ldn-aplaws/trunk/application.xml 2005-07-27 15:06:31 UTC (rev 658)
+++ ccm-ldn-aplaws/trunk/application.xml 2005-07-28 09:26:35 UTC (rev 659)
@@ -3,7 +3,7 @@
name="ccm-ldn-aplaws"
prettyName="APLAWS"
version="1.9.2"
- release="2"
+ release="3"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.2"/>
|
|
From: <cl...@vh...> - 2005-07-27 16:15:08
|
Author: clasohm Date: 2005-07-27 17:06:01 +0200 (Wed, 27 Jul 2005) New Revision: 657 Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl Log: added support for Bebop DataTable Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-07-27 08:25:12 UTC (rev 656) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-07-27 15:06:01 UTC (rev 657) @@ -10,6 +10,8 @@ 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"/> @@ -170,6 +172,7 @@ <xsl:otherwise> <xsl:call-template name="greeting" /> <xsl:call-template name="contentLinks" /> +<xsl:call-template name="dataTables" /> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -177,6 +180,25 @@ +<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> + + + + <xsl:template name="Title"> <xsl:choose> <xsl:when test="cms:contentPanel"> |
|
From: <cl...@vh...> - 2005-07-27 16:14:56
|
Author: clasohm Date: 2005-07-27 17:06:31 +0200 (Wed, 27 Jul 2005) New Revision: 658 Modified: ccm-ldn-aplaws/trunk/ Log: added .classpath and .project to svn:ignore Property changes on: ccm-ldn-aplaws/trunk ___________________________________________________________________ Name: svn:ignore - build + build .classpath .project |
|
From: <fa...@vh...> - 2005-07-27 08:32:45
|
Author: fabrice
Date: 2005-07-27 10:25:12 +0200 (Wed, 27 Jul 2005)
New Revision: 656
Modified:
ccm-core/trunk/web/assets/htmlarea/htmlarea.js
ccm-core/trunk/web/packages/bebop/xsl/DHTMLEditor.xsl
Log:
Patches from Phil Collins for forms in the wysiwyg editor
Modified: ccm-core/trunk/web/assets/htmlarea/htmlarea.js
===================================================================
--- ccm-core/trunk/web/assets/htmlarea/htmlarea.js 2005-07-26 12:19:38 UTC (rev 655)
+++ ccm-core/trunk/web/assets/htmlarea/htmlarea.js 2005-07-27 08:25:12 UTC (rev 656)
@@ -2317,7 +2317,7 @@
return el && el.nodeType == 1 && (HTMLArea._blockTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
};
-HTMLArea._closingTags = " head script style div span tr td tbody table em strong b i code cite dfn abbr acronym font a title ";
+HTMLArea._closingTags="headscriptstyledivspantrtdtbodytableemstrongbicodecitedfnabbracronymfontatitleformtextareah1h2h3h4h5h6";
HTMLArea.needsClosingTag = function(el) {
return el && el.nodeType == 1 && (HTMLArea._closingTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
};
Modified: ccm-core/trunk/web/packages/bebop/xsl/DHTMLEditor.xsl
===================================================================
--- ccm-core/trunk/web/packages/bebop/xsl/DHTMLEditor.xsl 2005-07-26 12:19:38 UTC (rev 655)
+++ ccm-core/trunk/web/packages/bebop/xsl/DHTMLEditor.xsl 2005-07-27 08:25:12 UTC (rev 656)
@@ -107,7 +107,7 @@
</xsl:if>
<textarea id="ta_{@name}" name="{@name}" style="width:100%" rows="{@rows}" cols="{@cols}" wrap="{@wrap}">
- <xsl:value-of disable-output-escaping="yes" select="text()"/>
+ <xsl:value-of disable-output-escaping="no" select="text()"/>
</textarea>
</xsl:template>
|
|
From: <ssk...@vh...> - 2005-07-26 12:27:03
|
Author: sskracic
Date: 2005-07-26 14:19:38 +0200 (Tue, 26 Jul 2005)
New Revision: 655
Modified:
releases/1.0.2/ccm-ldn-portal/application.xml
releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java
Log:
Integrating r654 from trunk (uninitialized parameter model when creating
new portlet).
Modified: releases/1.0.2/ccm-ldn-portal/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-portal/application.xml 2005-07-26 12:18:12 UTC (rev 654)
+++ releases/1.0.2/ccm-ldn-portal/application.xml 2005-07-26 12:19:38 UTC (rev 655)
@@ -3,7 +3,7 @@
name="ccm-ldn-portal"
prettyName="Portal"
version="1.4.2"
- release="6"
+ release="7"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
Modified: releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java
===================================================================
--- releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java 2005-07-26 12:18:12 UTC (rev 654)
+++ releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java 2005-07-26 12:19:38 UTC (rev 655)
@@ -54,6 +54,7 @@
super("applicationSelector");
m_type = type;
+ m_app = app;
m_apps = new SingleSelect(new DomainObjectParameter("apps"));
m_apps.addValidationListener(new NotNullValidationListener());
|
|
From: <ssk...@vh...> - 2005-07-26 12:25:37
|
Author: sskracic
Date: 2005-07-26 14:18:12 +0200 (Tue, 26 Jul 2005)
New Revision: 654
Modified:
ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/ApplicationSelector.java
Log:
Why bother with a private member if you don't initialize it at all?
Modified: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/ApplicationSelector.java
===================================================================
--- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/ApplicationSelector.java 2005-07-26 08:28:19 UTC (rev 653)
+++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/ApplicationSelector.java 2005-07-26 12:18:12 UTC (rev 654)
@@ -54,6 +54,7 @@
super("applicationSelector");
m_type = type;
+ m_app = app;
m_apps = new SingleSelect(new DomainObjectParameter("apps"));
m_apps.addValidationListener(new NotNullValidationListener());
|
|
From: <ssk...@vh...> - 2005-07-26 08:35:32
|
Author: sskracic
Date: 2005-07-26 10:28:19 +0200 (Tue, 26 Jul 2005)
New Revision: 653
Modified:
releases/1.0.2/ccm-forum/application.xml
releases/1.0.2/ccm-forum/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java
Log:
Integrating r652 to 1.0.2 release (end index is exclusive).
Modified: releases/1.0.2/ccm-forum/application.xml
===================================================================
--- releases/1.0.2/ccm-forum/application.xml 2005-07-26 08:18:56 UTC (rev 652)
+++ releases/1.0.2/ccm-forum/application.xml 2005-07-26 08:28:19 UTC (rev 653)
@@ -3,7 +3,7 @@
name="ccm-forum"
prettyName="Forum"
version="1.4.1"
- release="17">
+ release="18">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
</ccm:dependencies>
Modified: releases/1.0.2/ccm-forum/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java
===================================================================
--- releases/1.0.2/ccm-forum/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java 2005-07-26 08:18:56 UTC (rev 652)
+++ releases/1.0.2/ccm-forum/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java 2005-07-26 08:28:19 UTC (rev 653)
@@ -98,7 +98,7 @@
Kernel.getContext().getParty());
threads.setRange(new Integer(1),
- m_portlet.getNumPosts());
+ new Integer(m_portlet.getNumPosts().intValue() + 1));
while (threads.next()) {
MessageThread thread = threads.getMessageThread();
|
|
From: <ssk...@vh...> - 2005-07-26 08:26:20
|
Author: sskracic
Date: 2005-07-26 10:18:56 +0200 (Tue, 26 Jul 2005)
New Revision: 652
Modified:
ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java
Log:
End index on setRange is exclusive.
Modified: ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java
===================================================================
--- ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java 2005-07-22 13:18:34 UTC (rev 651)
+++ ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java 2005-07-26 08:18:56 UTC (rev 652)
@@ -101,7 +101,7 @@
Kernel.getContext().getParty());
threads.setRange(new Integer(1),
- m_portlet.getNumPosts());
+ new Integer(m_portlet.getNumPosts().intValue() + 1));
while (threads.next()) {
MessageThread thread = threads.getMessageThread();
|
|
From: <ssk...@vh...> - 2005-07-22 13:26:00
|
Author: sskracic
Date: 2005-07-22 15:18:34 +0200 (Fri, 22 Jul 2005)
New Revision: 651
Modified:
releases/1.0.2/ccm-ldn-dublin/application.xml
releases/1.0.2/ccm-ldn-dublin/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java
Log:
Merged revision 650 from trunk (metadata subject regexp pattern simplification).
Modified: releases/1.0.2/ccm-ldn-dublin/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-dublin/application.xml 2005-07-22 13:15:41 UTC (rev 650)
+++ releases/1.0.2/ccm-ldn-dublin/application.xml 2005-07-22 13:18:34 UTC (rev 651)
@@ -3,7 +3,7 @@
name="ccm-ldn-dublin"
prettyName="Dublin Core"
version="1.4.1"
- release="9"
+ release="10"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
Modified: releases/1.0.2/ccm-ldn-dublin/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java
===================================================================
--- releases/1.0.2/ccm-ldn-dublin/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java 2005-07-22 13:15:41 UTC (rev 650)
+++ releases/1.0.2/ccm-ldn-dublin/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java 2005-07-22 13:18:34 UTC (rev 651)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved.
*
- * The contents of this file are subject to the ArsDigita Public
+ * The contents of this file are subject to the ArsDigita Public
* License (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of
* the License at http://www.arsdigita.com/ADPL.txt
@@ -15,12 +15,11 @@
package com.arsdigita.london.cms.dublin.ui;
+import java.util.StringTokenizer;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.event.ParameterEvent;
-import org.apache.oro.text.perl.Perl5Util;
-
/**
* Verifies that the parameter contains only comma separated
* alpha-numeric words (allowing hypens and underscores).
@@ -31,36 +30,40 @@
* @version $Id$
**/
public class KeywordsValidationListener implements ParameterListener {
-
+
public static final String versionId = "$Id$";
-
- private static final String KEYWORD_PATTERN =
- "/^(((\\w|-)+(\\s*(\\w|-)+)*)(\\s*,\\s*(\\w|-)+(\\s*(\\w|-)+)*)*)?$/";
-
+
private String m_label;
-
+
+ // allow tokens to contain only alpha-numerics, hyphens and underscores
+ // TODO: configuration parameter maybe?
+ private static String TOKEN_PATTERN = "(\\w|-)*";
+ private static String TOKEN_DELIMITERS = ", \t\n\r\f";
+
public KeywordsValidationListener(String label) {
m_label = label;
- }
-
+ }
+
public KeywordsValidationListener() {
this("This parameter");
}
-
+
public void validate(ParameterEvent event) {
ParameterData data = event.getParameterData();
- Object value = data.getValue();
-
- Perl5Util util = new Perl5Util();
- if ( util.match(KEYWORD_PATTERN, value.toString()) ) {
- return;
+ String value = data.getValue().toString();
+
+ StringTokenizer st = new StringTokenizer(value, TOKEN_DELIMITERS);
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ if (!token.matches(TOKEN_PATTERN)) {
+ // The error message
+ StringBuffer msg = new StringBuffer(128);
+ msg
+ .append(m_label)
+ .append(" must contain only comma separated keywords");
+ data.addError(msg.toString());
+ return;
+ }
}
-
- // The error message
- StringBuffer msg = new StringBuffer(128);
- msg
- .append(m_label)
- .append(" must contain only comma separated keywords");
- data.addError(msg.toString());
}
}
|
|
From: <ssk...@vh...> - 2005-07-22 13:23:06
|
Author: sskracic
Date: 2005-07-22 15:15:41 +0200 (Fri, 22 Jul 2005)
New Revision: 650
Modified:
ccm-ldn-dublin/trunk/application.xml
ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java
Log:
Replaced the complicated regular expression which made JVM spin
endlessly on input like "this, that, another, this, that, another,
this, that, another." with a StringTokenizer loop.
Modified: ccm-ldn-dublin/trunk/application.xml
===================================================================
--- ccm-ldn-dublin/trunk/application.xml 2005-07-20 16:34:58 UTC (rev 649)
+++ ccm-ldn-dublin/trunk/application.xml 2005-07-22 13:15:41 UTC (rev 650)
@@ -3,7 +3,7 @@
name="ccm-ldn-dublin"
prettyName="Dublin Core"
version="1.4.3"
- release="1"
+ release="2"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.2"/>
Modified: ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java
===================================================================
--- ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java 2005-07-20 16:34:58 UTC (rev 649)
+++ ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/KeywordsValidationListener.java 2005-07-22 13:15:41 UTC (rev 650)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved.
*
- * The contents of this file are subject to the ArsDigita Public
+ * The contents of this file are subject to the ArsDigita Public
* License (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of
* the License at http://www.arsdigita.com/ADPL.txt
@@ -15,12 +15,11 @@
package com.arsdigita.london.cms.dublin.ui;
+import java.util.StringTokenizer;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.event.ParameterEvent;
-import org.apache.oro.text.perl.Perl5Util;
-
/**
* Verifies that the parameter contains only comma separated
* alpha-numeric words (allowing hypens and underscores).
@@ -31,36 +30,40 @@
* @version $Id$
**/
public class KeywordsValidationListener implements ParameterListener {
-
+
public static final String versionId = "$Id$";
-
- private static final String KEYWORD_PATTERN =
- "/^(((\\w|-)+(\\s*(\\w|-)+)*)(\\s*,\\s*(\\w|-)+(\\s*(\\w|-)+)*)*)?$/";
-
+
private String m_label;
-
+
+ // allow tokens to contain only alpha-numerics, hyphens and underscores
+ // TODO: configuration parameter maybe?
+ private static String TOKEN_PATTERN = "(\\w|-)*";
+ private static String TOKEN_DELIMITERS = ", \t\n\r\f";
+
public KeywordsValidationListener(String label) {
m_label = label;
- }
-
+ }
+
public KeywordsValidationListener() {
this("This parameter");
}
-
+
public void validate(ParameterEvent event) {
ParameterData data = event.getParameterData();
- Object value = data.getValue();
-
- Perl5Util util = new Perl5Util();
- if ( util.match(KEYWORD_PATTERN, value.toString()) ) {
- return;
+ String value = data.getValue().toString();
+
+ StringTokenizer st = new StringTokenizer(value, TOKEN_DELIMITERS);
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken();
+ if (!token.matches(TOKEN_PATTERN)) {
+ // The error message
+ StringBuffer msg = new StringBuffer(128);
+ msg
+ .append(m_label)
+ .append(" must contain only comma separated keywords");
+ data.addError(msg.toString());
+ return;
+ }
}
-
- // The error message
- StringBuffer msg = new StringBuffer(128);
- msg
- .append(m_label)
- .append(" must contain only comma separated keywords");
- data.addError(msg.toString());
}
}
|
|
From: <ss...@vh...> - 2005-07-20 16:42:12
|
Author: sshinde
Date: 2005-07-20 18:34:58 +0200 (Wed, 20 Jul 2005)
New Revision: 649
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java
Log:
The default behaviour of the system is to send redirect OID links
to live items.There is no need to explicitly append context=live
parameter to the inserted links.
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java 2005-07-20 14:11:16 UTC (rev 648)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java 2005-07-20 16:34:58 UTC (rev 649)
@@ -50,9 +50,7 @@
import com.arsdigita.cms.ui.folder.FolderManipulator;
import com.arsdigita.cms.ui.folder.FolderSelectionModel;
import com.arsdigita.globalization.GlobalizedMessage;
-import com.arsdigita.persistence.OID;
import com.arsdigita.util.Assert;
-import com.arsdigita.web.URL;
import java.math.BigDecimal;
@@ -113,7 +111,7 @@
setEmptyView(new Label(globalize("cms.ui.folder.no_items")));
- Assert.assertNotNull( m_currentFolder.getStateParameter() );
+ Assert.exists( m_currentFolder.getStateParameter() );
}
public Paginator getPaginator() {
@@ -140,7 +138,7 @@
private void showHideFolderActions(PageState state) {
SecurityManager sm = Utilities.getSecurityManager(state);
Folder folder = getCurrentFolder( state );
- Assert.assertNotNull(folder);
+ Assert.exists(folder);
}
@@ -206,7 +204,7 @@
itemColl.addEqualsFilter (ContentItem.CONTENT_TYPE +
"." + ContentType.ID, singleTypeID);
- itemColl.setOrder("isFolder desc");
+ itemColl.addOrder("isFolder desc");
itemColl.addOrder("lower(item." +
ContentItem.NAME + ") ");
return itemColl;
@@ -278,7 +276,7 @@
(state.getValue(new StringParameter(ItemSearchPopup.URL_PARAM)));
String fillString = useURL ?
- ItemSearchPopup.getLiveItemURL(state.getRequest(),
+ ItemSearchPopup.getItemURL(state.getRequest(),
coll.getDomainObject().getOID()) :
id +
" (" + name + ")";
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-07-20 14:11:16 UTC (rev 648)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-07-20 16:34:58 UTC (rev 649)
@@ -20,20 +20,12 @@
import com.arsdigita.bebop.Component;
-import com.arsdigita.bebop.Label;
-import com.arsdigita.bebop.Link;
-import com.arsdigita.bebop.List;
import com.arsdigita.bebop.Page;
-import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.list.ListCellRenderer;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.persistence.OID;
import com.arsdigita.xml.Element;
-import com.arsdigita.web.ParameterMap;
-import com.arsdigita.web.URL;
import com.arsdigita.search.Search;
import com.arsdigita.search.Document;
@@ -93,7 +85,7 @@
}
}
- public static String getLiveItemURL(HttpServletRequest request, OID oid) {
+ 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());
@@ -120,7 +112,7 @@
state.getValue(new StringParameter(URL_PARAM)));
String fillString = useURL ?
- getLiveItemURL(state.getRequest(), doc.getOID()) :
+ getItemURL(state.getRequest(), doc.getOID()) :
doc.getOID().get("id").toString() +
" (" + doc.getTitle() + ")";
|
|
From: <ss...@vh...> - 2005-07-20 14:18:20
|
Author: sshinde Date: 2005-07-20 16:11:16 +0200 (Wed, 20 Jul 2005) New Revision: 648 Removed: releases/1.0.2/ccm-cms/lib/jakarta-oro-2.0.4.jar Log: Newer version is already there in core app. Deleted: releases/1.0.2/ccm-cms/lib/jakarta-oro-2.0.4.jar |
|
From: <ss...@vh...> - 2005-07-20 13:31:44
|
Author: sshinde
Date: 2005-07-20 15:24:47 +0200 (Wed, 20 Jul 2005)
New Revision: 647
Modified:
releases/1.0.2/ccm-cms/application.xml
releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java
Log:
The default context in APLAWS is live so need to explicitly
add &context=live parameter in URLs generated from the popups
for linking.
Leaving the old method as is for backward compatibility,should
just be renamed.
Removed unused imports.
Modified: releases/1.0.2/ccm-cms/application.xml
===================================================================
--- releases/1.0.2/ccm-cms/application.xml 2005-07-20 13:24:23 UTC (rev 646)
+++ releases/1.0.2/ccm-cms/application.xml 2005-07-20 13:24:47 UTC (rev 647)
@@ -3,7 +3,7 @@
name="ccm-cms"
prettyName="Red Hat CCM Content Management System"
version="6.1.1"
- release="8"
+ release="9"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
Modified: releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
===================================================================
--- releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java 2005-07-20 13:24:23 UTC (rev 646)
+++ releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java 2005-07-20 13:24:47 UTC (rev 647)
@@ -50,9 +50,7 @@
import com.arsdigita.cms.ui.folder.FolderManipulator;
import com.arsdigita.cms.ui.folder.FolderSelectionModel;
import com.arsdigita.globalization.GlobalizedMessage;
-import com.arsdigita.persistence.OID;
import com.arsdigita.util.Assert;
-import com.arsdigita.web.URL;
import java.math.BigDecimal;
@@ -278,7 +276,7 @@
(state.getValue(new StringParameter(ItemSearchPopup.URL_PARAM)));
String fillString = useURL ?
- ItemSearchPopup.getLiveItemURL(state.getRequest(),
+ ItemSearchPopup.getItemURL(state.getRequest(),
coll.getDomainObject().getOID()) :
id +
" (" + name + ")";
Modified: releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java
===================================================================
--- releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-07-20 13:24:23 UTC (rev 646)
+++ releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-07-20 13:24:47 UTC (rev 647)
@@ -20,20 +20,12 @@
import com.arsdigita.bebop.Component;
-import com.arsdigita.bebop.Label;
-import com.arsdigita.bebop.Link;
-import com.arsdigita.bebop.List;
import com.arsdigita.bebop.Page;
-import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.list.ListCellRenderer;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.persistence.OID;
import com.arsdigita.xml.Element;
-import com.arsdigita.web.ParameterMap;
-import com.arsdigita.web.URL;
import com.arsdigita.search.Search;
import com.arsdigita.search.Document;
@@ -102,6 +94,15 @@
return "/redirect/?oid="+oid.toString() + "&context=live";
}
+ /**
+ * The default context is live , no need to explicitly attach it to the URL.
+ * Leaving old method for backward compatibility.Should really just be
+ * renamed.
+ */
+ public static String getItemURL(HttpServletRequest request, OID oid) {
+ return "/redirect/?oid="+oid.toString();
+ }
+
private static class PopupResultsPane extends ResultsPane {
public PopupResultsPane(QueryGenerator generator) {
super(generator);
@@ -120,7 +121,7 @@
state.getValue(new StringParameter(URL_PARAM)));
String fillString = useURL ?
- getLiveItemURL(state.getRequest(), doc.getOID()) :
+ getItemURL(state.getRequest(), doc.getOID()) :
doc.getOID().get("id").toString() +
" (" + doc.getTitle() + ")";
|
|
From: <cl...@vh...> - 2005-07-20 13:31:18
|
Author: clasohm Date: 2005-07-20 15:24:23 +0200 (Wed, 20 Jul 2005) New Revision: 646 Modified: ccm-ldn-dublin/trunk/ Log: added .classpath and .project to svn:ignore Property changes on: ccm-ldn-dublin/trunk ___________________________________________________________________ Name: svn:ignore - build + build .classpath .project |
|
From: <cl...@vh...> - 2005-07-20 13:31:06
|
Author: clasohm Date: 2005-07-20 15:24:03 +0200 (Wed, 20 Jul 2005) New Revision: 645 Added: ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/ ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql ccm-ldn-dublin/trunk/src/ccm-ldn-dublin.upgrade Modified: ccm-ldn-dublin/trunk/application.xml Log: added SQL upgrade script for ldn_dublin_core_items.ccn_portal_instance Modified: ccm-ldn-dublin/trunk/application.xml =================================================================== --- ccm-ldn-dublin/trunk/application.xml 2005-07-19 13:47:47 UTC (rev 644) +++ ccm-ldn-dublin/trunk/application.xml 2005-07-20 13:24:03 UTC (rev 645) @@ -2,7 +2,7 @@ <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" name="ccm-ldn-dublin" prettyName="Dublin Core" - version="1.4.2" + version="1.4.3" release="1" webapp="ROOT"> <ccm:dependencies> Added: ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql =================================================================== --- ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql 2005-07-19 13:47:47 UTC (rev 644) +++ ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql 2005-07-20 13:24:03 UTC (rev 645) @@ -0,0 +1,2 @@ +alter table ldn_dublin_core_items +add ccn_portal_instance varchar2(200); Property changes on: ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql =================================================================== --- ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql 2005-07-19 13:47:47 UTC (rev 644) +++ ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql 2005-07-20 13:24:03 UTC (rev 645) @@ -0,0 +1,2 @@ +alter table ldn_dublin_core_items +add ccn_portal_instance varchar(200); Property changes on: ccm-ldn-dublin/trunk/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-ldn-dublin/trunk/src/ccm-ldn-dublin.upgrade =================================================================== --- ccm-ldn-dublin/trunk/src/ccm-ldn-dublin.upgrade 2005-07-19 13:47:47 UTC (rev 644) +++ ccm-ldn-dublin/trunk/src/ccm-ldn-dublin.upgrade 2005-07-20 13:24:03 UTC (rev 645) @@ -0,0 +1,5 @@ +<upgrade> + <version from="1.4.2" to="1.4.3"> + <script sql="ccm-ldn-dublin/upgrade/::database::-1.4.2-1.4.3.sql"/> + </version> +</upgrade> |
|
From: <ss...@vh...> - 2005-07-19 13:54:49
|
Author: sshinde
Date: 2005-07-19 15:47:47 +0200 (Tue, 19 Jul 2005)
New Revision: 644
Modified:
releases/1.0.2/ccm-ldn-navigation/application.xml
releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
Log:
Make the XML generation of <nav:item> and <nav:paginator> optional.
Modified: releases/1.0.2/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/application.xml 2005-07-19 13:46:26 UTC (rev 643)
+++ releases/1.0.2/ccm-ldn-navigation/application.xml 2005-07-19 13:47:47 UTC (rev 644)
@@ -3,7 +3,7 @@
name="ccm-ldn-navigation"
prettyName="Navigation"
version="1.4.4"
- release="4"
+ release="5"
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/DataCollectionRenderer.java
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java 2005-07-19 13:46:26 UTC (rev 643)
+++ releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/DataCollectionRenderer.java 2005-07-19 13:47:47 UTC (rev 644)
@@ -47,7 +47,8 @@
private int m_pageSize = 20;
private boolean m_specializeObjects = false;
private boolean m_wrapAttributes = false;
-
+ private boolean m_navItems = true;
+
public DataCollectionRenderer() {
addAttribute("objectType");
addAttribute("id");
@@ -68,6 +69,15 @@
m_pageSize = pageSize;
}
+ /**
+ * Specify whether to include the items for navigation that are within
+ * same category.
+ * This flag toggles the generation of nav:item xml elements.
+ */
+ public void setNavItems (boolean navItems){
+ m_navItems = navItems;
+ }
+
public void setSpecializeObjects(boolean specializeObjects) {
Assert.unlocked(this);
m_specializeObjects = specializeObjects;
@@ -86,7 +96,14 @@
Assert.locked(this);
Element content = Navigation.newElement("objectList");
-
+
+ //Return the empty nav:item & nav:paginator tags.
+ if (! m_navItems) {
+ Element paginator = Navigation.newElement("paginator");
+ content.addContent(paginator);
+ return content;
+ }
+
long objectCount = objects.size();
int pageCount = (int)Math.ceil((double)objectCount / (double)m_pageSize);
|
|
From: <ss...@vh...> - 2005-07-19 13:53:34
|
Author: sshinde
Date: 2005-07-19 15:46:26 +0200 (Tue, 19 Jul 2005)
New Revision: 643
Modified:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
Log:
Make XML generation of <nav:item> and <nav:paginator> optional.
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java 2005-07-14 12:13:56 UTC (rev 642)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java 2005-07-19 13:46:26 UTC (rev 643)
@@ -47,6 +47,7 @@
private int m_pageSize = 20;
private boolean m_specializeObjects = false;
private boolean m_wrapAttributes = false;
+ private boolean m_navItems = true;
public DataCollectionRenderer() {
addAttribute("objectType");
@@ -68,6 +69,15 @@
m_pageSize = pageSize;
}
+ /**
+ * Specify whether to include the items for navigation that are within
+ * same category.
+ * This flag toggles the generation of nav:item xml elements.
+ */
+ public void setNavItems (boolean navItems){
+ m_navItems = navItems;
+ }
+
public void setSpecializeObjects(boolean specializeObjects) {
Assert.unlocked(this);
m_specializeObjects = specializeObjects;
@@ -86,7 +96,14 @@
Assert.locked(this);
Element content = Navigation.newElement("objectList");
-
+
+ //Return the empty nav:item & nav:paginator tags.
+ if (! m_navItems) {
+ Element paginator = Navigation.newElement("paginator");
+ content.addContent(paginator);
+ return content;
+ }
+
long objectCount = objects.size();
int pageCount = (int)Math.ceil((double)objectCount / (double)m_pageSize);
|
|
From: <fa...@vh...> - 2005-07-14 12:20:44
|
Author: fabrice
Date: 2005-07-14 14:13:56 +0200 (Thu, 14 Jul 2005)
New Revision: 642
Modified:
ccm-cms/trunk/web/assets/htmlarea/config/Basic.js
ccm-cms/trunk/web/assets/htmlarea/config/Styled.js
Log:
use extra widgets for new htmlarea
Modified: ccm-cms/trunk/web/assets/htmlarea/config/Basic.js
===================================================================
--- ccm-cms/trunk/web/assets/htmlarea/config/Basic.js 2005-07-14 12:13:36 UTC (rev 641)
+++ ccm-cms/trunk/web/assets/htmlarea/config/Basic.js 2005-07-14 12:13:56 UTC (rev 642)
@@ -5,11 +5,12 @@
[ "fontname", "space",
"fontsize", "space",
"formatblock", "space",
- "bold", "italic", "underline", "separator",
- "strikethrough", "subscript", "superscript", "separator",
+ "bold", "italic", "underline", "strikethrough", "separator",
+ "subscript", "superscript", "separator",
"copy", "cut", "paste", "space", "undo", "redo" ],
[ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+ "lefttoright", "righttoleft", "separator",
"insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
"forecolor", "hilitecolor", "textindicator", "separator",
"inserthorizontalrule", "insertlink", "insertimage", "inserttable", "htmlmode", "separator",
Modified: ccm-cms/trunk/web/assets/htmlarea/config/Styled.js
===================================================================
--- ccm-cms/trunk/web/assets/htmlarea/config/Styled.js 2005-07-14 12:13:36 UTC (rev 641)
+++ ccm-cms/trunk/web/assets/htmlarea/config/Styled.js 2005-07-14 12:13:56 UTC (rev 642)
@@ -4,12 +4,14 @@
HTMLArea.Config.CMSStyled = function() {
this.toolbar = [
[ "formatblock", "space",
- "bold", "italic", "separator",
- "strikethrough", "subscript", "superscript", "separator",
+ "bold", "italic", "underline", "strikethrough", "separator",
+ "subscript", "superscript", "separator",
"copy", "cut", "paste", "space", "undo", "redo" ],
[ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+ "lefttoright", "righttoleft", "separator",
"insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+ "forecolor", "hilitecolor", "separator",
"textindicator", "separator",
"inserthorizontalrule", "insertlink", "insertimage", "inserttable", "htmlmode", "separator",
"popupeditor", "separator" ]
|
18 messages has been excluded from this view by a project administrator.
