aplaws-commit Mailing List for APLAWS (Page 15)

Brought to you by: lbcfrancois, mentaldaze, pboy

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

Flat | Threaded

<< < 1 .. 13 14 15 16 17 .. 60 > >> (Page 15 of 60)

[Aplaws-commit] r1342 - trunk/ccm-cms/src/com/arsdigita/cms

From: <ssk...@vh...> - 2006-10-10 09:51:15

Author: sskracic
Date: 2006-10-10 11:41:56 +0200 (Tue, 10 Oct 2006)
New Revision: 1342

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
Log:
  The access check for authoring UI in a content section should not be
based on generic 'cms_read_item' privilege, which is being granted to
the 'Public' party.  Switched to 'cms_preview_item', which is implied
by all the privileges given to content section authors.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java	2006-10-06 12:22:19 UTC (rev 1341)
+++ trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java	2006-10-10 09:41:56 UTC (rev 1342)
@@ -297,13 +297,13 @@
     }
 
     /**
-     * Returns true if the specified party has the READ permission on the
+     * Returns true if the specified party can access authoring UI in the
      * current content section. False otherwise.
      *
      * @pre m_section != null
      **/
     protected boolean canViewAdminPages(Party party) {
-        return (hasPermission(party, PrivilegeDescriptor.READ));
+        return (hasPermission(party, CMS_PREVIEW_ITEM));
     }
 
     /**

[Aplaws-commit] r1341 - in trunk/ccm-ldn-aplaws/bundles: complete demo devel standard

From: <ap...@vh...> - 2006-10-06 12:31:13

Author: apevec
Date: 2006-10-06 14:22:19 +0200 (Fri, 06 Oct 2006)
New Revision: 1341

Modified:
   trunk/ccm-ldn-aplaws/bundles/complete/bundle.in
   trunk/ccm-ldn-aplaws/bundles/demo/bundle.in
   trunk/ccm-ldn-aplaws/bundles/devel/bundle.in
   trunk/ccm-ldn-aplaws/bundles/standard/bundle.in
Log:
bump trunk bundles to 1.0.5devel


Modified: trunk/ccm-ldn-aplaws/bundles/complete/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
+++ trunk/ccm-ldn-aplaws/bundles/complete/bundle.in	2006-10-06 12:22:19 UTC (rev 1341)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-complete
 BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.5devel
 RELEASE=1

Modified: trunk/ccm-ldn-aplaws/bundles/demo/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/demo/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
+++ trunk/ccm-ldn-aplaws/bundles/demo/bundle.in	2006-10-06 12:22:19 UTC (rev 1341)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-demo
 BUNDLE_PRETTY_NAME="APLAWS+ Demo Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.5devel
 RELEASE=1

Modified: trunk/ccm-ldn-aplaws/bundles/devel/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/devel/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
+++ trunk/ccm-ldn-aplaws/bundles/devel/bundle.in	2006-10-06 12:22:19 UTC (rev 1341)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-devel
 BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.5devel
 RELEASE=1

Modified: trunk/ccm-ldn-aplaws/bundles/standard/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/standard/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
+++ trunk/ccm-ldn-aplaws/bundles/standard/bundle.in	2006-10-06 12:22:19 UTC (rev 1341)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-standard
 BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.5devel
 RELEASE=1

[Aplaws-commit] r1340 - in releases/1.0.4/ccm-ldn-aplaws/bundles: complete demo devel standard

From: <ap...@vh...> - 2006-10-06 12:28:10

Author: apevec
Date: 2006-10-06 14:19:15 +0200 (Fri, 06 Oct 2006)
New Revision: 1340

Modified:
   releases/1.0.4/ccm-ldn-aplaws/bundles/complete/bundle.in
   releases/1.0.4/ccm-ldn-aplaws/bundles/demo/bundle.in
   releases/1.0.4/ccm-ldn-aplaws/bundles/devel/bundle.in
   releases/1.0.4/ccm-ldn-aplaws/bundles/standard/bundle.in
Log:
bump bundle versions to 1.0.4


Modified: releases/1.0.4/ccm-ldn-aplaws/bundles/complete/bundle.in
===================================================================
--- releases/1.0.4/ccm-ldn-aplaws/bundles/complete/bundle.in	2006-10-06 07:47:11 UTC (rev 1339)
+++ releases/1.0.4/ccm-ldn-aplaws/bundles/complete/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-complete
 BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.4
 RELEASE=1

Modified: releases/1.0.4/ccm-ldn-aplaws/bundles/demo/bundle.in
===================================================================
--- releases/1.0.4/ccm-ldn-aplaws/bundles/demo/bundle.in	2006-10-06 07:47:11 UTC (rev 1339)
+++ releases/1.0.4/ccm-ldn-aplaws/bundles/demo/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-demo
 BUNDLE_PRETTY_NAME="APLAWS+ Demo Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.4
 RELEASE=1

Modified: releases/1.0.4/ccm-ldn-aplaws/bundles/devel/bundle.in
===================================================================
--- releases/1.0.4/ccm-ldn-aplaws/bundles/devel/bundle.in	2006-10-06 07:47:11 UTC (rev 1339)
+++ releases/1.0.4/ccm-ldn-aplaws/bundles/devel/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-devel
 BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.4
 RELEASE=1

Modified: releases/1.0.4/ccm-ldn-aplaws/bundles/standard/bundle.in
===================================================================
--- releases/1.0.4/ccm-ldn-aplaws/bundles/standard/bundle.in	2006-10-06 07:47:11 UTC (rev 1339)
+++ releases/1.0.4/ccm-ldn-aplaws/bundles/standard/bundle.in	2006-10-06 12:19:15 UTC (rev 1340)
@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-standard
 BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
-VERSION=1.0.3devel
+VERSION=1.0.4
 RELEASE=1

[Aplaws-commit] r1339 - releases/1.0.4/ccm-cms

From: <ssk...@vh...> - 2006-10-06 07:56:11

Author: sskracic
Date: 2006-10-06 09:47:11 +0200 (Fri, 06 Oct 2006)
New Revision: 1339

Modified:
   releases/1.0.4/ccm-cms/application.xml
Log:
  Bumping the release number to reflect permission fixes.


Modified: releases/1.0.4/ccm-cms/application.xml
===================================================================
--- releases/1.0.4/ccm-cms/application.xml	2006-10-06 07:43:53 UTC (rev 1338)
+++ releases/1.0.4/ccm-cms/application.xml	2006-10-06 07:47:11 UTC (rev 1339)
@@ -3,7 +3,7 @@
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
   version="6.4.0"
-  release="1"
+  release="2"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>

[Aplaws-commit] r1338 - in releases/1.0.4/ccm-cms/src/com/arsdigita/cms: . ui/workflow

From: <ssk...@vh...> - 2006-10-06 07:53:00

Author: sskracic
Date: 2006-10-06 09:43:53 +0200 (Fri, 06 Oct 2006)
New Revision: 1338

Modified:
   releases/1.0.4/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
   releases/1.0.4/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
Log:
  Integrated r1335-1337 from trunk: task finish link visibility and
publishing permission check corrected.


Modified: releases/1.0.4/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
===================================================================
--- releases/1.0.4/ccm-cms/src/com/arsdigita/cms/SecurityManager.java	2006-10-05 19:19:46 UTC (rev 1337)
+++ releases/1.0.4/ccm-cms/src/com/arsdigita/cms/SecurityManager.java	2006-10-06 07:43:53 UTC (rev 1338)
@@ -396,7 +396,10 @@
                 while (i.hasNext()) {
                     CMSTask t = (CMSTask) i.next();
                     if (t.getTaskType().getID().equals(CMSTaskType.DEPLOY)) {
-                        return true;
+                        User lockingUser = t.getLockedUser();
+                        if (lockingUser == null  ||  user.equals(lockingUser)) {
+                            return true;
+                        }
                     }
                 }
             }

Modified: releases/1.0.4/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
===================================================================
--- releases/1.0.4/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java	2006-10-05 19:19:46 UTC (rev 1337)
+++ releases/1.0.4/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java	2006-10-06 07:43:53 UTC (rev 1338)
@@ -34,6 +34,7 @@
 import com.arsdigita.cms.ui.BaseItemPane;
 import com.arsdigita.cms.ui.VisibilityComponent;
 import com.arsdigita.cms.workflow.CMSTask;
+import com.arsdigita.kernel.User;
 import com.arsdigita.toolbox.ui.ActionGroup;
 import com.arsdigita.toolbox.ui.PropertyList;
 import com.arsdigita.toolbox.ui.Section;
@@ -133,7 +134,12 @@
         }
 
         public final boolean isVisible(final PageState state) {
-            return m_task.getTask(state).isEnabled();
+            CMSTask task = m_task.getTask(state);
+            User lockingUser = task.getLockedUser();
+            boolean visible = task.isEnabled()  &&
+                (lockingUser == null ||
+                  lockingUser.equals(Web.getContext().getUser()));
+            return visible;
         }
 
         private class Listener implements ActionListener {

[Aplaws-commit] r1336 - trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow

From: <ssk...@vh...> - 2006-10-05 19:31:30

Author: sskracic
Date: 2006-10-05 21:17:29 +0200 (Thu, 05 Oct 2006)
New Revision: 1336

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
Log:
  Omitted this line in the previous submit.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java	2006-10-05 14:55:54 UTC (rev 1335)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java	2006-10-05 19:17:29 UTC (rev 1336)
@@ -139,6 +139,7 @@
             boolean visible = task.isEnabled()  &&
                 (lockingUser == null ||
                   lockingUser.equals(Web.getContext().getUser()));
+            return visible;
         }
 
         private class Listener implements ActionListener {

[Aplaws-commit] r1337 - trunk/ccm-cms/src/com/arsdigita/cms

From: <ssk...@vh...> - 2006-10-05 19:28:48

Author: sskracic
Date: 2006-10-05 21:19:46 +0200 (Thu, 05 Oct 2006)
New Revision: 1337

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
Log:
  You can't publish an item if the "Deploy" task is locked by some other
user -- you will get Not Locking User Exception in very unfriendly error message.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java	2006-10-05 19:17:29 UTC (rev 1336)
+++ trunk/ccm-cms/src/com/arsdigita/cms/SecurityManager.java	2006-10-05 19:19:46 UTC (rev 1337)
@@ -396,7 +396,10 @@
                 while (i.hasNext()) {
                     CMSTask t = (CMSTask) i.next();
                     if (t.getTaskType().getID().equals(CMSTaskType.DEPLOY)) {
-                        return true;
+                        User lockingUser = t.getLockedUser();
+                        if (lockingUser == null  ||  user.equals(lockingUser)) {
+                            return true;
+                        }
                     }
                 }
             }

[Aplaws-commit] r1335 - trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow

From: <ssk...@vh...> - 2006-10-05 15:04:54

Author: sskracic
Date: 2006-10-05 16:55:54 +0200 (Thu, 05 Oct 2006)
New Revision: 1335

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
Log:
  "Finish Task" link should not be visible if some other user has locked
the task -- we will get the Not Locking User Exception anyway.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java	2006-10-05 07:11:07 UTC (rev 1334)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java	2006-10-05 14:55:54 UTC (rev 1335)
@@ -34,6 +34,7 @@
 import com.arsdigita.cms.ui.BaseItemPane;
 import com.arsdigita.cms.ui.VisibilityComponent;
 import com.arsdigita.cms.workflow.CMSTask;
+import com.arsdigita.kernel.User;
 import com.arsdigita.toolbox.ui.ActionGroup;
 import com.arsdigita.toolbox.ui.PropertyList;
 import com.arsdigita.toolbox.ui.Section;
@@ -133,7 +134,11 @@
         }
 
         public final boolean isVisible(final PageState state) {
-            return m_task.getTask(state).isEnabled();
+            CMSTask task = m_task.getTask(state);
+            User lockingUser = task.getLockedUser();
+            boolean visible = task.isEnabled()  &&
+                (lockingUser == null ||
+                  lockingUser.equals(Web.getContext().getUser()));
         }
 
         private class Listener implements ActionListener {

[Aplaws-commit] r1334 - in releases/1.0.4/tools: bundle devel rpms/ccm-java scripts tools

From: <ssk...@vh...> - 2006-10-05 07:20:03

Author: sskracic
Date: 2006-10-05 09:11:07 +0200 (Thu, 05 Oct 2006)
New Revision: 1334

Modified:
   releases/1.0.4/tools/bundle/configure.in
   releases/1.0.4/tools/devel/configure.in
   releases/1.0.4/tools/rpms/ccm-java/ccm-java.spec.in
   releases/1.0.4/tools/scripts/configure.in
   releases/1.0.4/tools/tools/configure.in
Log:
  Bumping the version number for 1.0.4 release.


Modified: releases/1.0.4/tools/bundle/configure.in
===================================================================
--- releases/1.0.4/tools/bundle/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
+++ releases/1.0.4/tools/bundle/configure.in	2006-10-05 07:11:07 UTC (rev 1334)
@@ -3,7 +3,7 @@
 
 AC_INIT(ccm-tools-bundle.spec.in)
 
-VERSION=6.3.0
+VERSION=6.4.0
 RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-tools-bundle, $VERSION)

Modified: releases/1.0.4/tools/devel/configure.in
===================================================================
--- releases/1.0.4/tools/devel/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
+++ releases/1.0.4/tools/devel/configure.in	2006-10-05 07:11:07 UTC (rev 1334)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-devel.spec.in)
 
-VERSION=6.3.0
-RELEASE=3
+VERSION=6.4.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-devel, $VERSION)
 AC_SUBST(RELEASE)

Modified: releases/1.0.4/tools/rpms/ccm-java/ccm-java.spec.in
===================================================================
--- releases/1.0.4/tools/rpms/ccm-java/ccm-java.spec.in	2006-10-05 07:08:09 UTC (rev 1333)
+++ releases/1.0.4/tools/rpms/ccm-java/ccm-java.spec.in	2006-10-05 07:11:07 UTC (rev 1334)
@@ -1,6 +1,6 @@
 Summary: Java related environment variables for CCM
 Name:    ccm-java
-Version: 6.3.0
+Version: 6.4.0
 Release: 1
 Group:   Applications/Internet/CCM
 License: LGPL

Modified: releases/1.0.4/tools/scripts/configure.in
===================================================================
--- releases/1.0.4/tools/scripts/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
+++ releases/1.0.4/tools/scripts/configure.in	2006-10-05 07:11:07 UTC (rev 1334)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-scripts.spec.in)
 
-VERSION=6.3.0
-RELEASE=2
+VERSION=6.4.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-scripts, $VERSION)
 AC_SUBST(RELEASE)

Modified: releases/1.0.4/tools/tools/configure.in
===================================================================
--- releases/1.0.4/tools/tools/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
+++ releases/1.0.4/tools/tools/configure.in	2006-10-05 07:11:07 UTC (rev 1334)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-tools.spec.in)
 
-VERSION=6.3.0
-RELEASE=2
+VERSION=6.4.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
 AC_SUBST(RELEASE)

[Aplaws-commit] r1333 - in trunk/tools: bundle devel rpms/ccm-java scripts tools

From: <ssk...@vh...> - 2006-10-05 07:17:11

Author: sskracic
Date: 2006-10-05 09:08:09 +0200 (Thu, 05 Oct 2006)
New Revision: 1333

Modified:
   trunk/tools/bundle/configure.in
   trunk/tools/devel/configure.in
   trunk/tools/rpms/ccm-java/ccm-java.spec.in
   trunk/tools/scripts/configure.in
   trunk/tools/tools/configure.in
Log:
  Bumping the version number after 1.0.4 release.


Modified: trunk/tools/bundle/configure.in
===================================================================
--- trunk/tools/bundle/configure.in	2006-10-04 16:26:48 UTC (rev 1332)
+++ trunk/tools/bundle/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
@@ -3,7 +3,7 @@
 
 AC_INIT(ccm-tools-bundle.spec.in)
 
-VERSION=6.3.0
+VERSION=6.5.0
 RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-tools-bundle, $VERSION)

Modified: trunk/tools/devel/configure.in
===================================================================
--- trunk/tools/devel/configure.in	2006-10-04 16:26:48 UTC (rev 1332)
+++ trunk/tools/devel/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-devel.spec.in)
 
-VERSION=6.3.0
-RELEASE=3
+VERSION=6.5.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-devel, $VERSION)
 AC_SUBST(RELEASE)

Modified: trunk/tools/rpms/ccm-java/ccm-java.spec.in
===================================================================
--- trunk/tools/rpms/ccm-java/ccm-java.spec.in	2006-10-04 16:26:48 UTC (rev 1332)
+++ trunk/tools/rpms/ccm-java/ccm-java.spec.in	2006-10-05 07:08:09 UTC (rev 1333)
@@ -1,6 +1,6 @@
 Summary: Java related environment variables for CCM
 Name:    ccm-java
-Version: 6.3.0
+Version: 6.5.0
 Release: 1
 Group:   Applications/Internet/CCM
 License: LGPL

Modified: trunk/tools/scripts/configure.in
===================================================================
--- trunk/tools/scripts/configure.in	2006-10-04 16:26:48 UTC (rev 1332)
+++ trunk/tools/scripts/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-scripts.spec.in)
 
-VERSION=6.3.0
-RELEASE=2
+VERSION=6.5.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-scripts, $VERSION)
 AC_SUBST(RELEASE)

Modified: trunk/tools/tools/configure.in
===================================================================
--- trunk/tools/tools/configure.in	2006-10-04 16:26:48 UTC (rev 1332)
+++ trunk/tools/tools/configure.in	2006-10-05 07:08:09 UTC (rev 1333)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-tools.spec.in)
 
-VERSION=6.3.0
-RELEASE=2
+VERSION=6.5.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
 AC_SUBST(RELEASE)

[Aplaws-commit] r1332 - in trunk: ccm-auth-http ccm-bookmarks ccm-cms ccm-cms-assets-fileattachment ccm-cms-assets-notes ccm-cms-assets-relatedlink ccm-cms-types-address ccm-cms-types-agenda ccm-cms-types-article ccm-cms-types-bookmark ccm-cms-types-contact ccm-cms-types-esdservice ccm-cms-types-event ccm-cms-types-faqitem ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem ccm-cms-types-glossaryitem ccm-cms-types-htmlform ccm-cms-types-inlinesite ccm-cms-types-job ccm-cms-types-legalnotice ccm-cms-types-minutes ccm-cms-types-motditem ccm-cms-types-mparticle ccm-cms-types-newsitem ccm-cms-types-organization ccm-cms-types-pressrelease ccm-cms-types-service ccm-cms-types-siteproxy ccm-core ccm-docmgr ccm-formbuilder-pdf ccm-forum ccm-ldn-aplaws ccm-ldn-atoz ccm-ldn-dublin ccm-ldn-exporter ccm-ldn-freeform ccm-ldn-image-step ccm-ldn-importer ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-terms ccm-l! dn-theme ccm-ldn-util ccm-ldn-xmlfeed ccm-simplesurvey ccm-user-preferences ccm-weblog ccm-webpage

From: <ap...@vh...> - 2006-10-04 16:35:47

Author: apevec
Date: 2006-10-04 18:26:48 +0200 (Wed, 04 Oct 2006)
New Revision: 1332

Modified:
   trunk/ccm-auth-http/application.xml
   trunk/ccm-bookmarks/application.xml
   trunk/ccm-cms-assets-fileattachment/application.xml
   trunk/ccm-cms-assets-notes/application.xml
   trunk/ccm-cms-assets-relatedlink/application.xml
   trunk/ccm-cms-types-address/application.xml
   trunk/ccm-cms-types-agenda/application.xml
   trunk/ccm-cms-types-article/application.xml
   trunk/ccm-cms-types-bookmark/application.xml
   trunk/ccm-cms-types-contact/application.xml
   trunk/ccm-cms-types-esdservice/application.xml
   trunk/ccm-cms-types-event/application.xml
   trunk/ccm-cms-types-faqitem/application.xml
   trunk/ccm-cms-types-filestorageitem/application.xml
   trunk/ccm-cms-types-formitem/application.xml
   trunk/ccm-cms-types-formsectionitem/application.xml
   trunk/ccm-cms-types-glossaryitem/application.xml
   trunk/ccm-cms-types-htmlform/application.xml
   trunk/ccm-cms-types-inlinesite/application.xml
   trunk/ccm-cms-types-job/application.xml
   trunk/ccm-cms-types-legalnotice/application.xml
   trunk/ccm-cms-types-minutes/application.xml
   trunk/ccm-cms-types-motditem/application.xml
   trunk/ccm-cms-types-mparticle/application.xml
   trunk/ccm-cms-types-newsitem/application.xml
   trunk/ccm-cms-types-organization/application.xml
   trunk/ccm-cms-types-pressrelease/application.xml
   trunk/ccm-cms-types-service/application.xml
   trunk/ccm-cms-types-siteproxy/application.xml
   trunk/ccm-cms/application.xml
   trunk/ccm-core/application.xml
   trunk/ccm-docmgr/application.xml
   trunk/ccm-formbuilder-pdf/application.xml
   trunk/ccm-forum/application.xml
   trunk/ccm-ldn-aplaws/application.xml
   trunk/ccm-ldn-atoz/application.xml
   trunk/ccm-ldn-dublin/application.xml
   trunk/ccm-ldn-exporter/application.xml
   trunk/ccm-ldn-freeform/application.xml
   trunk/ccm-ldn-image-step/application.xml
   trunk/ccm-ldn-importer/application.xml
   trunk/ccm-ldn-navigation/application.xml
   trunk/ccm-ldn-portal/application.xml
   trunk/ccm-ldn-rss/application.xml
   trunk/ccm-ldn-search/application.xml
   trunk/ccm-ldn-shortcuts/application.xml
   trunk/ccm-ldn-subsite/application.xml
   trunk/ccm-ldn-terms/application.xml
   trunk/ccm-ldn-theme/application.xml
   trunk/ccm-ldn-util/application.xml
   trunk/ccm-ldn-xmlfeed/application.xml
   trunk/ccm-simplesurvey/application.xml
   trunk/ccm-user-preferences/application.xml
   trunk/ccm-weblog/application.xml
   trunk/ccm-webpage/application.xml
Log:
bump internal version for APLAWS+ applications on trunk


Modified: trunk/ccm-auth-http/application.xml
===================================================================
--- trunk/ccm-auth-http/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-auth-http/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-auth-http"
   prettyName="Auth HTTP"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
   </ccm:dependencies>

Modified: trunk/ccm-bookmarks/application.xml
===================================================================
--- trunk/ccm-bookmarks/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-bookmarks/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-bookmarks"
-                 prettyName="Bookmarks"
-                 version="6.3.0"
-                 release="5"
-                 webapp="ROOT">
+  name="ccm-bookmarks"
+  prettyName="Bookmarks"
+  version="6.5.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
   </ccm:dependencies>

Modified: trunk/ccm-cms/application.xml
===================================================================
--- trunk/ccm-cms/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
-  version="6.3.2"
+  version="6.5.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: trunk/ccm-cms-assets-fileattachment/application.xml
===================================================================
--- trunk/ccm-cms-assets-fileattachment/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-assets-fileattachment/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-fileattachment"
   prettyName="Red Hat CMS Content Asset File Attachment"
-  version="6.3.1"
+  version="6.5.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: trunk/ccm-cms-assets-notes/application.xml
===================================================================
--- trunk/ccm-cms-assets-notes/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-assets-notes/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-notes"
   prettyName="Red Hat CMS Content Asset Notes"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-assets-relatedlink/application.xml
===================================================================
--- trunk/ccm-cms-assets-relatedlink/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-assets-relatedlink/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-relatedlink"
   prettyName="Red Hat CMS Content Asset Related Link"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-address/application.xml
===================================================================
--- trunk/ccm-cms-types-address/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-address/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-address"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-agenda/application.xml
===================================================================
--- trunk/ccm-cms-types-agenda/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-agenda/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-agenda"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-article/application.xml
===================================================================
--- trunk/ccm-cms-types-article/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-article/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-article"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-bookmark/application.xml
===================================================================
--- trunk/ccm-cms-types-bookmark/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-bookmark/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-bookmark"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-contact/application.xml
===================================================================
--- trunk/ccm-cms-types-contact/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-contact/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-contact"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-esdservice/application.xml
===================================================================
--- trunk/ccm-cms-types-esdservice/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-esdservice/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-esdservice"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-event/application.xml
===================================================================
--- trunk/ccm-cms-types-event/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-event/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-event"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-faqitem/application.xml
===================================================================
--- trunk/ccm-cms-types-faqitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-faqitem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-faqitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-filestorageitem/application.xml
===================================================================
--- trunk/ccm-cms-types-filestorageitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-filestorageitem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-filestorageitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-formitem/application.xml
===================================================================
--- trunk/ccm-cms-types-formitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-formitem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="4"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-formsectionitem/application.xml
===================================================================
--- trunk/ccm-cms-types-formsectionitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-formsectionitem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formsectionitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-glossaryitem/application.xml
===================================================================
--- trunk/ccm-cms-types-glossaryitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-glossaryitem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-glossaryitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-htmlform/application.xml
===================================================================
--- trunk/ccm-cms-types-htmlform/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-htmlform/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-htmlform"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-inlinesite/application.xml
===================================================================
--- trunk/ccm-cms-types-inlinesite/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-inlinesite/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-inlinesite"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-job/application.xml
===================================================================
--- trunk/ccm-cms-types-job/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-job/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-job"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-legalnotice/application.xml
===================================================================
--- trunk/ccm-cms-types-legalnotice/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-legalnotice/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-legalnotice"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-minutes/application.xml
===================================================================
--- trunk/ccm-cms-types-minutes/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-minutes/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-minutes"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-motditem/application.xml
===================================================================
--- trunk/ccm-cms-types-motditem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-motditem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-motditem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-mparticle/application.xml
===================================================================
--- trunk/ccm-cms-types-mparticle/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-mparticle/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-mparticle"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-newsitem/application.xml
===================================================================
--- trunk/ccm-cms-types-newsitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-newsitem/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-newsitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-organization/application.xml
===================================================================
--- trunk/ccm-cms-types-organization/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-organization/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-organization"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-pressrelease/application.xml
===================================================================
--- trunk/ccm-cms-types-pressrelease/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-pressrelease/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-pressrelease"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-service/application.xml
===================================================================
--- trunk/ccm-cms-types-service/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-service/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-service"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-cms-types-siteproxy/application.xml
===================================================================
--- trunk/ccm-cms-types-siteproxy/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-cms-types-siteproxy/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-siteproxy"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.1"
+  version="6.5.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: trunk/ccm-core/application.xml
===================================================================
--- trunk/ccm-core/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-core/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-core"
   prettyName="Core"
-  version="6.3.3"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: trunk/ccm-docmgr/application.xml
===================================================================
--- trunk/ccm-docmgr/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-docmgr/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-docmgr"
-                 prettyName="Document Manager"
-                 version="6.3.0"
-                 release="26"
-                 webapp="ROOT">
+  name="ccm-docmgr"
+  prettyName="Document Manager"
+  version="6.5.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>

Modified: trunk/ccm-formbuilder-pdf/application.xml
===================================================================
--- trunk/ccm-formbuilder-pdf/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-formbuilder-pdf/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-formbuilder-pdf"
   prettyName="PDFConverter"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
 
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-forum/application.xml
===================================================================
--- trunk/ccm-forum/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-forum/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-forum"
   prettyName="Forum"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-aplaws/application.xml
===================================================================
--- trunk/ccm-ldn-aplaws/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-aplaws/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-aplaws"
   prettyName="APLAWS"
-  version="6.3.1"
+  version="6.5.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: trunk/ccm-ldn-atoz/application.xml
===================================================================
--- trunk/ccm-ldn-atoz/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-atoz/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-atoz"
   prettyName="A-Z"
-  version="6.3.1"
+  version="6.5.0"
   release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-dublin/application.xml
===================================================================
--- trunk/ccm-ldn-dublin/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-dublin/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-dublin"
   prettyName="Dublin Core"
-  version="6.3.1"
+  version="6.5.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: trunk/ccm-ldn-exporter/application.xml
===================================================================
--- trunk/ccm-ldn-exporter/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-exporter/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-exporter"
   prettyName="exporter"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:directories>
     <ccm:directory name="src"/>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-ldn-freeform/application.xml
===================================================================
--- trunk/ccm-ldn-freeform/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-freeform/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-freeform"
   prettyName="Freeform"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-image-step/application.xml
===================================================================
--- trunk/ccm-ldn-image-step/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-image-step/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-image-step"
   prettyName="Image step"
-  version="6.3.0"
-  release="7"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-importer/application.xml
===================================================================
--- trunk/ccm-ldn-importer/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-importer/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-importer"
   prettyName="Importer"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-navigation/application.xml
===================================================================
--- trunk/ccm-ldn-navigation/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-navigation/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-navigation"
   prettyName="Navigation"
-  version="6.3.0"
-  release="7"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-portal/application.xml
===================================================================
--- trunk/ccm-ldn-portal/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-portal/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-portal"
   prettyName="Portal"
-  version="6.3.2"
+  version="6.5.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: trunk/ccm-ldn-rss/application.xml
===================================================================
--- trunk/ccm-ldn-rss/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-rss/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-rss"
   prettyName="RSS"
-  version="6.3.0"
-  release="5">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-search/application.xml
===================================================================
--- trunk/ccm-ldn-search/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-search/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-search"
   prettyName="Search"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-shortcuts/application.xml
===================================================================
--- trunk/ccm-ldn-shortcuts/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-shortcuts/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-shortcuts"
   prettyName="Shortcuts"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
   </ccm:dependencies>

Modified: trunk/ccm-ldn-subsite/application.xml
===================================================================
--- trunk/ccm-ldn-subsite/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-subsite/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-subsite"
   prettyName="Subsite"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-terms/application.xml
===================================================================
--- trunk/ccm-ldn-terms/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-terms/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-terms"
   prettyName="Terms"
-  version="6.3.1"
-  release="2">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.3" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-theme/application.xml
===================================================================
--- trunk/ccm-ldn-theme/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-theme/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-theme"
   prettyName="Theme"
-  version="6.3.1"
-  release="4">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-util/application.xml
===================================================================
--- trunk/ccm-ldn-util/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-util/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-util"
   prettyName="Util"
-  version="6.3.0"
-  release="5">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-xmlfeed/application.xml
===================================================================
--- trunk/ccm-ldn-xmlfeed/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-ldn-xmlfeed/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-xmlfeed"
   prettyName="XML Feed"
-  version="6.3.0"
-  release="3"
+  version="6.5.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-simplesurvey/application.xml
===================================================================
--- trunk/ccm-simplesurvey/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-simplesurvey/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-simplesurvey"
   prettyName="Core"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-user-preferences/application.xml
===================================================================
--- trunk/ccm-user-preferences/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-user-preferences/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-user-preferences"
   prettyName="User Preferences"
-  version="6.3.0"
-  release="3">
+  version="6.5.0"
+  release="1">
 
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-weblog/application.xml
===================================================================
--- trunk/ccm-weblog/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-weblog/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-weblog"
-                 prettyName="Weblog"
-                 version="6.3.0"
-                 release="3"
-                 webapp="ROOT">
+  name="ccm-weblog"
+  prettyName="Weblog"
+  version="6.5.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
   </ccm:dependencies>

Modified: trunk/ccm-webpage/application.xml
===================================================================
--- trunk/ccm-webpage/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
+++ trunk/ccm-webpage/application.xml	2006-10-04 16:26:48 UTC (rev 1332)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-webpage"
-                 prettyName="Webpage"
-                 version="6.3.0"
-                 release="11"
-                 webapp="ROOT">
+  name="ccm-webpage"
+  prettyName="Webpage"
+  version="6.5.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.3.0" relation="ge"/>

[Aplaws-commit] r1331 - in releases/1.0.4: ccm-auth-http ccm-bookmarks ccm-cms ccm-cms-assets-fileattachment ccm-cms-assets-notes ccm-cms-assets-relatedlink ccm-cms-types-address ccm-cms-types-agenda ccm-cms-types-article ccm-cms-types-bookmark ccm-cms-types-contact ccm-cms-types-esdservice ccm-cms-types-event ccm-cms-types-faqitem ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem ccm-cms-types-glossaryitem ccm-cms-types-htmlform ccm-cms-types-inlinesite ccm-cms-types-job ccm-cms-types-legalnotice ccm-cms-types-minutes ccm-cms-types-motditem ccm-cms-types-mparticle ccm-cms-types-newsitem ccm-cms-types-organization ccm-cms-types-pressrelease ccm-cms-types-service ccm-cms-types-siteproxy ccm-core ccm-docmgr ccm-formbuilder-pdf ccm-forum ccm-ldn-aplaws ccm-ldn-atoz ccm-ldn-dublin ccm-ldn-exporter ccm-ldn-freeform ccm-ldn-image-step ccm-ldn-importer ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite ccm-ldn-te! rms ccm-ldn-theme ccm-ldn-util ccm-ldn-xmlfeed ccm-simplesurvey ccm-user-preferences ccm-weblog ccm-webpage

From: <ap...@vh...> - 2006-10-04 16:34:53

Author: apevec
Date: 2006-10-04 18:25:53 +0200 (Wed, 04 Oct 2006)
New Revision: 1331

Modified:
   releases/1.0.4/ccm-auth-http/application.xml
   releases/1.0.4/ccm-bookmarks/application.xml
   releases/1.0.4/ccm-cms-assets-fileattachment/application.xml
   releases/1.0.4/ccm-cms-assets-notes/application.xml
   releases/1.0.4/ccm-cms-assets-relatedlink/application.xml
   releases/1.0.4/ccm-cms-types-address/application.xml
   releases/1.0.4/ccm-cms-types-agenda/application.xml
   releases/1.0.4/ccm-cms-types-article/application.xml
   releases/1.0.4/ccm-cms-types-bookmark/application.xml
   releases/1.0.4/ccm-cms-types-contact/application.xml
   releases/1.0.4/ccm-cms-types-esdservice/application.xml
   releases/1.0.4/ccm-cms-types-event/application.xml
   releases/1.0.4/ccm-cms-types-faqitem/application.xml
   releases/1.0.4/ccm-cms-types-filestorageitem/application.xml
   releases/1.0.4/ccm-cms-types-formitem/application.xml
   releases/1.0.4/ccm-cms-types-formsectionitem/application.xml
   releases/1.0.4/ccm-cms-types-glossaryitem/application.xml
   releases/1.0.4/ccm-cms-types-htmlform/application.xml
   releases/1.0.4/ccm-cms-types-inlinesite/application.xml
   releases/1.0.4/ccm-cms-types-job/application.xml
   releases/1.0.4/ccm-cms-types-legalnotice/application.xml
   releases/1.0.4/ccm-cms-types-minutes/application.xml
   releases/1.0.4/ccm-cms-types-motditem/application.xml
   releases/1.0.4/ccm-cms-types-mparticle/application.xml
   releases/1.0.4/ccm-cms-types-newsitem/application.xml
   releases/1.0.4/ccm-cms-types-organization/application.xml
   releases/1.0.4/ccm-cms-types-pressrelease/application.xml
   releases/1.0.4/ccm-cms-types-service/application.xml
   releases/1.0.4/ccm-cms-types-siteproxy/application.xml
   releases/1.0.4/ccm-cms/application.xml
   releases/1.0.4/ccm-core/application.xml
   releases/1.0.4/ccm-docmgr/application.xml
   releases/1.0.4/ccm-formbuilder-pdf/application.xml
   releases/1.0.4/ccm-forum/application.xml
   releases/1.0.4/ccm-ldn-aplaws/application.xml
   releases/1.0.4/ccm-ldn-atoz/application.xml
   releases/1.0.4/ccm-ldn-dublin/application.xml
   releases/1.0.4/ccm-ldn-exporter/application.xml
   releases/1.0.4/ccm-ldn-freeform/application.xml
   releases/1.0.4/ccm-ldn-image-step/application.xml
   releases/1.0.4/ccm-ldn-importer/application.xml
   releases/1.0.4/ccm-ldn-navigation/application.xml
   releases/1.0.4/ccm-ldn-portal/application.xml
   releases/1.0.4/ccm-ldn-rss/application.xml
   releases/1.0.4/ccm-ldn-search/application.xml
   releases/1.0.4/ccm-ldn-shortcuts/application.xml
   releases/1.0.4/ccm-ldn-subsite/application.xml
   releases/1.0.4/ccm-ldn-terms/application.xml
   releases/1.0.4/ccm-ldn-theme/application.xml
   releases/1.0.4/ccm-ldn-util/application.xml
   releases/1.0.4/ccm-ldn-xmlfeed/application.xml
   releases/1.0.4/ccm-simplesurvey/application.xml
   releases/1.0.4/ccm-user-preferences/application.xml
   releases/1.0.4/ccm-weblog/application.xml
   releases/1.0.4/ccm-webpage/application.xml
Log:
internal version for APLAWS+ 1.0.4 release is 6.4.0


Modified: releases/1.0.4/ccm-auth-http/application.xml
===================================================================
--- releases/1.0.4/ccm-auth-http/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-auth-http/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-auth-http"
   prettyName="Auth HTTP"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
   </ccm:dependencies>

Modified: releases/1.0.4/ccm-bookmarks/application.xml
===================================================================
--- releases/1.0.4/ccm-bookmarks/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-bookmarks/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-bookmarks"
-                 prettyName="Bookmarks"
-                 version="6.3.0"
-                 release="5"
-                 webapp="ROOT">
+  name="ccm-bookmarks"
+  prettyName="Bookmarks"
+  version="6.4.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
   </ccm:dependencies>

Modified: releases/1.0.4/ccm-cms/application.xml
===================================================================
--- releases/1.0.4/ccm-cms/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
-  version="6.3.2"
+  version="6.4.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-cms-assets-fileattachment/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-assets-fileattachment/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-assets-fileattachment/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-fileattachment"
   prettyName="Red Hat CMS Content Asset File Attachment"
-  version="6.3.1"
+  version="6.4.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-cms-assets-notes/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-assets-notes/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-assets-notes/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-notes"
   prettyName="Red Hat CMS Content Asset Notes"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-assets-relatedlink/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-assets-relatedlink/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-assets-relatedlink/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-relatedlink"
   prettyName="Red Hat CMS Content Asset Related Link"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-address/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-address/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-address/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-address"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-agenda/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-agenda/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-agenda/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-agenda"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-article/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-article/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-article/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-article"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-bookmark/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-bookmark/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-bookmark/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-bookmark"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-contact/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-contact/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-contact/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-contact"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-esdservice/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-esdservice/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-esdservice/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-esdservice"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-event/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-event/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-event/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-event"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-faqitem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-faqitem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-faqitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-faqitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-filestorageitem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-filestorageitem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-filestorageitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-filestorageitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-formitem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-formitem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-formitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="4"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-formsectionitem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-formsectionitem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-formsectionitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formsectionitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-glossaryitem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-glossaryitem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-glossaryitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-glossaryitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-htmlform/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-htmlform/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-htmlform/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-htmlform"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-inlinesite/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-inlinesite/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-inlinesite/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-inlinesite"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-job/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-job/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-job/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-job"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-legalnotice/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-legalnotice/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-legalnotice/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-legalnotice"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-minutes/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-minutes/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-minutes/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-minutes"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-motditem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-motditem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-motditem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-motditem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-mparticle/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-mparticle/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-mparticle/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-mparticle"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-newsitem/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-newsitem/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-newsitem/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-newsitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-organization/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-organization/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-organization/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-organization"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-pressrelease/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-pressrelease/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-pressrelease/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-pressrelease"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-service/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-service/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-service/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-service"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-cms-types-siteproxy/application.xml
===================================================================
--- releases/1.0.4/ccm-cms-types-siteproxy/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-cms-types-siteproxy/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-siteproxy"
   prettyName="Red Hat CCM Content Types"
-  version="6.3.1"
+  version="6.4.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-core/application.xml
===================================================================
--- releases/1.0.4/ccm-core/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-core/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-core"
   prettyName="Core"
-  version="6.3.3"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-docmgr/application.xml
===================================================================
--- releases/1.0.4/ccm-docmgr/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-docmgr/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-docmgr"
-                 prettyName="Document Manager"
-                 version="6.3.0"
-                 release="26"
-                 webapp="ROOT">
+  name="ccm-docmgr"
+  prettyName="Document Manager"
+  version="6.4.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>

Modified: releases/1.0.4/ccm-formbuilder-pdf/application.xml
===================================================================
--- releases/1.0.4/ccm-formbuilder-pdf/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-formbuilder-pdf/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-formbuilder-pdf"
   prettyName="PDFConverter"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
 
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-forum/application.xml
===================================================================
--- releases/1.0.4/ccm-forum/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-forum/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-forum"
   prettyName="Forum"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-aplaws/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-aplaws/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-aplaws/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-aplaws"
   prettyName="APLAWS"
-  version="6.3.1"
+  version="6.4.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-ldn-atoz/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-atoz/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-atoz/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-atoz"
   prettyName="A-Z"
-  version="6.3.1"
+  version="6.4.0"
   release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-dublin/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-dublin/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-dublin/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-dublin"
   prettyName="Dublin Core"
-  version="6.3.1"
+  version="6.4.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-ldn-exporter/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-exporter/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-exporter/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-exporter"
   prettyName="exporter"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:directories>
     <ccm:directory name="src"/>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.4/ccm-ldn-freeform/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-freeform/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-freeform/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-freeform"
   prettyName="Freeform"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-image-step/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-image-step/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-image-step/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-image-step"
   prettyName="Image step"
-  version="6.3.0"
-  release="7"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-importer/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-importer/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-importer/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-importer"
   prettyName="Importer"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-navigation/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-navigation/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-navigation"
   prettyName="Navigation"
-  version="6.3.0"
-  release="7"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-portal/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-portal/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-portal/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-portal"
   prettyName="Portal"
-  version="6.3.2"
+  version="6.4.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>

Modified: releases/1.0.4/ccm-ldn-rss/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-rss/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-rss/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-rss"
   prettyName="RSS"
-  version="6.3.0"
-  release="5">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-search/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-search/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-search/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-search"
   prettyName="Search"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-shortcuts/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-shortcuts/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-shortcuts/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-shortcuts"
   prettyName="Shortcuts"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
   </ccm:dependencies>

Modified: releases/1.0.4/ccm-ldn-subsite/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-subsite/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-subsite/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-subsite"
   prettyName="Subsite"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-terms/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-terms/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-terms/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-terms"
   prettyName="Terms"
-  version="6.3.1"
-  release="2">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.3" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-theme/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-theme/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-theme/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-theme"
   prettyName="Theme"
-  version="6.3.1"
-  release="4">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-util/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-util/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-util/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-util"
   prettyName="Util"
-  version="6.3.0"
-  release="5">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-ldn-xmlfeed/application.xml
===================================================================
--- releases/1.0.4/ccm-ldn-xmlfeed/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-ldn-xmlfeed/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-xmlfeed"
   prettyName="XML Feed"
-  version="6.3.0"
-  release="3"
+  version="6.4.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-simplesurvey/application.xml
===================================================================
--- releases/1.0.4/ccm-simplesurvey/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-simplesurvey/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-simplesurvey"
   prettyName="Core"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-user-preferences/application.xml
===================================================================
--- releases/1.0.4/ccm-user-preferences/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-user-preferences/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-user-preferences"
   prettyName="User Preferences"
-  version="6.3.0"
-  release="3">
+  version="6.4.0"
+  release="1">
 
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: releases/1.0.4/ccm-weblog/application.xml
===================================================================
--- releases/1.0.4/ccm-weblog/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-weblog/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-weblog"
-                 prettyName="Weblog"
-                 version="6.3.0"
-                 release="3"
-                 webapp="ROOT">
+  name="ccm-weblog"
+  prettyName="Weblog"
+  version="6.4.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
   </ccm:dependencies>

Modified: releases/1.0.4/ccm-webpage/application.xml
===================================================================
--- releases/1.0.4/ccm-webpage/application.xml	2006-10-04 11:28:46 UTC (rev 1330)
+++ releases/1.0.4/ccm-webpage/application.xml	2006-10-04 16:25:53 UTC (rev 1331)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-webpage"
-                 prettyName="Webpage"
-                 version="6.3.0"
-                 release="11"
-                 webapp="ROOT">
+  name="ccm-webpage"
+  prettyName="Webpage"
+  version="6.4.0"
+  release="1"
+  webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.3.0" relation="ge"/>

[Aplaws-commit] r1330 - releases

From: <ap...@vh...> - 2006-10-04 11:37:34

Author: apevec
Date: 2006-10-04 13:28:46 +0200 (Wed, 04 Oct 2006)
New Revision: 1330

Added:
   releases/1.0.4/
Log:
APLAWS+ 1.0.4 release branch


Copied: releases/1.0.4 (from rev 1329, trunk)

[Aplaws-commit] r1329 - trunk/ccm-ldn-aplaws/src/WEB-INF/resources

From: <ap...@vh...> - 2006-10-04 10:04:01

Author: apevec
Date: 2006-10-04 11:55:11 +0200 (Wed, 04 Oct 2006)
New Revision: 1329

Modified:
   trunk/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
Log:
addition for the Mandalay theme


Modified: trunk/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
===================================================================
--- trunk/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt	2006-09-27 11:53:40 UTC (rev 1328)
+++ trunk/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt	2006-10-04 09:55:11 UTC (rev 1329)
@@ -10,6 +10,10 @@
 # Grabs custom item xsl for CMS
 http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
 
+# added by Quasimodo
+# Theme with single entry point (e.g Mandalay)
+http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/start.xsl
+
 # Theme, with optional locale & prefix
 http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ccm-ldn-theme/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl

[Aplaws-commit] r1328 - in trunk: ccm-cms/src/com/arsdigita/cms ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui

From: <ap...@vh...> - 2006-09-27 12:02:15

Author: apevec
Date: 2006-09-27 13:53:40 +0200 (Wed, 27 Sep 2006)
New Revision: 1328

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
   trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java
Log:
hotfix: usage of extraXMLgenerators on multiple pages, store Class references
generators need to be recreated for each bebop page


Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java	2006-09-27 11:47:05 UTC (rev 1327)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java	2006-09-27 11:53:40 UTC (rev 1328)
@@ -18,9 +18,19 @@
  */
 package com.arsdigita.cms;
 
-import com.arsdigita.bebop.form.DHTMLEditor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
 import com.arsdigita.bebop.SimpleComponent;
-import com.arsdigita.cms.ExtraXMLGenerator;
+import com.arsdigita.bebop.form.DHTMLEditor;
 import com.arsdigita.cms.dispatcher.DefaultTemplateResolver;
 import com.arsdigita.cms.dispatcher.ItemResolver;
 import com.arsdigita.cms.dispatcher.MultilingualItemResolver;
@@ -31,27 +41,17 @@
 import com.arsdigita.cms.ui.authoring.ItemCategoryExtension;
 import com.arsdigita.cms.ui.authoring.ItemCategoryForm;
 import com.arsdigita.runtime.AbstractConfig;
+import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.util.parameter.BooleanParameter;
+import com.arsdigita.util.parameter.ClassParameter;
 import com.arsdigita.util.parameter.ErrorList;
 import com.arsdigita.util.parameter.IntegerParameter;
 import com.arsdigita.util.parameter.Parameter;
 import com.arsdigita.util.parameter.ParameterError;
-import com.arsdigita.util.parameter.ClassParameter;
-import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.util.parameter.StringArrayParameter;
+import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.util.parameter.URLParameter;
-import com.arsdigita.util.UncheckedWrapperException;
 
-import org.apache.log4j.Logger;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 /**
  * A record containing server-session scoped configuration properties.
  *
@@ -504,26 +504,22 @@
 
 
     protected static HashMap extraXMLGenerators = new HashMap();
-    protected static List allExtraXMLGenerators = new ArrayList();
 
     /** Add one ExtraXMLGenerator to the list. */
     public static void registerExtraXMLGenerator(String type, ExtraXMLGenerator gen) {
         List gens = (List) extraXMLGenerators.get(type);
         if (gens == null) {
-            gens = new ArrayList();
+            gens = new LinkedList();
             extraXMLGenerators.put(type, gens);
         }
-        gens.add(gen);
-        allExtraXMLGenerators.add(gen);
+        // Store class reference so it can be recreated for each page.
+        // This requires a fix to all components using extraXMLGenerators,
+        // for example see the currently only one in core/cms: GreetingItemExtraXML 
+        gens.add(gen.getClass()); // XXX assumes default ctor
     }
 
-    /** Get the list of all ExtraXMLGenerators. */
-    public static List getExtraXMLGenerators() {
-        return allExtraXMLGenerators;
+    /** Get the iterator of ExtraXMLGenerators. */
+    public static Iterator getExtraXMLGeneratorsIterator() {
+        return extraXMLGenerators.entrySet().iterator();
     }
-
-    /** Get the list of ExtraXMLGenerators for a type. Could be null. */
-    public static List getExtraXMLGenerators(String type) {
-        return (List) extraXMLGenerators.get(type);
-    }
 }

Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java	2006-09-27 11:47:05 UTC (rev 1327)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java	2006-09-27 11:53:40 UTC (rev 1328)
@@ -4,24 +4,26 @@
 
 package com.arsdigita.london.navigation.ui;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentSectionConfig;
-import com.arsdigita.cms.ContentType;
-import com.arsdigita.cms.ContentTypeCollection;
 import com.arsdigita.cms.ExtraXMLGenerator;
 import com.arsdigita.london.navigation.Navigation;
 import com.arsdigita.xml.Element;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
 /**
  * GreetingItemExtraXML generates the extra XML which is not included in the standard
  * cms:item element.
@@ -34,21 +36,30 @@
     private static final Logger s_log = Logger.getLogger(GreetingItemExtraXML.class);
 
     public static final String extraTag = "greetingItemExtraXML";
-    public static final String extraMethodName = "getExtraXMLGenerators";
-    public static final Class[] extraMethodParameters = new Class[] {};
+    
+    Map xmlGenerators = new HashMap();
 
     public void register(Page p) {
         super.register(p);
         
-        List generators = ContentSectionConfig.getExtraXMLGenerators();
-        ExtraXMLGenerator gen;
-
-        for (int i=0; i<generators.size(); i++) {
-            gen =(ExtraXMLGenerator) generators.get(i);
-            if (s_log.isDebugEnabled()) {
-                s_log.debug("Adding parameters for generator : "+gen);
+        for (Iterator i=ContentSectionConfig.getExtraXMLGeneratorsIterator(); i.hasNext(); ) {
+            Map.Entry e = (Map.Entry) i.next();
+            String type = (String) e.getKey();
+            List genClasses = (List) e.getValue();
+            List genInstances = new LinkedList();
+            for (Iterator genClassesIterator=genClasses.iterator(); genClassesIterator.hasNext(); ) {
+                try {
+                    ExtraXMLGenerator gen =(ExtraXMLGenerator) ((Class)genClassesIterator.next()).newInstance();
+                    if (s_log.isDebugEnabled()) {
+                        s_log.debug("Adding parameters for generator : "+gen);
+                    }
+                    gen.addGlobalStateParams(p);
+                    genInstances.add(gen);
+                } catch (Exception exc) {
+                    s_log.warn("getting ExtraXMLGenerator failed:", exc);
+                }
             }
-            gen.addGlobalStateParams(p);
+            xmlGenerators.put(type, genInstances);
         }
     }
 
@@ -61,7 +72,7 @@
             return null;
         }
 
-        List generators = ContentSectionConfig.getExtraXMLGenerators(item.getClass().getName());
+        List generators = (List) xmlGenerators.get(item.getClass().getName());
 
         if (s_log.isDebugEnabled()) {
             s_log.debug("Item : "+item.getName()+", type : "+item.BASE_DATA_OBJECT_TYPE+", no generators : "+(generators == null ? "null" : ""+generators.size()));
@@ -73,9 +84,8 @@
 
         Element content = Navigation.newElement(extraTag);
         PageState state = PageState.getPageState(request);
-        ExtraXMLGenerator generator;
-        for (int i=0; i<generators.size(); i++) {
-            generator = (ExtraXMLGenerator) generators.get(i);
+        for (Iterator i=generators.iterator(); i.hasNext(); ) {
+            ExtraXMLGenerator generator = (ExtraXMLGenerator) i.next();
             if (s_log.isDebugEnabled()) {
                 s_log.debug("Calling generator : "+generator);
             }

[Aplaws-commit] r1327 - trunk/ccm-cms/src/com/arsdigita/cms/ui/category

From: <ssk...@vh...> - 2006-09-27 11:55:48

Author: sskracic
Date: 2006-09-27 13:47:05 +0200 (Wed, 27 Sep 2006)
New Revision: 1327

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java
Log:
  Removed excess (and misleading) logging, 'view item' link properly encoded.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java	2006-09-25 18:12:16 UTC (rev 1326)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java	2006-09-27 11:47:05 UTC (rev 1327)
@@ -59,6 +59,7 @@
 import com.arsdigita.web.Web;
 
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -98,7 +99,7 @@
         add(m_detailPane);
         setDefault(m_detailPane);
 
-        final ActionLink orderItemsLink = 
+        final ActionLink orderItemsLink =
             new ActionLink(new Label(gz("cms.ui.category.categorized_objects"))) {
                 public boolean isVisible(PageState state) {
                     // update for live items only
@@ -116,18 +117,18 @@
 
 
         final Form orderItemsForm = new OrderItemsForm(m_category);
-		final Form orderItemsForm2 = new OrderItemsForm(m_category);
+        final Form orderItemsForm2 = new OrderItemsForm(m_category);
         add(orderItemsForm);
-		add(orderItemsForm2);
+        add(orderItemsForm2);
 
         final ActionLink indexLink = new ActionLink(new Label(gz("cms.ui.category.change_index_item")));
         final Form indexForm = new IndexItemSelectionForm(m_category);
         add(indexForm);
 
-		ViewItemLink viewIndexLink = new ViewItemLink(new Label(gz("cms.ui.category.view_index_item")),""); 
-		EditItemLink editIndexLink = new EditItemLink(new Label(gz("cms.ui.category.edit_index_item")),"");
+        ViewItemLink viewIndexLink = new ViewItemLink(new Label(gz("cms.ui.category.view_index_item")),"");
+        EditItemLink editIndexLink = new EditItemLink(new Label(gz("cms.ui.category.edit_index_item")),"");
 
-		m_detailPane.add(new SummarySection(editLink, deleteLink, indexLink, viewIndexLink, editIndexLink, orderItemsLink));
+        m_detailPane.add(new SummarySection(editLink, deleteLink, indexLink, viewIndexLink, editIndexLink, orderItemsLink));
         m_detailPane.add(new SubcategorySection(addLink));
 
         // Linked categories
@@ -192,18 +193,18 @@
             group.addAction(new EditVisible(editLink), ActionGroup.EDIT);
             group.addAction(new EditVisible(orderItemsLink));
             group.addAction(new EditVisible(indexLink));
-			group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE);
-		}
+            group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE);
+        }
 
-    	/*
-    	 * This alternative constructor sets two additional links, allowing the user to view and 
-    	 * edit the content index item.
-    	 */
+        /*
+         * This alternative constructor sets two additional links, allowing the user to view and
+         * edit the content index item.
+         */
         SummarySection(final ActionLink editLink,
                        final ActionLink deleteLink,
                        final ActionLink indexLink,
-					   final BaseLink viewIndexItem,
-					   final BaseLink editIndexItem,
+                       final BaseLink viewIndexItem,
+                       final BaseLink editIndexItem,
                        final ActionLink orderItemsLink) {
             setHeading(new Label(gz("cms.ui.category.details")));
 
@@ -215,8 +216,8 @@
             group.addAction(new EditVisible(editLink), ActionGroup.EDIT);
             group.addAction(new EditVisible(orderItemsLink));
             group.addAction(new EditVisible(indexLink));
-			group.addAction(new EditVisible(viewIndexItem));
-			group.addAction(new EditVisible(editIndexItem));
+            group.addAction(new EditVisible(viewIndexItem));
+            group.addAction(new EditVisible(editIndexItem));
             group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE);
         }
 
@@ -283,7 +284,6 @@
     }
 
     private class CategoryTemplateSection extends Section {
-        //CategoryTemplateSection(final ActionLink link) {
         CategoryTemplateSection() {
             setHeading(new Label(gz("cms.ui.category.templates")));
 
@@ -409,7 +409,7 @@
             header.setFontWeight(Label.BOLD);
             add(header);
             add(new CategorizedObjectsList(category));
-            
+
             add(new Submit("Done"));
 
         }
@@ -420,87 +420,84 @@
      * This private class creates a link to the index item for a category.
      */
     private class ViewItemLink extends Link {
-    	ViewItemLink(Component c, String s) {
-    		super(c,s);
-    	}
-    	
-		// Build the preview link.  This uses a standard redirect link to find the content.
-		// The prepareURL method is called by the printwriter
-		protected String prepareURL(final PageState state, String location) {
-			s_log.error("Have entered the prepareURL method");
+        ViewItemLink(Component c, String s) {
+            super(c,s);
+        }
 
-			ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state).getDirectIndexObject())).getPrimaryInstance();
-			if(indexItem==null) {
-				return "";
-			} else {
-				return "/redirect/?oid=["+indexItem.getClass().getName()+":{id="+indexItem.getID()+"}]";
-			}
-		}
+        // Build the preview link.  This uses a standard redirect link to find the content.
+        // The prepareURL method is called by the printwriter
+        protected String prepareURL(final PageState state, String location) {
 
-		// We only show this link when an index item exists for this category				
-		public boolean isVisible(PageState state) {
-			if (!super.isVisible(state)) {
-				return false;
-			}
-			ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject();
-			if(indexItem==null) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-	};
+            ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state).getDirectIndexObject())).getPrimaryInstance();
+            if(indexItem==null) {
+                return "";
+            } else {
+                return "/redirect/?oid=" + URLEncoder.encode(indexItem.getOID().toString());
+            }
+        }
 
-	private class EditItemLink extends Link {
-		EditItemLink(Component c, String s) {
-			super(c,s);
-		}
-		
-		// Build the preview link.  This is based on code in the ContentSoonExpiredPane class.
-		// The prepareURL method of the parent is overwritten.  This method is called by the printwriter
-		protected String prepareURL(final PageState state, String location) {
-			boolean canEdit = false;
-			ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state).getDirectIndexObject())).getPrimaryInstance();
-			if(indexItem==null) {
-				return "";
-			}
-			if (!isItemEditable(indexItem,state)) {
-				return "";
-			} else {
-				BigDecimal draftID = indexItem.getDraftVersion().getID();
-				StringBuffer url = new StringBuffer();
-				url.append("item.jsp").append("?").append("item_id").append("=").append(draftID.toString()).append("&").append("set_tab").append("=").append(ContentItemPage.AUTHORING_TAB).append("&");
-				return url.toString();
-			}
-		}					
-			
-		// We only show this link when an index item exists for this category and
-		// the user is allowed to edit this item.				
-		public boolean isVisible(PageState state) {
-			if (!super.isVisible(state)) {
-				return false;
-			}
-			ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject();
-			if(indexItem==null) {
-				return false;
-			} else {
-				return isItemEditable((ContentItem)indexItem,state);
-			}
-		}
-		
-		// This method checks whether a usern is allowed to edit a particular item
-		private boolean isItemEditable(ContentItem item, PageState state) {
-			BigDecimal id = item.getID();
-			User user = Web.getContext().getUser();
-			ContentItem ci = new ContentItem(new OID(ContentItem.class.getName(), Integer.parseInt(id.toString())));
-			Iterator permissions = PermissionService.getImpliedPrivileges(ci.getOID(), user.getOID()); 
-			while (permissions.hasNext()) {
-				PrivilegeDescriptor permission = (PrivilegeDescriptor)permissions.next();
-				if (permission.equals(PrivilegeDescriptor.ADMIN) || permission.equals(PrivilegeDescriptor.EDIT)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	};
+        // We only show this link when an index item exists for this category
+        public boolean isVisible(PageState state) {
+            if (!super.isVisible(state)) {
+                return false;
+            }
+            ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject();
+            if(indexItem==null) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+    };
+
+    private class EditItemLink extends Link {
+        EditItemLink(Component c, String s) {
+            super(c,s);
+        }
+
+        // Build the preview link.  This is based on code in the ContentSoonExpiredPane class.
+        // The prepareURL method of the parent is overwritten.  This method is called by the printwriter
+        protected String prepareURL(final PageState state, String location) {
+            boolean canEdit = false;
+            ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state).getDirectIndexObject())).getPrimaryInstance();
+            if(indexItem==null) {
+                return "";
+            }
+            if (!isItemEditable(indexItem,state)) {
+                return "";
+            } else {
+                BigDecimal draftID = indexItem.getDraftVersion().getID();
+                return "item.jsp?item_id=" + draftID + "&set_tab=" + ContentItemPage.AUTHORING_TAB;
+            }
+        }
+
+        // We only show this link when an index item exists for this category and
+        // the user is allowed to edit this item.
+        public boolean isVisible(PageState state) {
+            if (!super.isVisible(state)) {
+                return false;
+            }
+            ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject();
+            if(indexItem==null) {
+                return false;
+            } else {
+                return isItemEditable((ContentItem)indexItem,state);
+            }
+        }
+
+        // This method checks whether a usern is allowed to edit a particular item
+        private boolean isItemEditable(ContentItem item, PageState state) {
+            BigDecimal id = item.getID();
+            User user = Web.getContext().getUser();
+            ContentItem ci = new ContentItem(new OID(ContentItem.class.getName(), Integer.parseInt(id.toString())));
+            Iterator permissions = PermissionService.getImpliedPrivileges(ci.getOID(), user.getOID());
+            while (permissions.hasNext()) {
+                PrivilegeDescriptor permission = (PrivilegeDescriptor)permissions.next();
+                if (permission.equals(PrivilegeDescriptor.ADMIN) || permission.equals(PrivilegeDescriptor.EDIT)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    };
 }

[Aplaws-commit] r1326 - trunk/ccm-cms/src/com/arsdigita/cms/dispatcher

From: <ap...@vh...> - 2006-09-25 18:20:45

Author: apevec
Date: 2006-09-25 20:12:16 +0200 (Mon, 25 Sep 2006)
New Revision: 1326

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
Log:
avoid NPE


Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java	2006-09-25 08:10:48 UTC (rev 1325)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java	2006-09-25 18:12:16 UTC (rev 1326)
@@ -105,11 +105,11 @@
         }
 
         // PDFs need to be cached for a different amount of time to avoid issues with IE6 - see ticket #20266
-        if (mimeType.getMimeType().equals("application/pdf")) {
+        if (mimeType != null && mimeType.getMimeType().equals("application/pdf")) {
             DispatcherHelper.cacheForWorld(response,30);
         } else {
-        	// Default caching for all other types
-        DispatcherHelper.cacheForWorld(response);
+            // Default caching for all other types
+            DispatcherHelper.cacheForWorld(response);
         }
     }

[Aplaws-commit] r1325 - trunk/ccm-core/src/com/redhat/persistence/engine/rdbms

From: <ssk...@vh...> - 2006-09-25 08:19:20

Author: sskracic
Date: 2006-09-25 10:10:48 +0200 (Mon, 25 Sep 2006)
New Revision: 1325

Modified:
   trunk/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java
Log:
  No need to serialize objects unless we want to actually display the
result in log.


Modified: trunk/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java
===================================================================
--- trunk/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java	2006-09-22 08:26:24 UTC (rev 1324)
+++ trunk/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java	2006-09-25 08:10:48 UTC (rev 1325)
@@ -172,10 +172,14 @@
     }
 
     void removeUpdates(Object obj) {
-        LOG.debug("Removing updates for: " + obj);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Removing updates for: " + obj);
+        }
         ArrayList ops = (ArrayList) m_operationMap.get(obj);
         if (ops != null) {
-            LOG.debug("found: " + ops);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("found: " + ops);
+            }
             for (Iterator it = ops.iterator(); it.hasNext(); ) {
                 Operation op = (Operation) it.next();
         	if (op instanceof DML) {
@@ -358,8 +362,10 @@
                     }
                     for (int i = ops; i < m_operations.size(); i++) {
                         Operation op = (Operation) m_operations.get(i);
-                        LOG.debug("GENERATED: " + op);
-                        LOG.debug("ENV: " + op.getEnvironment());
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("GENERATED: " + op);
+                            LOG.debug("ENV: " + op.getEnvironment());
+                        }
                     }
                     it.remove();
                     m_operationMap.clear();
@@ -501,7 +507,9 @@
                 if (m_options != null
                     &&  m_options.containsKey(OPTION_WINDOW_SIZE)) {
                     windowSize = ( (Integer) m_options.get(OPTION_WINDOW_SIZE)).intValue();
-                    LOG.info("Overridden WINDOW_SIZE for query to: " + windowSize);
+                    if (LOG.isInfoEnabled()) {
+                        LOG.info("Overridden WINDOW_SIZE for query to: " + windowSize);
+                    }
                 } else {
                     windowSize = s_windowSize;
                 }
@@ -509,7 +517,9 @@
                     ps.setFetchDirection(ResultSet.FETCH_FORWARD);
                     ps.setFetchSize(windowSize);
                 }
-                LOG.debug("PreparedStatement ps is " + ps.toString());
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("PreparedStatement ps is " + ps.toString());
+                }
                 if (ps.execute()) {
                     if (cycle != null) { cycle.endExecute(0); }
                     return new ResultCycle(this, ps.getResultSet(), cycle);

[Aplaws-commit] r1324 - in trunk/ccm-core: . src/com/arsdigita/bebop

From: <ssk...@vh...> - 2006-09-22 08:34:58

Author: sskracic
Date: 2006-09-22 10:26:24 +0200 (Fri, 22 Sep 2006)
New Revision: 1324

Modified:
   trunk/ccm-core/application.xml
   trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig.java
   trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig_parameter.properties
   trunk/ccm-core/src/com/arsdigita/bebop/Tree.java
Log:
  Added configuration parameter waf.bebop.enable_tree_select_attribute
(disabled by default).  This is to avoid unnecessary tree traversal
on large (folder) trees, since the isSelected attribute hunts down
complete subtree, regardless of its state being expanded or collapsed.


Modified: trunk/ccm-core/application.xml
===================================================================
--- trunk/ccm-core/application.xml	2006-09-22 08:11:33 UTC (rev 1323)
+++ trunk/ccm-core/application.xml	2006-09-22 08:26:24 UTC (rev 1324)
@@ -3,7 +3,7 @@
   name="ccm-core"
   prettyName="Core"
   version="6.3.3"
-  release="2"
+  release="3"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig.java	2006-09-22 08:11:33 UTC (rev 1323)
+++ trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig.java	2006-09-22 08:26:24 UTC (rev 1324)
@@ -49,6 +49,7 @@
     private final Parameter m_fancyErrors;
     private final Parameter m_dcpOnButtons;
     private final Parameter m_dcpOnLinks;
+    private final Parameter m_enableTreeSelect;
     private final EnumerationParameter m_dhtmlEditor;
 
     public BebopConfig() {
@@ -68,6 +69,11 @@
              Parameter.REQUIRED,
              Boolean.FALSE);
 
+        m_enableTreeSelect = new BooleanParameter
+            ("waf.bebop.enable_tree_select_attribute",
+             Parameter.REQUIRED,
+             Boolean.FALSE);
+
         m_dhtmlEditor = new EnumerationParameter("waf.bebop.dhtml_editor", Parameter.REQUIRED,
                 BebopConstants.BEBOP_DHTMLEDITOR);
         m_dhtmlEditor.put("HTMLArea", BebopConstants.BEBOP_DHTMLEDITOR); // for compatibility with old XSL
@@ -85,6 +91,7 @@
         register(m_dhtmlEditor);
         register(m_dcpOnButtons);
         register(m_dcpOnLinks);
+        register(m_enableTreeSelect);
 
         loadInfo();
     }
@@ -114,10 +121,15 @@
     public final boolean doubleClickProtectionOnButtons() {
         return ((Boolean) get(m_dcpOnButtons)).booleanValue();
     }
+
     public final boolean doubleClickProtectionOnLinks() {
         return ((Boolean) get(m_dcpOnLinks)).booleanValue();
     }
 
+    public final boolean treeSelectAttributeEnabled() {
+        return ((Boolean) get(m_enableTreeSelect)).booleanValue();
+    }
+
     public final String getDHTMLEditor() {
         return (String) get(m_dhtmlEditor);
     }

Modified: trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig_parameter.properties
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig_parameter.properties	2006-09-22 08:11:33 UTC (rev 1323)
+++ trunk/ccm-core/src/com/arsdigita/bebop/BebopConfig_parameter.properties	2006-09-22 08:26:24 UTC (rev 1324)
@@ -32,3 +32,8 @@
 waf.bebop.dhtml_editor.purpose=Select which DHTML text input widget is used for DHTMLEditor Bebop component. 
 waf.bebop.dhtml_editor.example=FCKeditor
 waf.bebop.dhtml_editor.format=HTMLArea|FCKeditor
+
+waf.bebop.enable_tree_select_attribute.title=isSelected attribute for bebop.Tree nodes
+waf.bebop.enable_tree_select_attribute.purpose=Specify whether to turn on isSelected XML attribute on bebop.Tree nodes (performance impact)
+waf.bebop.enable_tree_select_attribute.example=true|false
+waf.bebop.enable_tree_select_attribute.format=[boolean]

Modified: trunk/ccm-core/src/com/arsdigita/bebop/Tree.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/Tree.java	2006-09-22 08:11:33 UTC (rev 1323)
+++ trunk/ccm-core/src/com/arsdigita/bebop/Tree.java	2006-09-22 08:26:24 UTC (rev 1324)
@@ -61,6 +61,9 @@
     private static final Logger s_log =
         Logger.getLogger(Tree.class);
 
+    private static final boolean s_selectAttributeEnabled =
+        Bebop.getConfig().treeSelectAttributeEnabled();
+
     // Any node id in the currentState is equivalent
     // to that node being expanded.  If node id is
     // NOT in the currentState, then it's collapsed.
@@ -649,12 +652,14 @@
         boolean isSelected = (selKey != null)
             && (selKey.equals(nodeKey) || selKey.toString().equals(nodeKey));
 
-        boolean hasSelectedChild = false;
         boolean hasChildren = tree.hasChildren(node, data);
-        if (!isSelected && hasChildren) {
-            hasSelectedChild = hasSelectedChild(tree, node, data, selKey);
+        if (s_selectAttributeEnabled) {
+            boolean hasSelectedChild = false;
+            if (!isSelected && hasChildren) {
+                hasSelectedChild = hasSelectedChild(tree, node, data, selKey);
+            }
+            t_node.addAttribute("isSelected", String.valueOf(isSelected | hasSelectedChild));
         }
-        t_node.addAttribute("isSelected", String.valueOf(isSelected | hasSelectedChild));
 
         if (hasChildren) {
             boolean collapsed = isCollapsed(nodeKey,data);

[Aplaws-commit] r1323 - trunk/ccm-cms/src/com/arsdigita/cms/ui

From: <ssk...@vh...> - 2006-09-22 08:20:03

Author: sskracic
Date: 2006-09-22 10:11:33 +0200 (Fri, 22 Sep 2006)
New Revision: 1323

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java
Log:
  This one smallish issue has been annoying me for a while.  Basically,
it didn't allow you to collapse the currently selected node, except
for the root folder.  Now you can collapse the currently selected node,
however you still can't collapse any of the ancestors of the currently
selected node, which IMHO makes sense.



Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java	2006-09-21 22:13:16 UTC (rev 1322)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java	2006-09-22 08:11:33 UTC (rev 1323)
@@ -179,14 +179,13 @@
                 ACSObject object = m_folder.getFolder(state);
 
                 while (object != null) {
-                    m_tree.expand(object.getID().toString(), state);
-
                     if (object instanceof Folder) {
                         final ACSObject result =
                             ((Folder) object).getParent();
 
                         if (result instanceof Folder) {
                             object = result;
+                            m_tree.expand(object.getID().toString(), state);
                         } else {
                             object = null;
                         }

[Aplaws-commit] r1322 - trunk/ccm-core/src/com/arsdigita/packaging

From: <ap...@vh...> - 2006-09-21 22:21:38

Author: apevec
Date: 2006-09-22 00:13:16 +0200 (Fri, 22 Sep 2006)
New Revision: 1322

Modified:
   trunk/ccm-core/src/com/arsdigita/packaging/Command.java
   trunk/ccm-core/src/com/arsdigita/packaging/Get.java
Log:
commons CLI 1.0 has problmes with longOpt only Options,
workaround is to set the long name as a short name as well...


Modified: trunk/ccm-core/src/com/arsdigita/packaging/Command.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/packaging/Command.java	2006-09-20 11:12:33 UTC (rev 1321)
+++ trunk/ccm-core/src/com/arsdigita/packaging/Command.java	2006-09-21 22:13:16 UTC (rev 1322)
@@ -63,7 +63,7 @@
     public abstract boolean run(String[] args);
 
     void usage(Options options, PrintStream out) {
-        usage(options, out, "ccm " + getName());
+        usage(options, out, "ccm " + getName(), null);
     }
 
     void usage(Options options, PrintStream out, String args) {
@@ -92,13 +92,13 @@
              .hasArg(false)
              .withLongOpt("usage")
              .withDescription("Print this message")
-             .create());
+             .create("usage"));
         options.addOption
             (OptionBuilder
              .hasArg(false)
              .withLongOpt("help")
              .withDescription("Print this message")
-             .create());
+             .create("help"));
         return options;
     }
 

Modified: trunk/ccm-core/src/com/arsdigita/packaging/Get.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/packaging/Get.java	2006-09-20 11:12:33 UTC (rev 1321)
+++ trunk/ccm-core/src/com/arsdigita/packaging/Get.java	2006-09-21 22:13:16 UTC (rev 1322)
@@ -57,13 +57,14 @@
              .hasArg(false)
              .withLongOpt("all")
              .withDescription("Lists all configuration parameters")
-             .create());
+             .create("all"));
         group.addOption
             (OptionBuilder
              .hasArg()
+             .withArgName("PARAMETER")
              .withLongOpt("value")
              .withDescription("Prints a scalar value without the key")
-             .create());
+             .create("value"));
         OPTIONS.addOptionGroup(group);
     }
 
@@ -87,7 +88,7 @@
         }
 
         if (line.hasOption("usage") || line.hasOption("help")) {
-            usage(OPTIONS, System.out);
+            usage(OPTIONS, System.out, "[PARAMETERS]");
             return true;
         }

[Aplaws-commit] r1321 - in trunk/ccm-ldn-portal/sql/ccm-ldn-portal: default/upgrade oracle-se/upgrade postgres/upgrade upgrade

From: <ssk...@vh...> - 2006-09-20 11:21:43

Author: sskracic
Date: 2006-09-20 13:12:33 +0200 (Wed, 20 Sep 2006)
New Revision: 1321

Added:
   trunk/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql
   trunk/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql
Removed:
   trunk/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/freeform-use-clob.sql
Modified:
   trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.1-6.3.2.sql
   trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.1-6.3.2.sql
Log:
  Providing a correct Postgres upgrade script.


Deleted: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/freeform-use-clob.sql

Added: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql
===================================================================
--- trunk/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql	2006-09-20 09:37:00 UTC (rev 1320)
+++ trunk/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql	2006-09-20 11:12:33 UTC (rev 1321)
@@ -0,0 +1,9 @@
+alter table portlet_freeform_html add (
+   content_clob   CLOB
+);
+
+update portlet_freeform_html set content_clob = content;
+
+alter table portlet_freeform_html drop column content;
+
+


Property changes on: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql
___________________________________________________________________
Name: svn:keywords
   + Id Author URL

Added: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql
===================================================================
--- trunk/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql	2006-09-20 09:37:00 UTC (rev 1320)
+++ trunk/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql	2006-09-20 11:12:33 UTC (rev 1321)
@@ -0,0 +1,6 @@
+alter table portlet_freeform_html add content_clob text;
+
+update portlet_freeform_html set content_clob = content;
+
+alter table portlet_freeform_html drop content;
+


Property changes on: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql
___________________________________________________________________
Name: svn:keywords
   + Id Author URL

Modified: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.1-6.3.2.sql
===================================================================
--- trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.1-6.3.2.sql	2006-09-20 09:37:00 UTC (rev 1320)
+++ trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.1-6.3.2.sql	2006-09-20 11:12:33 UTC (rev 1321)
@@ -1 +1 @@
-@@ ../default/upgrade/freeform-use-clob.sql
+@@ ../oracle-se/upgrade/freeform-use-clob.sql

Modified: trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.1-6.3.2.sql
===================================================================
--- trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.1-6.3.2.sql	2006-09-20 09:37:00 UTC (rev 1320)
+++ trunk/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.1-6.3.2.sql	2006-09-20 11:12:33 UTC (rev 1321)
@@ -1,3 +1,3 @@
 begin;
-\i ../default/upgrade/freeform-use-clob.sql
+\i ../postgres/upgrade/freeform-use-clob.sql
 commit;

[Aplaws-commit] r1320 - trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0

From: <ssk...@vh...> - 2006-09-20 09:45:24

Author: sskracic
Date: 2006-09-20 11:37:00 +0200 (Wed, 20 Sep 2006)
New Revision: 1320

Modified:
   trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
Log:
  The plpgsql proc is apparently in state where it successfully rebuilds
the denormalized permission context hierarchy, on the test data sey anyway.


Modified: trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql	2006-09-19 15:48:45 UTC (rev 1319)
+++ trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql	2006-09-20 09:37:00 UTC (rev 1320)
@@ -67,7 +67,6 @@
         exit when t = 0;
     end loop;
 
-
     -- These objects have grants directly on themselves
     update dnm_object_1_granted_context set
         pd_context_id = pd_object_id
@@ -92,13 +91,25 @@
                                        and duc.n_generations = v_level) ;
         get diagnostics t = ROW_COUNT;
         raise notice ''Granted context on ancestor level % to % row(s)'', v_level, t;
-        v_level := v_level + 1;
+            v_level := v_level + 1;
         exit when v_level > v_level_max;
     end loop;
 
-    delete from dnm_ungranted_context where ancestor_id in (
-        select object_id from acs_permissions);
 
+    update dnm_ungranted_context set
+        granted_context_id = (select duc2.ancestor_id from dnm_ungranted_context duc2
+                               where duc2.object_id = dnm_ungranted_context.object_id
+                               and duc2.n_generations = (select min(duc3.n_generations)
+                                                         from dnm_ungranted_context duc3
+                                                         where duc3.object_id = duc2.object_id
+                                                         and duc3.ancestor_id in
+                                                               (select object_id from acs_permissions))
+                               )
+        where
+        object_id in (select duc4.object_id from dnm_ungranted_context duc4
+                      where duc4.ancestor_id in (select object_id from acs_permissions)) ;
+
+
     insert into dnm_object_grants (pd_object_id, pd_n_grants)
         select object_id, count(*) from acs_permissions
            where object_id != 0
@@ -111,7 +122,26 @@
         (pd_object_id, pd_context_id, pd_dummy_flag)
         select distinct object_id, 0, 0
            from acs_permissions where object_id != 0;
+    insert into dnm_granted_context
+        (pd_object_id, pd_context_id, pd_dummy_flag)
+        select duc.object_id, duc.ancestor_id, 0
+           from dnm_ungranted_context duc
+           where duc.object_id in (select object_id from acs_permissions)
+              and duc.ancestor_id in (select object_id from acs_permissions) ;
 
+    delete from dnm_ungranted_context where
+        object_id in (select duc2.object_id from dnm_ungranted_context duc2
+                      where duc2.ancestor_id in
+                            (select ap.object_id from acs_permissions ap))
+        and n_generations >= (select min(duc3.n_generations) from dnm_ungranted_context duc3
+                                  where duc3.object_id = dnm_ungranted_context.object_id
+                                  and duc3.ancestor_id in
+                                            (select ap.object_id from acs_permissions ap))
+        ;
+
+    delete from dnm_ungranted_context where object_id in (
+        select object_id from acs_permissions);
+
     return null;
 end; ' language 'plpgsql' ;

[Aplaws-commit] r1319 - trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0

From: <ssk...@vh...> - 2006-09-19 15:57:11

Author: sskracic
Date: 2006-09-19 17:48:45 +0200 (Tue, 19 Sep 2006)
New Revision: 1319

Modified:
   trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
Log:
  Interim commit, work in progress.


Modified: trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql	2006-09-19 12:53:23 UTC (rev 1318)
+++ trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql	2006-09-19 15:48:45 UTC (rev 1319)
@@ -25,6 +25,7 @@
     t integer;
     i integer;
     v_level integer;
+    v_level_max integer;
   begin
 
     delete from dnm_ungranted_context;
@@ -37,7 +38,8 @@
         select ao.object_id, 0, coalesce(oc.context_id,0)
             from acs_objects ao left join object_context oc
                 on ao.object_id = oc.object_id ;
-    insert into dnm_object_grants values (0,1);
+    insert into dnm_object_grants (pd_object_id, pd_n_grants)
+        select 0, count(*)+1 from acs_permissions where object_id = 0;
     insert into dnm_granted_context
         (pd_object_id, pd_context_id, pd_dummy_flag) values (0,0,1);
 
@@ -65,14 +67,51 @@
         exit when t = 0;
     end loop;
 
-    select count(*) into t from acs_permissions;
-    i := 0;
-    for c in select * from acs_permissions order by object_id loop
-      i := i+1;
-      raise notice ''Adding grant %/% on object %'', i, t, c.object_id;
-      perform dnm_context_add_grant(c.object_id);
+
+    -- These objects have grants directly on themselves
+    update dnm_object_1_granted_context set
+        pd_context_id = pd_object_id
+        where pd_object_id in (select object_id from acs_permissions);
+    get diagnostics t = ROW_COUNT;
+    raise notice ''Direct grants to % row(s)'', t;
+
+    select max(n_generations) into v_level_max from dnm_ungranted_context;
+    v_level := 1;
+    loop
+        update dnm_object_1_granted_context set
+            pd_context_id = (select distinct ap.object_id
+                             from acs_permissions ap, dnm_ungranted_context duc
+                             where ap.object_id = duc.ancestor_id
+                               and duc.n_generations = v_level
+                               and duc.object_id = pd_object_id)
+            where
+                pd_context_id = 0
+                and pd_object_id in (select duc.object_id
+                                     from acs_permissions ap, dnm_ungranted_context duc
+                                     where ap.object_id = duc.ancestor_id
+                                       and duc.n_generations = v_level) ;
+        get diagnostics t = ROW_COUNT;
+        raise notice ''Granted context on ancestor level % to % row(s)'', v_level, t;
+        v_level := v_level + 1;
+        exit when v_level > v_level_max;
     end loop;
 
+    delete from dnm_ungranted_context where ancestor_id in (
+        select object_id from acs_permissions);
+
+    insert into dnm_object_grants (pd_object_id, pd_n_grants)
+        select object_id, count(*) from acs_permissions
+           where object_id != 0
+             group by object_id ;
+    insert into dnm_granted_context
+        (pd_object_id, pd_context_id, pd_dummy_flag)
+        select distinct object_id, object_id, 1
+           from acs_permissions where object_id != 0;
+    insert into dnm_granted_context
+        (pd_object_id, pd_context_id, pd_dummy_flag)
+        select distinct object_id, 0, 0
+           from acs_permissions where object_id != 0;
+
     return null;
 end; ' language 'plpgsql' ;

[Aplaws-commit] r1318 - trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0

From: <ssk...@vh...> - 2006-09-19 13:01:44

Author: sskracic
Date: 2006-09-19 14:53:23 +0200 (Tue, 19 Sep 2006)
New Revision: 1318

Modified:
   trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
Log:
  Significantly faster rebuild of context hierarchy, however the
per-grant step is still very slow.


Modified: trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql	2006-09-15 10:52:49 UTC (rev 1317)
+++ trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql	2006-09-19 12:53:23 UTC (rev 1318)
@@ -17,27 +17,64 @@
 --
 -- $Id$
 -- $DateTime: 2004/08/16 18:10:38 $
+
 create or replace function upgrade_dnm_context ()
   returns integer as '
   declare
     c record;
+    t integer;
+    i integer;
+    v_level integer;
   begin
 
-    for c in select object_id from acs_objects where object_id != 0  loop
-      perform dnm_context_add_object(c.object_id, 0);
-    end loop;
+    delete from dnm_ungranted_context;
+    delete from dnm_granted_context;
+    delete from dnm_object_grants;
+    delete from dnm_object_1_granted_context;
 
-    for c in select object_id, context_id 
-               from object_context where object_id != 0 and context_id is not null and context_id != 0 loop
-      perform dnm_context_change_context(c.object_id, c.context_id);
+    insert into dnm_object_1_granted_context
+        (pd_object_id, pd_context_id, pd_non_effective_context_id)
+        select ao.object_id, 0, coalesce(oc.context_id,0)
+            from acs_objects ao left join object_context oc
+                on ao.object_id = oc.object_id ;
+    insert into dnm_object_grants values (0,1);
+    insert into dnm_granted_context
+        (pd_object_id, pd_context_id, pd_dummy_flag) values (0,0,1);
+
+    v_level := 1;
+    insert into dnm_ungranted_context
+        (object_id, ancestor_id, granted_context_id, n_generations)
+       select
+          object_id, context_id, 0, v_level
+          from object_context where context_id is not null;
+    get diagnostics t = ROW_COUNT;
+    raise notice ''Level % completed, % row(s) affected'', v_level, t;
+    loop
+        insert into dnm_ungranted_context
+            (object_id, ancestor_id, granted_context_id, n_generations)
+           select
+              child.object_id, parent.ancestor_id, 0, v_level + 1
+                from
+                    dnm_ungranted_context child, dnm_ungranted_context parent
+                where child.ancestor_id = parent.object_id
+                    and child.n_generations = v_level
+                    and parent.n_generations = 1 ;
+        get diagnostics t = ROW_COUNT;
+        v_level := v_level + 1;
+        raise notice ''Level % completed, % row(s) affected'', v_level, t;
+        exit when t = 0;
     end loop;
 
-    for c in select object_id from acs_permissions loop
+    select count(*) into t from acs_permissions;
+    i := 0;
+    for c in select * from acs_permissions order by object_id loop
+      i := i+1;
+      raise notice ''Adding grant %/% on object %'', i, t, c.object_id;
       perform dnm_context_add_grant(c.object_id);
     end loop;
 
     return null;
-end; ' language 'plpgsql'
-;
+end; ' language 'plpgsql' ;
 
 select upgrade_dnm_context();
+

18 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 13 14 15 16 17 .. 60 > >> (Page 15 of 60)