aplaws-commit Mailing List for APLAWS (Page 32)

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 .. 30 31 32 33 34 .. 60 > >> (Page 32 of 60)

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

From: <ap...@vh...> - 2005-09-23 08:53:28

Author: apevec
Date: 2005-09-23 10:43:59 +0200 (Fri, 23 Sep 2005)
New Revision: 916

Modified:
   releases/1.0.3/tools/bundle/configure.in
   releases/1.0.3/tools/devel/configure.in
   releases/1.0.3/tools/rpms/ccm-java/ccm-java.spec.in
   releases/1.0.3/tools/scripts/configure.in
   releases/1.0.3/tools/tools/configure.in
Log:
leveling versions of tools for 1.0.3 release


Modified: releases/1.0.3/tools/bundle/configure.in
===================================================================
--- releases/1.0.3/tools/bundle/configure.in	2005-09-22 19:46:31 UTC (rev 915)
+++ releases/1.0.3/tools/bundle/configure.in	2005-09-23 08:43:59 UTC (rev 916)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-tools-bundle.spec.in)
 
-VERSION=1.0.0
-RELEASE=5
+VERSION=6.2.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-tools-bundle, $VERSION)
 AC_SUBST(RELEASE)

Modified: releases/1.0.3/tools/devel/configure.in
===================================================================
--- releases/1.0.3/tools/devel/configure.in	2005-09-22 19:46:31 UTC (rev 915)
+++ releases/1.0.3/tools/devel/configure.in	2005-09-23 08:43:59 UTC (rev 916)
@@ -3,7 +3,7 @@
 
 AC_INIT(ccm-devel.spec.in)
 
-VERSION=2.2.1
+VERSION=6.2.0
 RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-devel, $VERSION)

Modified: releases/1.0.3/tools/rpms/ccm-java/ccm-java.spec.in
===================================================================
--- releases/1.0.3/tools/rpms/ccm-java/ccm-java.spec.in	2005-09-22 19:46:31 UTC (rev 915)
+++ releases/1.0.3/tools/rpms/ccm-java/ccm-java.spec.in	2005-09-23 08:43:59 UTC (rev 916)
@@ -1,6 +1,6 @@
 Summary: Java related environment variables for CCM
 Name:    ccm-java
-Version: 1.0
+Version: 6.2.0
 Release: 1
 Group:   Applications/Internet/CCM
 License: LGPL

Modified: releases/1.0.3/tools/scripts/configure.in
===================================================================
--- releases/1.0.3/tools/scripts/configure.in	2005-09-22 19:46:31 UTC (rev 915)
+++ releases/1.0.3/tools/scripts/configure.in	2005-09-23 08:43:59 UTC (rev 916)
@@ -3,7 +3,7 @@
 
 AC_INIT(ccm-scripts.spec.in)
 
-VERSION=2.1.0
+VERSION=6.2.0
 RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-scripts, $VERSION)

Modified: releases/1.0.3/tools/tools/configure.in
===================================================================
--- releases/1.0.3/tools/tools/configure.in	2005-09-22 19:46:31 UTC (rev 915)
+++ releases/1.0.3/tools/tools/configure.in	2005-09-23 08:43:59 UTC (rev 916)
@@ -3,8 +3,8 @@
 
 AC_INIT(ccm-tools.spec.in)
 
-VERSION=2.1.3
-RELEASE=2
+VERSION=6.2.0
+RELEASE=1
 
 AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
 AC_SUBST(RELEASE)

[Aplaws-commit] r915 - /

From: <ap...@vh...> - 2005-09-22 19:56:04

Author: apevec
Date: 2005-09-22 21:46:31 +0200 (Thu, 22 Sep 2005)
New Revision: 915

Added:
   tags/
Log:
tags directory

[Aplaws-commit] r914 - users/public

From: <ap...@vh...> - 2005-09-22 19:29:26

Author: apevec
Date: 2005-09-22 21:19:56 +0200 (Thu, 22 Sep 2005)
New Revision: 914

Added:
   users/public/set-version.sh
Log:
modified Matt's bump-version.sh to set the same version for all apps


Added: users/public/set-version.sh
===================================================================
--- users/public/set-version.sh	2005-09-22 19:01:07 UTC (rev 913)
+++ users/public/set-version.sh	2005-09-22 19:19:56 UTC (rev 914)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# set all apps to the same version
+
+VERSION=$1
+
+for application in `find -maxdepth 3 -name application.xml`; do
+    cat <<XSL | xsltproc - $application | awk '
+/<ccm:application/ {print gensub("\" ", "\"\n  ", "g")}
+! /<ccm:application/ {print $0}
+' > application.xml.new
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                xmlns:ccm="http://ccm.redhat.com/ccm-project"
+                version="1.0">
+
+    <xsl:output method="xml" indent="yes"/>
+
+    <xsl:template match="ccm:application">
+        <xsl:copy>
+            <xsl:for-each select="attribute::*">
+                <xsl:choose>
+                    <xsl:when test="name() = 'version'">
+                        <xsl:attribute name="version">$VERSION</xsl:attribute>
+                    </xsl:when>
+
+                    <xsl:when test="name() = 'release'">
+                        <xsl:attribute name="release">1</xsl:attribute>
+                    </xsl:when>
+
+                    <xsl:otherwise>
+                        <xsl:copy/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:for-each>
+
+            <xsl:apply-templates mode="copy"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="*" mode="copy">
+        <xsl:copy>
+            <xsl:for-each select="attribute::*">
+                <xsl:copy/>
+            </xsl:for-each>
+            <xsl:apply-templates mode="copy"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="ccm:requires" mode="copy">
+        <xsl:copy>
+            <xsl:for-each select="attribute::*">
+                <xsl:choose>
+                    <xsl:when test="name()='version'">
+                        <xsl:attribute name="version">$VERSION</xsl:attribute>
+                    </xsl:when>
+
+                    <xsl:otherwise>
+                        <xsl:copy/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:for-each>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>
+XSL
+
+    mv application.xml.new $application
+done
+


Property changes on: users/public/set-version.sh
___________________________________________________________________
Name: svn:executable
   + *

[Aplaws-commit] r913 - in trunk: ccm-auth-http 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-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-ldn-theme ccm-ldn-util ccm-! ldn-xmlfeed ccm-simplesurvey ccm-user-preferences

From: <ap...@vh...> - 2005-09-22 19:11:02

Author: apevec
Date: 2005-09-22 21:01:07 +0200 (Thu, 22 Sep 2005)
New Revision: 913

Modified:
   trunk/ccm-auth-http/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-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
Log:
level versions across all apps on trunk to 6.3.0
(see r912 for new versioning scheme details)



Modified: trunk/ccm-auth-http/application.xml
===================================================================
--- trunk/ccm-auth-http/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-auth-http/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,10 +2,10 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-auth-http"
   prettyName="Auth HTTP"
-  version="1.4.2"
+  version="6.3.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-cms/application.xml
===================================================================
--- trunk/ccm-cms/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,11 +2,11 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
-  version="6.1.2"
-  release="4"
+  version="6.3.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/>

Modified: trunk/ccm-cms-assets-fileattachment/application.xml
===================================================================
--- trunk/ccm-cms-assets-fileattachment/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-assets-fileattachment/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-fileattachment"
   prettyName="Red Hat CMS Content Asset File Attachment"
-  version="6.1.2"
-  release="3"
+  version="6.3.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.3.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-assets-notes/application.xml
===================================================================
--- trunk/ccm-cms-assets-notes/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-assets-notes/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-notes"
   prettyName="Red Hat CMS Content Asset Notes"
-  version="6.1.2"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-assets-relatedlink/application.xml
===================================================================
--- trunk/ccm-cms-assets-relatedlink/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-assets-relatedlink/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <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.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-address/application.xml
===================================================================
--- trunk/ccm-cms-types-address/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-address/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-address"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-agenda/application.xml
===================================================================
--- trunk/ccm-cms-types-agenda/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-agenda/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-agenda"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.2"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-article/application.xml
===================================================================
--- trunk/ccm-cms-types-article/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-article/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-article"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-bookmark/application.xml
===================================================================
--- trunk/ccm-cms-types-bookmark/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-bookmark/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-bookmark"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-contact/application.xml
===================================================================
--- trunk/ccm-cms-types-contact/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-contact/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-contact"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-esdservice/application.xml
===================================================================
--- trunk/ccm-cms-types-esdservice/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-esdservice/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-esdservice"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-cms-types-contact" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-cms-types-contact" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-event/application.xml
===================================================================
--- trunk/ccm-cms-types-event/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-event/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-event"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-faqitem/application.xml
===================================================================
--- trunk/ccm-cms-types-faqitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-faqitem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-faqitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-filestorageitem/application.xml
===================================================================
--- trunk/ccm-cms-types-filestorageitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-filestorageitem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-filestorageitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-formitem/application.xml
===================================================================
--- trunk/ccm-cms-types-formitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-formitem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.2"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-cms-types-formsectionitem" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-formsectionitem/application.xml
===================================================================
--- trunk/ccm-cms-types-formsectionitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-formsectionitem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formsectionitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
-  release="2"
+  version="6.3.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-glossaryitem/application.xml
===================================================================
--- trunk/ccm-cms-types-glossaryitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-glossaryitem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-glossaryitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-htmlform/application.xml
===================================================================
--- trunk/ccm-cms-types-htmlform/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-htmlform/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-htmlform"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-cms-types-article" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-cms-types-article" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-inlinesite/application.xml
===================================================================
--- trunk/ccm-cms-types-inlinesite/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-inlinesite/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-inlinesite"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-job/application.xml
===================================================================
--- trunk/ccm-cms-types-job/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-job/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-job"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-legalnotice/application.xml
===================================================================
--- trunk/ccm-cms-types-legalnotice/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-legalnotice/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-legalnotice"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-minutes/application.xml
===================================================================
--- trunk/ccm-cms-types-minutes/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-minutes/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-minutes"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-motditem/application.xml
===================================================================
--- trunk/ccm-cms-types-motditem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-motditem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-motditem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-mparticle/application.xml
===================================================================
--- trunk/ccm-cms-types-mparticle/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-mparticle/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-mparticle"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-newsitem/application.xml
===================================================================
--- trunk/ccm-cms-types-newsitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-newsitem/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-newsitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-organization/application.xml
===================================================================
--- trunk/ccm-cms-types-organization/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-organization/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-organization"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-pressrelease/application.xml
===================================================================
--- trunk/ccm-cms-types-pressrelease/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-pressrelease/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-pressrelease"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-service/application.xml
===================================================================
--- trunk/ccm-cms-types-service/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-service/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-service"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-cms-types-siteproxy/application.xml
===================================================================
--- trunk/ccm-cms-types-siteproxy/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-cms-types-siteproxy/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-siteproxy"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: trunk/ccm-core/application.xml
===================================================================
--- trunk/ccm-core/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-core/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-core"
   prettyName="Core"
-  version="6.1.2"
-  release="7"
+  version="6.3.0"
+  release="1"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: trunk/ccm-formbuilder-pdf/application.xml
===================================================================
--- trunk/ccm-formbuilder-pdf/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-formbuilder-pdf/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0"?>
+<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
+  name="ccm-formbuilder-pdf"
+  prettyName="PDFConverter"
+  version="6.3.0"
+  release="1">
 
-<ccm:application name="ccm-formbuilder-pdf"
-           prettyName="PDFConverter"
-              version="0.6.0"
-              release="3"
-            xmlns:ccm="http://ccm.redhat.com/ccm-project">
-
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
 
   <ccm:contacts>

Modified: trunk/ccm-forum/application.xml
===================================================================
--- trunk/ccm-forum/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-forum/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,11 +2,11 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-forum"
   prettyName="Forum"
-  version="1.4.4"
-  release="2">
+  version="6.3.0"
+  release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.3.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-aplaws/application.xml
===================================================================
--- trunk/ccm-ldn-aplaws/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-aplaws/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,17 +2,17 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-aplaws"
   prettyName="APLAWS"
-  version="1.9.2"
-  release="3"
+  version="6.3.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-portal" version="1.4.3"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
-    <ccm:requires name="ccm-cms-types-article" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-portal" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.3.0"/>
+    <ccm:requires name="ccm-cms-types-article" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-atoz/application.xml
===================================================================
--- trunk/ccm-ldn-atoz/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-atoz/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,15 +2,15 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-atoz"
   prettyName="A-Z"
-  version="1.0.3"
+  version="6.3.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
-    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-dublin/application.xml
===================================================================
--- trunk/ccm-ldn-dublin/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-dublin/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,14 +2,14 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-dublin"
   prettyName="Dublin Core"
-  version="1.4.3"
-  release="2"
+  version="6.3.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-exporter/application.xml
===================================================================
--- trunk/ccm-ldn-exporter/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-exporter/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-exporter"
   prettyName="exporter"
-  version="1.0.1"
+  version="6.3.0"
   release="1">
   <ccm:directories>
     <ccm:directory name="src"/>
@@ -10,11 +10,11 @@
     <ccm:directory name="web"/>
   </ccm:directories>
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-cms-types-filestorageitem" version="6.1.1"/>
-    <ccm:requires name="ccm-cms-types-mparticle" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0"/>
+    <ccm:requires name="ccm-cms-types-filestorageitem" version="6.3.0"/>
+    <ccm:requires name="ccm-cms-types-mparticle" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-freeform/application.xml
===================================================================
--- trunk/ccm-ldn-freeform/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-freeform/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-freeform"
   prettyName="Freeform"
-  version="1.4.2"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-image-step/application.xml
===================================================================
--- trunk/ccm-ldn-image-step/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-image-step/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-image-step"
   prettyName="Image step"
-  version="2.0.1"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-importer/application.xml
===================================================================
--- trunk/ccm-ldn-importer/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-importer/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-importer"
   prettyName="Importer"
-  version="1.0.1"
+  version="6.3.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-navigation/application.xml
===================================================================
--- trunk/ccm-ldn-navigation/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-navigation/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,14 +2,14 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-navigation"
   prettyName="Navigation"
-  version="1.4.5"
+  version="6.3.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.2" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.3.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.3.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-portal/application.xml
===================================================================
--- trunk/ccm-ldn-portal/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-portal/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,17 +2,17 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-portal"
   prettyName="Portal"
-  version="1.4.3"
-  release="2"
+  version="6.3.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
-    <ccm:requires name="ccm-forum" version="1.4.2" relation="ge"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
-    <ccm:requires name="ccm-ldn-rss" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.3.0"/>
+    <ccm:requires name="ccm-forum" version="6.3.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-rss" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-rss/application.xml
===================================================================
--- trunk/ccm-ldn-rss/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-rss/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-rss"
   prettyName="RSS"
-  version="1.4.2"
-  release="2">
+  version="6.3.0"
+  release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-search/application.xml
===================================================================
--- trunk/ccm-ldn-search/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-search/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-search"
   prettyName="Search"
-  version="1.4.3"
+  version="6.3.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
+    <ccm:requires name="ccm-cms" version="6.3.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-shortcuts/application.xml
===================================================================
--- trunk/ccm-ldn-shortcuts/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-shortcuts/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,10 +2,10 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-shortcuts"
   prettyName="Shortcuts"
-  version="1.4.2"
+  version="6.3.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: trunk/ccm-ldn-subsite/application.xml
===================================================================
--- trunk/ccm-ldn-subsite/application.xml	2005-09-22 18:52:45 UTC (rev 912)
+++ trunk/ccm-ldn-subsite/application.xml	2005-09-22 19:01:07 UTC (rev 913)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-subsite"
   prettyName="Subsite"
-  version="1.4.2"
+  version="6.3.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+    <ccm:requires name="ccm-core" version="6.3.0"/>
..

[Aplaws-commit] r912 - in releases/1.0.3: ccm-auth-http 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-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-ldn-theme ccm-ldn-! util ccm-ldn-xmlfeed ccm-simplesurvey ccm-user-preferences

From: <ap...@vh...> - 2005-09-22 19:02:33

Author: apevec
Date: 2005-09-22 20:52:45 +0200 (Thu, 22 Sep 2005)
New Revision: 912

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

New versioning schema is as follows:
    X.Y.Z
- all apps in a releases the same X.Y where Y is an even number, e.g. current 1.0.3 is 6.2.0
- all trunk apps have the same X.Y where Y is an odd number, e.g. current trunk after 1.0.3 branching is 6.3.0
- Z is increased independently per app, when data model change is introduced which requires upgrade script
For code changes only increasing release number is enough.



Modified: releases/1.0.3/ccm-auth-http/application.xml
===================================================================
--- releases/1.0.3/ccm-auth-http/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-auth-http/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,10 +2,10 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-auth-http"
   prettyName="Auth HTTP"
-  version="1.4.2"
+  version="6.2.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-cms/application.xml
===================================================================
--- releases/1.0.3/ccm-cms/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,11 +2,11 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms"
   prettyName="Red Hat CCM Content Management System"
-  version="6.1.2"
-  release="4"
+  version="6.2.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/>

Modified: releases/1.0.3/ccm-cms-assets-fileattachment/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-assets-fileattachment/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-assets-fileattachment/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-fileattachment"
   prettyName="Red Hat CMS Content Asset File Attachment"
-  version="6.1.2"
-  release="3"
+  version="6.2.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-assets-notes/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-assets-notes/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-assets-notes/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-notes"
   prettyName="Red Hat CMS Content Asset Notes"
-  version="6.1.2"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-assets-relatedlink/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-assets-relatedlink/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-assets-relatedlink/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <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.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-address/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-address/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-address/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-address"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-agenda/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-agenda/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-agenda/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-agenda"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.2"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-article/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-article/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-article/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-article"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-bookmark/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-bookmark/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-bookmark/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-bookmark"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-contact/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-contact/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-contact/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-contact"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-esdservice/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-esdservice/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-esdservice/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-esdservice"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-cms-types-contact" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-cms-types-contact" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-event/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-event/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-event/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-event"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-faqitem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-faqitem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-faqitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-faqitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-filestorageitem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-filestorageitem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-filestorageitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-filestorageitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-formitem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-formitem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-formitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.2"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-cms-types-formsectionitem" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-formsectionitem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-formsectionitem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-formsectionitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-formsectionitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
-  release="2"
+  version="6.2.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-glossaryitem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-glossaryitem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-glossaryitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-glossaryitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-htmlform/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-htmlform/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-htmlform/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-htmlform"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-cms-types-article" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-cms-types-article" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-inlinesite/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-inlinesite/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-inlinesite/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-inlinesite"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-job/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-job/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-job/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-job"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-legalnotice/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-legalnotice/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-legalnotice/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-legalnotice"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-minutes/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-minutes/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-minutes/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-minutes"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-motditem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-motditem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-motditem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-motditem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-mparticle/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-mparticle/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-mparticle/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-mparticle"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-newsitem/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-newsitem/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-newsitem/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-newsitem"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-organization/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-organization/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-organization/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-organization"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-pressrelease/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-pressrelease/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-pressrelease/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-pressrelease"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-service/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-service/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-service/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-service"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-cms-types-siteproxy/application.xml
===================================================================
--- releases/1.0.3/ccm-cms-types-siteproxy/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-cms-types-siteproxy/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-types-siteproxy"
   prettyName="Red Hat CCM Content Types"
-  version="6.1.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

Modified: releases/1.0.3/ccm-core/application.xml
===================================================================
--- releases/1.0.3/ccm-core/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-core/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-core"
   prettyName="Core"
-  version="6.1.2"
-  release="7"
+  version="6.2.0"
+  release="1"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: releases/1.0.3/ccm-formbuilder-pdf/application.xml
===================================================================
--- releases/1.0.3/ccm-formbuilder-pdf/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-formbuilder-pdf/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0"?>
+<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
+  name="ccm-formbuilder-pdf"
+  prettyName="PDFConverter"
+  version="6.2.0"
+  release="1">
 
-<ccm:application name="ccm-formbuilder-pdf"
-           prettyName="PDFConverter"
-              version="0.6.0"
-              release="3"
-            xmlns:ccm="http://ccm.redhat.com/ccm-project">
-
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
 
   <ccm:contacts>

Modified: releases/1.0.3/ccm-forum/application.xml
===================================================================
--- releases/1.0.3/ccm-forum/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-forum/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,11 +2,11 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-forum"
   prettyName="Forum"
-  version="1.4.4"
-  release="2">
+  version="6.2.0"
+  release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-aplaws/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-aplaws/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,17 +2,17 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-aplaws"
   prettyName="APLAWS"
-  version="1.9.2"
-  release="3"
+  version="6.2.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-portal" version="1.4.3"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
-    <ccm:requires name="ccm-cms-types-article" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-portal" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.2.0"/>
+    <ccm:requires name="ccm-cms-types-article" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-atoz/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-atoz/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-atoz/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,15 +2,15 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-atoz"
   prettyName="A-Z"
-  version="1.0.3"
+  version="6.2.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
-    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-dublin/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-dublin/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-dublin/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,14 +2,14 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-dublin"
   prettyName="Dublin Core"
-  version="1.4.3"
-  release="2"
+  version="6.2.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-exporter/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-exporter/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-exporter/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-exporter"
   prettyName="exporter"
-  version="1.0.1"
+  version="6.2.0"
   release="1">
   <ccm:directories>
     <ccm:directory name="src"/>
@@ -10,11 +10,11 @@
     <ccm:directory name="web"/>
   </ccm:directories>
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-cms-types-filestorageitem" version="6.1.1"/>
-    <ccm:requires name="ccm-cms-types-mparticle" version="6.1.1"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0"/>
+    <ccm:requires name="ccm-cms-types-filestorageitem" version="6.2.0"/>
+    <ccm:requires name="ccm-cms-types-mparticle" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-freeform/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-freeform/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-freeform/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-freeform"
   prettyName="Freeform"
-  version="1.4.2"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-image-step/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-image-step/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-image-step/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-image-step"
   prettyName="Image step"
-  version="2.0.1"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-importer/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-importer/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-importer/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-importer"
   prettyName="Importer"
-  version="1.0.1"
+  version="6.2.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-navigation/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-navigation/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,14 +2,14 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-navigation"
   prettyName="Navigation"
-  version="1.4.5"
+  version="6.2.0"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.2" relation="ge"/>
+    <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.2.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-portal/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-portal/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-portal/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,17 +2,17 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-portal"
   prettyName="Portal"
-  version="1.4.3"
-  release="2"
+  version="6.2.0"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
-    <ccm:requires name="ccm-forum" version="1.4.2" relation="ge"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
-    <ccm:requires name="ccm-ldn-rss" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-subsite" version="6.2.0"/>
+    <ccm:requires name="ccm-forum" version="6.2.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-navigation" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-rss" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-rss/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-rss/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-rss/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-rss"
   prettyName="RSS"
-  version="1.4.2"
-  release="2">
+  version="6.2.0"
+  release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-search/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-search/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-search/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,12 +2,12 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-search"
   prettyName="Search"
-  version="1.4.3"
+  version="6.2.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
+    <ccm:requires name="ccm-cms" version="6.2.0"/>
+    <ccm:requires name="ccm-ldn-util" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-shortcuts/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-shortcuts/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-shortcuts/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,10 +2,10 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-shortcuts"
   prettyName="Shortcuts"
-  version="1.4.2"
+  version="6.2.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-subsite/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-subsite/application.xml	2005-09-22 17:22:06 UTC (rev 911)
+++ releases/1.0.3/ccm-ldn-subsite/application.xml	2005-09-22 18:52:45 UTC (rev 912)
@@ -2,13 +2,13 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-ldn-subsite"
   prettyName="Subsite"
-  version="1.4.2"
+  version="6.2.0"
   release="1">
   <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.1.2"/>
-    <ccm:requires name="ccm-cms" version="6.1.2"/>
-    <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
-    <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
+    <ccm:requires name="ccm-core" version="6.2.0"/>
..

[Aplaws-commit] r911 - releases

From: <ap...@vh...> - 2005-09-22 17:31:41

Author: apevec
Date: 2005-09-22 19:22:06 +0200 (Thu, 22 Sep 2005)
New Revision: 911

Added:
   releases/1.0.3/
Log:
APLAWS+ 1.0.3 release branch at r910


Copied: releases/1.0.3 (from rev 910, trunk)

[Aplaws-commit] r910 - trunk/tools/misc

From: <ap...@vh...> - 2005-09-22 16:33:37

Author: apevec
Date: 2005-09-22 18:24:04 +0200 (Thu, 22 Sep 2005)
New Revision: 910

Modified:
   trunk/tools/misc/build-all.sh
Log:
remove site specific bundle from the default list of bundles


Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh	2005-09-22 15:37:12 UTC (rev 909)
+++ trunk/tools/misc/build-all.sh	2005-09-22 16:24:04 UTC (rev 910)
@@ -3,7 +3,7 @@
 # Build everything!
 
 [ -z "$BUNDLEDIR" ] && BUNDLEDIR="ccm-ldn-aplaws/ccm-ldn-aplaws"
-[ -z "$BUNDLES" ] && BUNDLES="standard complete demo devel camden"
+[ -z "$BUNDLES" ] && BUNDLES="standard complete demo devel"
 
 set -e
 #set -v

[Aplaws-commit] r909 - trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/admin

From: <ap...@vh...> - 2005-09-22 15:46:44

Author: apevec
Date: 2005-09-22 17:37:12 +0200 (Thu, 22 Sep 2005)
New Revision: 909

Modified:
   trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/admin/TermForm.java
Log:
Fix for SF bug [ 1250963 ] Terms - new term - doesnt keep description


Modified: trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/admin/TermForm.java
===================================================================
--- trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/admin/TermForm.java	2005-09-22 11:53:35 UTC (rev 908)
+++ trunk/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/admin/TermForm.java	2005-09-22 15:37:12 UTC (rev 909)
@@ -202,6 +202,7 @@
                                    .booleanValue(),
                                    (String)m_shortcut.getValue(state),
                                    domain);
+                 term.setDescription((String)m_desc.getValue(state));
                  state.setValue(m_term, term);
             } else {
                 //term.setKey((String)m_key.getValue(state));

[Aplaws-commit] r908 - trunk/tools/devel/xsl

From: <ssk...@vh...> - 2005-09-22 12:03:07

Author: sskracic
Date: 2005-09-22 13:53:35 +0200 (Thu, 22 Sep 2005)
New Revision: 908

Modified:
   trunk/tools/devel/xsl/build-template.xsl
Log:
  Aplaws+ needs JDK 1.4, so point Javadoc to appropriate URL.


Modified: trunk/tools/devel/xsl/build-template.xsl
===================================================================
--- trunk/tools/devel/xsl/build-template.xsl	2005-09-22 11:50:30 UTC (rev 907)
+++ trunk/tools/devel/xsl/build-template.xsl	2005-09-22 11:53:35 UTC (rev 908)
@@ -1300,7 +1300,7 @@
           doctitle="&lt;h1&gt;${{apps.{$name}.prettyname}} API Documentation&lt;/h1&gt;">
           <packageset dir="{$name}/${{src.dir}}"/>
           <classpath refid="server.build.classpath"/>
-          <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+          <link href="http://java.sun.com/j2se/1.4/docs/api/"/>
           <link href="http://java.sun.com/j2ee/tutorial/api/"/>
         </javadoc>
       </target>
@@ -1332,7 +1332,7 @@
         doctitle="&lt;h1&gt;${{app.prettyname}} API Documentation&lt;/h1&gt;">
         <packageset dir="${{build.src.dir}}"/>
         <classpath refid="server.build.classpath"/>
-        <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+        <link href="http://java.sun.com/j2se/1.4/docs/api/"/>
         <link href="http://java.sun.com/j2ee/tutorial/api/"/>
       </javadoc>
     </target>

[Aplaws-commit] r907 - trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets

From: <ssk...@vh...> - 2005-09-22 11:59:58

Author: sskracic
Date: 2005-09-22 13:50:30 +0200 (Thu, 22 Sep 2005)
New Revision: 907

Modified:
   trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
Log:
  Finishing patch for SF [ 1218253 ] related links ordering bug
started in r906.


Modified: trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
===================================================================
--- trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java	2005-09-22 10:45:33 UTC (rev 906)
+++ trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java	2005-09-22 11:50:30 UTC (rev 907)
@@ -285,8 +285,9 @@
         }
         int returnOrder = 0;
         DataQuery query = SessionManager.getSession().retrieveQuery
-            ("com.arsdigita.cms.contentassets.maxRelatedLinkOrderForItem");
+            ("com.arsdigita.cms.contentassets.allRelatedLinkOrderForItem");
         query.setParameter("ownerID", getLinkOwner().getID());
+        query.addOrder("linkOrder DESC");
         if (query.next()) {
             Integer linkOrder = ((Integer)query.get("linkOrder"));
             query.close();

[Aplaws-commit] r906 - in trunk: ccm-cms/src/com/arsdigita/cms/contenttypes ccm-cms-assets-relatedlink/pdl/com/arsdigita/contentassets ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets

From: <ssk...@vh...> - 2005-09-22 10:56:26

Author: sskracic
Date: 2005-09-22 12:45:33 +0200 (Thu, 22 Sep 2005)
New Revision: 906

Modified:
   trunk/ccm-cms-assets-relatedlink/pdl/com/arsdigita/contentassets/RelatedLink.pdl
   trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
   trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/Link.java
Log:
  Fix for SF [ 1218253 ] related links ordering bug.  Filters cannot be applied
to the inner part of queries that use aggregate functions (MIN,MAX,SUM,...).
Applying filter to those has a similar affect to that of HAVING clause.

  Besides that, the whole Link/RelatedLink inheritance scheme is messy.


Modified: trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/Link.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/Link.java	2005-09-22 10:18:55 UTC (rev 905)
+++ trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/Link.java	2005-09-22 10:45:33 UTC (rev 906)
@@ -437,10 +437,12 @@
 
         if (swapNext) {
             otherKey = key + 1;
+            query.addOrder("linkOrder ASC");
             query.addFilter(query.getFilterFactory()
                             .greaterThan("linkOrder", currentKey, true));
         } else {
             otherKey = key - 1;
+            query.addOrder("linkOrder DESC");
             query.addFilter(query.getFilterFactory()
                             .lessThan("linkOrder", currentKey, true));
         }

Modified: trunk/ccm-cms-assets-relatedlink/pdl/com/arsdigita/contentassets/RelatedLink.pdl
===================================================================
--- trunk/ccm-cms-assets-relatedlink/pdl/com/arsdigita/contentassets/RelatedLink.pdl	2005-09-22 10:18:55 UTC (rev 905)
+++ trunk/ccm-cms-assets-relatedlink/pdl/com/arsdigita/contentassets/RelatedLink.pdl	2005-09-22 10:45:33 UTC (rev 906)
@@ -45,45 +45,26 @@
         where (link_order = :linkOrder or link_order = :nextLinkOrder)
         and (select owner_id from cms_related_links where related_link_id=link_id) = :ownerID
         and 2 = (select count(*) from cms_links l, cms_related_links r
-                 where l.link_id=r.related_link_id 
-	         and (link_order = :linkOrder or link_order = :nextLinkOrder)
+                 where l.link_id=r.related_link_id
+                 and (link_order = :linkOrder or link_order = :nextLinkOrder)
                  and owner_id = :ownerID)
     }
 }
 
-query minRelatedLinkOrderForItem {
+query allRelatedLinkOrderForItem {
     Integer linkOrder;
 
-    options {
-        WRAP_QUERIES = false;
-    }
-
     do {
-        select min(link_order) as link_order from cms_links l, cms_related_links r
-        where owner_id = :ownerID and l.link_id = r.related_link_id
+        select l.link_order from cms_links l, cms_related_links r
+        where r.owner_id = :ownerID and l.link_id = r.related_link_id
     } map {
-        linkOrder = link_order;
+        linkOrder = l.link_order;
     }
 }
 
-query maxRelatedLinkOrderForItem {
-    Integer linkOrder;
-
-    options {
-        WRAP_QUERIES = false;
-    }
-
-    do {
-        select max(link_order) as link_order from cms_links l, cms_related_links r
-        where owner_id = :ownerID and l.link_id = r.related_link_id
-    } map {
-        linkOrder = link_order;
-    }
-}
-
 query getReferringRelatedLinks {
     BigDecimal id;
-        
+
     do  {
         select l.link_id
           from cms_links l, cms_related_links r

Modified: trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java
===================================================================
--- trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java	2005-09-22 10:18:55 UTC (rev 905)
+++ trunk/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/RelatedLink.java	2005-09-22 10:45:33 UTC (rev 906)
@@ -203,7 +203,7 @@
      * according to the linkOrder
      */
     public void swapWithNext() {
-        swapWithNext("com.arsdigita.cms.contentassets.minRelatedLinkOrderForItem",
+        swapWithNext("com.arsdigita.cms.contentassets.allRelatedLinkOrderForItem",
                      "com.arsdigita.cms.contentassets.swapRelatedLinkWithNextInGroup");
     }
 
@@ -212,7 +212,7 @@
      * according to the linkOrder
      */
     public void swapWithPrevious() {
-        swapWithPrevious("com.arsdigita.cms.contentassets.maxRelatedLinkOrderForItem",
+        swapWithPrevious("com.arsdigita.cms.contentassets.allRelatedLinkOrderForItem",
                          "com.arsdigita.cms.contentassets.swapRelatedLinkWithNextInGroup");
     }

[Aplaws-commit] r905 - trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade

From: <ss...@vh...> - 2005-09-22 10:28:25

Author: sshinde
Date: 2005-09-22 12:18:55 +0200 (Thu, 22 Sep 2005)
New Revision: 905

Modified:
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
Log:
Added sample statements to delete duplicate dublin mappings.


Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2005-09-22 07:09:47 UTC (rev 904)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2005-09-22 10:18:55 UTC (rev 905)
@@ -2,4 +2,15 @@
 add ccn_portal_instance varchar2(200);
 -- following query must return 0 rows, otherwise unique index creation will fail
 select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
+--
+-- Deletion of duplicate dublin item mappings involves following tables.
+-- dublin_id entry in following delete statements should be figured out
+-- manually.
+--delete from ldn_dublin_core_item_map where dublin_id = 168927;
+--delete from LDN_DUBLIN_CORE_ITEMS where dublin_id = 168927;
+--delete from cms_items where item_id = 168927;
+--delete from object_context where object_id = 168927;
+--delete from OBJECT_CONTAINER_MAP where object_id = 168927;
+--delete from acs_objects where object_id = 168927;
+--
 @@ ../default/index-ldn_dc_map_item_id_idx.sql

[Aplaws-commit] r904 - in trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin: . default upgrade

From: <ap...@vh...> - 2005-09-22 07:19:15

Author: apevec
Date: 2005-09-22 09:09:47 +0200 (Thu, 22 Sep 2005)
New Revision: 904

Added:
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/index-ldn_dc_map_item_id_idx.sql
Modified:
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql
Log:
Workaround for SF bug [ 1174803 ] data model bug in dublin core item
    UPGRADE NOTE: there are prolly already duplicate entries in ldn_dublin_core_item_map, they must be cleaned up manually (check the query in the upgrade script)


Added: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/index-ldn_dc_map_item_id_idx.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/index-ldn_dc_map_item_id_idx.sql	2005-09-22 06:20:11 UTC (rev 903)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/index-ldn_dc_map_item_id_idx.sql	2005-09-22 07:09:47 UTC (rev 904)
@@ -0,0 +1 @@
+create unique index ldn_dc_map_item_id_idx on ldn_dublin_core_item_map(item_id);

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql	2005-09-22 06:20:11 UTC (rev 903)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql	2005-09-22 07:09:47 UTC (rev 904)
@@ -1,2 +1,3 @@
 @@ ddl/oracle-se/create.sql
 @@ ddl/oracle-se/deferred.sql
+@@ default/index-ldn_dc_map_item_id_idx.sql

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql	2005-09-22 06:20:11 UTC (rev 903)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql	2005-09-22 07:09:47 UTC (rev 904)
@@ -1,4 +1,5 @@
 begin;
 \i ddl/postgres/create.sql
 \i ddl/postgres/deferred.sql
+\i default/index-ldn_dc_map_item_id_idx.sql
 end;

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2005-09-22 06:20:11 UTC (rev 903)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2005-09-22 07:09:47 UTC (rev 904)
@@ -1,2 +1,5 @@
 alter table ldn_dublin_core_items
 add ccn_portal_instance varchar2(200);
+-- following query must return 0 rows, otherwise unique index creation will fail
+select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
+@@ ../default/index-ldn_dc_map_item_id_idx.sql

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql	2005-09-22 06:20:11 UTC (rev 903)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql	2005-09-22 07:09:47 UTC (rev 904)
@@ -1,2 +1,5 @@
 alter table ldn_dublin_core_items
 add ccn_portal_instance varchar(200);
+-- following query must return 0 rows, otherwise unique index creation will fail
+select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
+\i ../default/index-ldn_dc_map_item_id_idx.sql

[Aplaws-commit] r903 - trunk/ccm-cms-types-newsitem/pdl/com/arsdigita/content-types

From: <ap...@vh...> - 2005-09-22 06:29:40

Author: apevec
Date: 2005-09-22 08:20:11 +0200 (Thu, 22 Sep 2005)
New Revision: 903

Modified:
   trunk/ccm-cms-types-newsitem/pdl/com/arsdigita/content-types/NewsItem.pdl
Log:
SF patch [ 1155903 ] Amendment to query to get Recent News
    rewritten in SQL92 syntax, which works on both PostgreSQL and Oracle >=9i


Modified: trunk/ccm-cms-types-newsitem/pdl/com/arsdigita/content-types/NewsItem.pdl
===================================================================
--- trunk/ccm-cms-types-newsitem/pdl/com/arsdigita/content-types/NewsItem.pdl	2005-09-22 05:57:11 UTC (rev 902)
+++ trunk/ccm-cms-types-newsitem/pdl/com/arsdigita/content-types/NewsItem.pdl	2005-09-22 06:20:11 UTC (rev 903)
@@ -37,11 +37,12 @@
     BigDecimal newsID;
     do {
         select n.item_id
-        from ct_news n, cms_items i, cms_article_image_map m
+        from ct_news n, cms_items i
+            left join cms_article_image_map m
+            on i.item_id = m.article_id
         where n.is_homepage = 1
         and n.item_id = i.item_id
         and i.version = 'live'
-        and n.item_id = m.article_id
         order by n.news_date desc
     } map {
         newsID = n.item_id;

[Aplaws-commit] r902 - trunk/ccm-core/src/com/arsdigita/persistence

From: <ap...@vh...> - 2005-09-22 06:06:39

Author: apevec
Date: 2005-09-22 07:57:11 +0200 (Thu, 22 Sep 2005)
New Revision: 902

Modified:
   trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java
Log:
SF patch [ 1160550 ] BugFix in DataQueryDomainCollectionAdapter


Modified: trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java	2005-09-22 05:39:04 UTC (rev 901)
+++ trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java	2005-09-22 05:57:11 UTC (rev 902)
@@ -19,6 +19,7 @@
 package com.arsdigita.persistence;
 
 import com.arsdigita.persistence.metadata.ObjectType;
+import com.redhat.persistence.metadata.Property;
 
 /**
  *  Adapter to make a data query look
@@ -97,6 +98,14 @@
     public DataQueryDataCollectionAdapter(String queryName,
                                           String dataObjectProperty) {
         super(queryName);
+        // SF patch [ 1160550 ] BugFix in DataQueryDomainCollectionAdapter
+        // populate object type prior to first call to next()
+        // essential if you need to filter DataCollection with PermissionService.filterObjects()
+        com.redhat.persistence.metadata.ObjectType type = SessionManager.getSession().getRoot().getObjectType(queryName);
+        Property prop = type.getProperty(dataObjectProperty);
+        String propertyType = prop.getType().getQualifiedName();
+        m_type = SessionManager.getMetadataRoot().getObjectType(propertyType);
+
         if (dataObjectProperty == null) { dataObjectProperty = ""; }
         m_dataObjectProperty = dataObjectProperty;

[Aplaws-commit] r901 - in trunk: ccm-cms/src/com/arsdigita/cms ccm-cms/src/com/arsdigita/cms/dispatcher ccm-cms/src/com/arsdigita/cms/ui ccm-core/src/com/arsdigita/bebop/form ccm-core/web/packages/bebop/xsl

From: <ap...@vh...> - 2005-09-22 05:48:30

Author: apevec
Date: 2005-09-22 07:39:04 +0200 (Thu, 22 Sep 2005)
New Revision: 901

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
   trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
   trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemDispatcher.java
   trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSDHTMLEditor.java
   trunk/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java
   trunk/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java
   trunk/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl
Log:
SF patch [ 1177590 ] Option to remove buttons from HTMLArea
    patch was against older version  of HTMLArea, hopefuly it works with the upgraded version we have now
This patch also includes:
 CategoryForm fix from [ 1165196 ] Linked Cat Form - bug fix and ordering change
and  "give-a-chance-to-login" fix in ItemDispatcher


Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java	2005-09-22 05:39:04 UTC (rev 901)
@@ -84,6 +84,7 @@
     private final Parameter m_useStreamlinedCreation;
     private final Parameter m_dhtmlEditorConfig;
     private final Parameter m_dhtmlEditorPlugins;
+	private final Parameter m_dhtmlEditorHiddenButtons;
     private final Parameter m_hideTemplatesTab;
     private final Parameter m_hideAdminTabs;
     private final Parameter m_hideTimezone;
@@ -195,6 +196,11 @@
              Parameter.OPTIONAL,
              null);
 
+		m_dhtmlEditorHiddenButtons = new StringArrayParameter
+				   ("com.arsdigita.cms.dhtml_editor_hidden_buttons",
+					Parameter.OPTIONAL,
+					null);
+					
         m_hideTemplatesTab = new BooleanParameter
             ("com.arsdigita.cms.hide_templates_tab",
              Parameter.REQUIRED, new Boolean(false));
@@ -270,6 +276,7 @@
         register(m_useStreamlinedCreation);
         register(m_dhtmlEditorConfig);
         register(m_dhtmlEditorPlugins);
+        register(m_dhtmlEditorHiddenButtons);
         register(m_hideTemplatesTab);
         register(m_hideAdminTabs);
         register(m_hideTimezone);
@@ -354,6 +361,10 @@
         return (String[])get(m_dhtmlEditorPlugins);
     }
 
+	public final String[] getDHTMLEditorHiddenButtons() {
+		   return (String[])get(m_dhtmlEditorHiddenButtons);
+	 }
+	   
     public final boolean getHideTemplatesTab() {
         return ((Boolean) get(m_hideTemplatesTab)).booleanValue();
     }

Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties	2005-09-22 05:39:04 UTC (rev 901)
@@ -103,6 +103,11 @@
 com.arsdigita.cms.dhtml_editor_plugins.example=TableOperations,CSS
 com.arsdigita.cms.dhtml_editor_plugins.format=[string,string,string]
 
+com.arsdigita.cms.dhtml_editor_hidden_buttons.title=DHTML Editor buttons to hide 
+com.arsdigita.cms.dhtml_editor_hidden_buttons.purpose=Prevent undesirable functions from being made available, eg images should only be added through the cms, not the html area
+com.arsdigita.cms.dhtml_editor_hidden_buttons.example=insertimage
+com.arsdigita.cms.dhtml_editor_hidden_buttons.format=[string,string,string]
+
 com.arsdigita.cms.default_notification_time.title=Default Notification Time (Hours)
 com.arsdigita.cms.default_notification_time.purpose=Amount of time (in hours) before the expiration of a content item that users in the Alert Recipient role are alerted via email
 com.arsdigita.cms.default_notification_time.example=0

Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemDispatcher.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemDispatcher.java	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemDispatcher.java	2005-09-22 05:39:04 UTC (rev 901)
@@ -26,9 +26,12 @@
 import com.arsdigita.dispatcher.ChainedDispatcher;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.dispatcher.RequestContext;
+import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.ACSObjectCache;
+import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.User;
 import com.arsdigita.versioning.Transaction;
+import com.arsdigita.web.LoginSignal;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Date;
@@ -243,7 +246,11 @@
                                              item);
             }
         }
-
+	// chr...@we... -  if user is not logged in, give them a chance to do that, else show them the door
+	Party user = Kernel.getContext().getParty();
+	if (!hasPermission && user == null) {
+		throw new LoginSignal(request);
+	}
         if( !hasPermission )
             throw new com.arsdigita.dispatcher.AccessDeniedException();
 

Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSDHTMLEditor.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSDHTMLEditor.java	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSDHTMLEditor.java	2005-09-22 05:39:04 UTC (rev 901)
@@ -29,19 +29,20 @@
     public CMSDHTMLEditor(String name) {
         super(new StringParameter(name),
               ContentSection.getConfig().getDHTMLEditorConfig());
+        addPlugins();
+        hideButtons();
         
-        String[] plugins = ContentSection.getConfig().getDHTMLEditorPlugins();
-        if (plugins != null) {
-            for (int i = 0 ; i < plugins.length ; i++) {
-                addPlugin(plugins[i]);
-            }
-        }
     }
 
     public CMSDHTMLEditor(ParameterModel model) {
         super(model, 
               ContentSection.getConfig().getDHTMLEditorConfig());
 
+       addPlugins();
+       hideButtons();
+    }
+    
+    private void addPlugins() {
         String[] plugins = ContentSection.getConfig().getDHTMLEditorPlugins();
         if (plugins != null) {
             for (int i = 0 ; i < plugins.length ; i++) {
@@ -50,4 +51,13 @@
         }
     }
 
+    private void hideButtons() {
+		String[] hiddenButtons = ContentSection.getConfig().getDHTMLEditorHiddenButtons();
+		if (hiddenButtons != null) {
+			for (int i = 0 ; i < hiddenButtons.length ; i++) {
+				hideButton(hiddenButtons[i]);
+			}
+		}
+    }
+
 }

Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java	2005-09-22 05:39:04 UTC (rev 901)
@@ -62,7 +62,10 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;
+import java.util.SortedMap;
 import java.util.TooManyListenersException;
+import java.util.TreeMap;
 
 /**
  * This is an abstract class which displays the category assignment UI.
@@ -212,75 +215,76 @@
     }
 
     // A print listener which populates the listbox with all
-    // unassigned categories
+ 	// unassigned categories, apart from result of getExcludedCategory()
+ 	// (if not null), and the root category.
+ 	// Ordering is alphabetical based on qualified path, so entries are
+ 	// ordered like a tree with all nodes expanded.
+ 	// Ideally ordering should be like an expanded tree but based on 
+ 	// the sortkey order of the categories. However, I don't know
+ 	// if it would be possible to write a comparison function that
+ 	// could do this efficiently, and I'm not even going to try
+ 	// chr...@we...
     //
-    // WARNING: This method is currently slow. It should be
-    // optimized to do a connect by query that excludes all
-    // categories which are already assigned.
     private class FreePrintListener implements PrintListener {
 
         public void prepare(PrintEvent e) {
-            OptionGroup o = (OptionGroup)e.getTarget();
+ 
+ 			OptionGroup target = (OptionGroup) e.getTarget();
             PageState state = e.getPageState();
             Category root = getRootCategory(state);
-            if(root == null)
+ 			if (root == null) {
                 return;
-            Category excluded = getExcludedCategory(state);
+ 			}
 
-            // Breadth-first traversal of the teee
-            CategoryTreeModelLite model = new CategoryTreeModelLite(root);
-            CategoryMap assigned = getAssignedCategories(state);
-            LinkedList queue = new LinkedList(), nameQueue = new LinkedList();
-
-            if (root.isAbstract()) {
-                queue.addLast(model.getRoot(state));
-                nameQueue.addLast("");
-            } else {
-                queue.addLast(new DataQueryTreeNode
-                              (root.getID(), root.getName(), true));
-                nameQueue.addLast(root.getName());
-            }
-            while(!queue.isEmpty()) {
-                DataQueryTreeNode node = (DataQueryTreeNode)queue.removeFirst();
-                String name = (String)nameQueue.removeFirst();
-
-                // Process the node
-                String id = (String)node.getKey();
-
-                // Process the node unless:
-                // The category is assigned
-                // The category's name is empty (meaning that it's the root)
-                // The category should be excluded
-                if(excluded == null ||
-                   !excluded.getID().toString().equals(id)) {
-                    if(!assigned.containsKey(id) && name.length() > 0 &&
-                       !Boolean.TRUE.equals((Boolean)node.getValue
-                                            (Category.IS_ABSTRACT)) &&
-                       !id.equals(root.getID().toString())) {
-                        o.addOption(new Option(id, name));
-                    }
-
-                    if (model.hasChildren(node, state)) {
-                        // Append children
-                        for(Iterator i = model.getChildren(node, state); i.hasNext(); ) {
-                            TreeNode n = (TreeNode)i.next();
-                            queue.addLast(n);
-                            StringBuffer nameBuf = new StringBuffer(name);
-                            if(name.length() > 0) {
-                                nameBuf.append(SEPARATOR);
+ 			// exclude children of the excluded category (as per javadoc on 
+ 			// getExcludedCategory() method. This prevents attempts
+ 			// to create circular category graph (which causes
+ 			// exception in Category during addMapping if not checked here
+			Category excludedCat = getExcludedCategory(state);
+ 			CategoryMap excluded = new CategoryMap();
+ 			if (excludedCat != null) 
+				{CategoryCollection excludedSubTree =getExcludedCategory(state).getDescendants();
+ 				while (excludedSubTree.next()) {
+ 					excluded.add(excludedSubTree.getCategory());
                             }
-                            nameBuf.append(n.getElement());
-                            nameQueue.addLast(nameBuf.toString());
                         }
+ 			CategoryMap assigned = getAssignedCategories(state);
+ 			SortedMap sortedCats = new TreeMap();
+ 			CategoryCollection children = root.getDescendants();
+ 			while (children.next()) {
+ 				Category cat = children.getCategory();
+ 				sortedCats.put(cat.getQualifiedName(SEPARATOR, true),cat.getID().toString());
+ 
                     }
+ 
+ 			Iterator it = sortedCats.entrySet().iterator();
+ 			Map.Entry entry;
+ 			String path;
+ 			String id;
+ 			boolean notExcluded;
+ 			boolean notAlreadyAssigned;
+ 			boolean notRoot;
+ 
+ 			while (it.hasNext()) {
+ 				entry = (Map.Entry)it.next();
+ 				path = (String) entry.getKey();
+ 				id = (String) entry.getValue();
+ 
+ 				notExcluded = (excluded == null || !excluded.containsKey(id));
+ 				notAlreadyAssigned = !assigned.containsKey(id);
+ 				notRoot = !id.equals(root.getID().toString());
+ 
+ 				if (notExcluded && notAlreadyAssigned && notRoot) {
+ 					target.addOption(new Option(id, path));
                 }
 
             }
 
-            addFillerOption(o);
+ 			addFillerOption(target);
         }
     }
 
+
     /**
      * Populate a {@link CategoryMap} with all categories which are assigned to
      * the item. Child classes should override this method to do the right thing.

Modified: trunk/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java	2005-09-22 05:39:04 UTC (rev 901)
@@ -114,6 +114,7 @@
 
     private Config m_config;
     private Set m_plugins;
+    private Set m_hiddenButtons;
 
     public DHTMLEditor(String name) {
         this(new StringParameter(name));
@@ -128,6 +129,7 @@
         super(model);
         m_config = config;
         m_plugins = new HashSet();
+        m_hiddenButtons = new HashSet();
     }
 
     /**
@@ -144,6 +146,14 @@
     public void addPlugin(String name) {
         m_plugins.add(name);
     }
+    /**
+     * Prevent the specified button from being displayed in the editor toolbar
+     * @param name name of the button, as specified in the btnList of the htmlarea.js file
+     * 
+     */
+    public void hideButton(String name) {
+    	m_hiddenButtons.add(name);
+    }
 
     /**
      *      Sets the <tt>ROWS</tt> attribute for the <tt>TEXTAREA</tt> tag.
@@ -217,7 +227,18 @@
         if (m_config.getPath() != null) {
             config.addAttribute("path", m_config.getPath());
         }
+        if (m_hiddenButtons.size() > 0) {
         
+        	StringBuffer hiddenButtons = new StringBuffer();
+       		// list must start and end with a space
+        	hiddenButtons.append(" ");
+        	Iterator hidden = m_hiddenButtons.iterator();
+        	while (hidden.hasNext()) {
+        		hiddenButtons.append(hidden.next());
+        		hiddenButtons.append(" ");
+        	}
+        	config.addAttribute("hidden-buttons", hiddenButtons.toString());
+        }
         Iterator plugins = m_plugins.iterator();
         while (plugins.hasNext()) {
             String name = (String)plugins.next();

Modified: trunk/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl
===================================================================
--- trunk/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl	2005-09-22 04:57:12 UTC (rev 900)
+++ trunk/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl	2005-09-22 05:39:04 UTC (rev 901)
@@ -73,6 +73,9 @@
                   "inserthorizontalrule", "insertlink", "insertimage", "inserttable", "htmlmode", "separator",
                   "popupeditor", "separator" ]
             ];
+       <xsl:if test="bebop:config/@hidden-buttons">
+           config_<xsl:value-of select="@name"/>.hideSomeButtons("<xsl:value-of select="bebop:config/@hidden-buttons"/>");
+       </xsl:if>
 	    editor_<xsl:value-of select="@name"/>.config.pageStyle = "@import url(/assets/htmlarea/htmlarea.css);";
 
             <xsl:for-each select="bebop:plugin">

[Aplaws-commit] r900 - in trunk: ccm-cms/src/com/arsdigita/cms/ui/portlet ccm-core/src/com/arsdigita/bebop/portal ccm-core/src/com/arsdigita/portal/apportlet

From: <ap...@vh...> - 2005-09-22 05:06:37

Author: apevec
Date: 2005-09-22 06:57:12 +0200 (Thu, 22 Sep 2005)
New Revision: 900

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java
   trunk/ccm-core/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java
   trunk/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java
   trunk/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java
   trunk/ccm-core/src/com/arsdigita/portal/apportlet/TimestampCachingPortletRenderer.java
Log:
SF patch [ 1178475 ] Allow cached portlet XML to be invalidated across hosts


Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java	2005-09-22 04:15:27 UTC (rev 899)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java	2005-09-22 04:57:12 UTC (rev 900)
@@ -69,10 +69,10 @@
                        SimpleXMLGenerator.ADAPTER_CONTEXT );
     }
 
-    public Object getCacheKey() {
+    public String getCacheKey(PageState state) {
         ContentItem item = m_portlet.getContentItem();
         if( null == item ) return null;
-        if( item.isLive() ) return item.getPublicVersion().getOID();
+        if( item.isLive() ) return item.getPublicVersion().getOID().toString();
 
         // Don't cache it if it's not live
         return null;
@@ -81,7 +81,7 @@
     // For a given cache key a contnet item is *never* dirty,
     // since upon republishing of a live item, the item_id
     // changes!
-    public boolean isDirty() {
+    public boolean isDirty(PageState state) {
         return false;
     }
 

Modified: trunk/ccm-core/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java	2005-09-22 04:15:27 UTC (rev 899)
+++ trunk/ccm-core/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java	2005-09-22 04:57:12 UTC (rev 900)
@@ -19,6 +19,7 @@
 package com.arsdigita.bebop.portal;
 
 import com.arsdigita.bebop.PageState;
+import com.arsdigita.caching.CacheTable;
 import com.arsdigita.xml.Element;
 import java.util.HashMap;
 import java.util.Collections;
@@ -48,12 +49,17 @@
  */
 public abstract class AbstractPortletRenderer extends Portlet {
     // PortletRenderer renderer => Element root
-    private static Map s_cachedXMLMap =
-        Collections.synchronizedMap(new HashMap());
+    // use a cachetable to enable cached versions to be invalidated across nodes
+    private static CacheTable s_cachedXMLMap = new CacheTable("portletXML");
 
     // Portlet portlet => Date dateCached.  Note that we choose not
     // to use a synchronized map, since a race here wouldn't matter
     // much.
+    //
+    // cg - no need to use a CacheTable here - if xml for a given key has been invalidated in s_cachedXMLMap
+    // then makeXML will be invoked on all nodes individually when they 
+    // are next asked to render the portlet and the local date entries overwritten at that time
+    // 
     private static Map s_dateCachedMap =
         Collections.synchronizedMap(new HashMap());
 
@@ -77,7 +83,7 @@
 
     private Element makeXML(PageState state) {
         Element holder = new Element("holder");
-        setDateCached(new Date());
+        setDateCached(new Date(), state);
         
         generateXMLBody(state, holder);
         generateChildrenXML(state, holder);
@@ -85,10 +91,10 @@
     }
 
     public void generateXML(PageState state, Element parent) {
-        Object key = getCacheKey();
+        String key = getCacheKey(state);
         Element xml;
 
-        if (isDirty()) {
+        if (isDirty(state)) {
             xml = makeXML(state);
             s_cachedXMLMap.put(key, xml);
         }
@@ -111,28 +117,40 @@
     }
 
     /**
-     * Developer's may use this method to implement cacheing of a
-     * portlet's content.  Portlet's default implementation always
-     * returns true.
+     * Invalidate cached version of XML output for this portlet 
+     * across all nodes. 
+     * 
+     * This can be invoked when a portlet is edited on one node eg.
+     * 
+     * <pre>
+     * protected void processWidgets(PageState state, Portlet portlet)
+     *        throws FormProcessException {
+     * 
+     * 
+     * ExamplePortlet myportlet = (ExamplePortlet) portlet;
+     *        
+     * update portlet data 
+     *     
+     * myportlet.getPortletRenderer().invalidateCachedVersion(state);
+     * 
+     * }    
+     * 
+     * </pre>
      *
-     * @return whether or not the portlet's content is dirty and must
-     * be regenerated.
+     * @param state
      */
-    public boolean isDirty() {
-        return true;
+    public void invalidateCachedVersion(PageState state) {
+        s_cachedXMLMap.remove(getCacheKey(state));
     }
 
-    public Object getCacheKey() {
-        return null;
-    }
-
     // Can return null.
-    public Date getDateCached() {
-        return (Date) s_dateCachedMap.get(getCacheKey());
+    public Date getDateCached(PageState state) {
+        return (Date) s_dateCachedMap.get(getCacheKey(state));
     }
 
     // Can take null.
-    private void setDateCached(Date dateCached) {
-        s_dateCachedMap.put(getCacheKey(), dateCached);
+    private void setDateCached(Date dateCached, PageState state) {
+        s_dateCachedMap.put(getCacheKey(state), dateCached);
     }
+
 }

Modified: trunk/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java	2005-09-22 04:15:27 UTC (rev 899)
+++ trunk/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java	2005-09-22 04:57:12 UTC (rev 900)
@@ -209,11 +209,20 @@
 
     // For PortletRenderer interface.
 
-    public boolean isDirty() {
+    public boolean isDirty(PageState state) {
         return true;
     }
 
-    public Object getCacheKey() {
-        return null;
+    public String getCacheKey(PageState state) {
+        // cannot return null, as CacheTable doesn't like it
+        return "";
     }
+
+    /*
+     * @see com.arsdigita.bebop.portal.PortletRenderer#invalidateCachedVersion(com.arsdigita.bebop.PageState)
+     */
+    public void invalidateCachedVersion(PageState state) {
+        // to be implemented in the class that implements the cache
+    }
+
 }

Modified: trunk/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java	2005-09-22 04:15:27 UTC (rev 899)
+++ trunk/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java	2005-09-22 04:57:12 UTC (rev 900)
@@ -67,7 +67,55 @@
      */
     void generateXML(PageState pageState, Element parentElement);
 
-    boolean isDirty();
+    /**
+     * Developers of portlets may specify the rules that decide if the cached version 
+     * of the portlet output is considered to be out of date, and it's attributes must be
+     * refreshed from the database. 
+     * 
+     * Implementing this method 
+     * and getCacheKey can save trips to the database to retrieve a particular 
+     * portlet's attributes
+     * 
+     * @param pageState the PageState of the current request.
+     * @return true if the portlet must be refreshed, false if cached version is still valid
+     */
+    boolean isDirty(PageState state);
+    /**
+     * Key for lookup of cached generated XML. Implementing this method 
+     * and isDirty can save trips to the database to retrieve a particular 
+     * portlet's attributes.
+     * 
+     * PageState argument allows stateful portlets to cache particular states. Treat with caution. 
+     * For example avoid the condition where all cached states are dirty, but 
+     * a check on one state leads to refresh of output for that state, and subsequent checks 
+     * for isDirty on other states return false. This can be avoided by ensuring that isDirty is 
+     * dependent on the particular state being checked eg - a check on the cached time of the cached xml
+     * or by overriding invalidateCachedVersion to discard all cached states
+     * 
+     * Also, ensure that you don't use the entire state as a key - the container can retrieve state defining information
+     * such as a page number or name of visible component from the components and use that as key 
+     * 
+     * If you are not caching a stateful portlet, ignore the PageState argument.
+     * 
+     * nb - in this revision, return type has been restricted to String from Object in order that 
+     * rendered output may  be cached in a CacheTable in order that cached version may be 
+     * invalidated across all nodes if edited on one node
+     * 
+     * (chr...@we...)
+     * 
+     * @param pageState the PageState of the current request.
+     * @return a key for the cache entry nb - while this is often a string representation of 
+     * a portlet id, it is not necessarily so - eg content item portlet cached by item id, so 
+     * several portlets may share the same cached XML
+     */
+    String getCacheKey(PageState state);
+    
+    /**
+     * remove cached version of this portletRenderer's output. 
+     * Implementors should ensure that the cached version is invalidated across all nodes
+     * for example by using a com.arsdigita.caching.CacheTable for the cache
+     * @param state
+     */
+    void invalidateCachedVersion(PageState state);
 
-    Object getCacheKey();
 }

Modified: trunk/ccm-core/src/com/arsdigita/portal/apportlet/TimestampCachingPortletRenderer.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/portal/apportlet/TimestampCachingPortletRenderer.java	2005-09-22 04:15:27 UTC (rev 899)
+++ trunk/ccm-core/src/com/arsdigita/portal/apportlet/TimestampCachingPortletRenderer.java	2005-09-22 04:57:12 UTC (rev 900)
@@ -18,6 +18,7 @@
  */
 package com.arsdigita.portal.apportlet;
 
+import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.portal.AbstractPortletRenderer;
 import com.arsdigita.portal.Portlet;
 import java.util.Date;
@@ -39,8 +40,8 @@
         m_portlet = portlet;
     }
 
-    public boolean isDirty() {
-        Date cached = getDateCached();
+    public boolean isDirty(PageState state) {
+        Date cached = getDateCached(state);
         Date timestamp = getTimestamp();
 
         if (cached == null || timestamp == null) {
@@ -51,8 +52,8 @@
         }
     }
 
-    public Object getCacheKey() {
-        return m_portlet.getID();
+    public String getCacheKey(PageState state) {
+        return m_portlet.getID().toString();
     }
 
     public abstract Date getTimestamp();

[Aplaws-commit] r899 - in trunk/ccm-ldn-portal: . src/com/arsdigita/london/portal src/com/arsdigita/london/portal/ui

From: <ap...@vh...> - 2005-09-22 04:24:57

Author: apevec
Date: 2005-09-22 06:15:27 +0200 (Thu, 22 Sep 2005)
New Revision: 899

Modified:
   trunk/ccm-ldn-portal/application.xml
   trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java
   trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java
   trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties
   trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java
Log:
SF patch [ 1185913 ] Restrict available portlet types
    Two initialisation parameters:
    com.arsdigita.london.portal.excluded_portlet_types and
    com.arsdigita.london.portal.admin_only_portlet_types
    They prevent specified types from appearing in the drop down lists. The values are string arrays of portlet application type object types.


Modified: trunk/ccm-ldn-portal/application.xml
===================================================================
--- trunk/ccm-ldn-portal/application.xml	2005-09-22 03:20:38 UTC (rev 898)
+++ trunk/ccm-ldn-portal/application.xml	2005-09-22 04:15:27 UTC (rev 899)
@@ -3,11 +3,12 @@
   name="ccm-ldn-portal"
   prettyName="Portal"
   version="1.4.3"
-  release="1"
+  release="2"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.1.2"/>
     <ccm:requires name="ccm-cms" version="6.1.2"/>
+    <ccm:requires name="ccm-ldn-subsite" version="1.4.2"/>
     <ccm:requires name="ccm-forum" version="1.4.2" relation="ge"/>
     <ccm:requires name="ccm-ldn-navigation" version="1.4.5"/>
     <ccm:requires name="ccm-ldn-rss" version="1.4.2"/>

Modified: trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java
===================================================================
--- trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java	2005-09-22 03:20:38 UTC (rev 898)
+++ trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java	2005-09-22 04:15:27 UTC (rev 899)
@@ -63,6 +63,12 @@
 
     public static final String PAGES = "pages";
 
+    /**
+     * store this as a static variable as it cannot change during the lifetime of the ccm service
+     */
+    private static Workspace defaultHomepageWorkspace = null;
+    
+
     public Workspace(DataObject obj) {
         super(obj);
     }
@@ -149,6 +155,37 @@
         return workspace;
     }
 
+    /**
+     * 
+     * retrieve the workspace that is created during loading of the ccm-ldn-portal application and 
+     * is set as the defaultworkspace for the site. 
+     * 
+     * Returns null if there are no workspaces (though presumably if that is the case, ccm-ldn-portal
+     * hasn't been loaded and so I don't know how you are invoking this method!)
+     * 
+     * @return
+     */
+    public static Workspace getDefaultHomepageWorkspace() {
+        if (null == defaultHomepageWorkspace) {
+            // default homepage workspace is created during com.arsdigita.london.portal.Loader
+            // it's attributes are all load variables that are lost as soon as the application
+            // is loaded. So, finding the default homepage workspace is a bit tricky - can't filter on name
+            // or anything else that is site specific - best bet is to assume 
+            // that it is the first workspace created (a reasonable assumption at the moment because
+            // it is created straight after the Workspace application type is created.
+            WorkspaceCollection workspaces = Workspace.retrieveAll();
+            workspaces.addOrder(Application.TIMESTAMP);
+            if (workspaces.next()) {
+                defaultHomepageWorkspace = workspaces.getWorkspace();
+            }
+            workspaces.close();
+            
+            
+        }
+        return defaultHomepageWorkspace;
+        
+    }
+
     public void beforeSave() {
         // If no permissions are configured, then setup empty groups
         if (get(PARTY) == null) {

Modified: trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java
===================================================================
--- trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java	2005-09-22 03:20:38 UTC (rev 898)
+++ trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java	2005-09-22 04:15:27 UTC (rev 899)
@@ -22,14 +22,20 @@
 
 import com.arsdigita.util.parameter.BooleanParameter;
 import com.arsdigita.util.parameter.Parameter;
+import com.arsdigita.util.parameter.StringArrayParameter;
 import com.arsdigita.util.parameter.URLParameter;
 import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.util.UncheckedWrapperException;
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.lang.reflect.Array;
 import java.net.URL;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 
@@ -41,6 +47,8 @@
     private URLParameter m_adapters;
     private StringParameter m_defaultLayout;
     private BooleanParameter m_createUserWorkspaces;
+    private Parameter m_excludedPortletTypes;
+    private Parameter m_adminPortletTypes;
 
     public WorkspaceConfig() {
         try {
@@ -63,10 +71,16 @@
              Parameter.REQUIRED,
              Boolean.TRUE);
 
+        m_excludedPortletTypes = new StringArrayParameter
+            ("com.arsdigita.london.portal.excluded_portlet_types", Parameter.OPTIONAL, new String[0]);
+        m_adminPortletTypes = new StringArrayParameter
+            ("com.arsdigita.london.portal.admin_only_portlet_types", Parameter.OPTIONAL, new String[0]);
+
         register(m_adapters);
         register(m_defaultLayout);
-	register(m_createUserWorkspaces);
-
+        register(m_createUserWorkspaces);
+        register(m_excludedPortletTypes);
+        register(m_adminPortletTypes);
         loadInfo();
     }
 
@@ -83,6 +97,17 @@
     }
 
     public boolean getCreateUserWorkspaces() {
-	return ((Boolean)get(m_createUserWorkspaces)).booleanValue();
+        return ((Boolean)get(m_createUserWorkspaces)).booleanValue();
     }
+    
+    public List getExcludedPortletTypes() {
+        String[] excludedTypes = (String[])get(m_excludedPortletTypes);
+        return Arrays.asList(excludedTypes);
+    }
+
+    public List getAdminPortletTypes() {
+       String[] adminTypes = (String[])get(m_adminPortletTypes);
+       return Arrays.asList(adminTypes);
+   }
+
 }

Modified: trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties
===================================================================
--- trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties	2005-09-22 03:20:38 UTC (rev 898)
+++ trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties	2005-09-22 04:15:27 UTC (rev 899)
@@ -13,3 +13,12 @@
 com.arsdigita.london.portal.create_user_workspaces.format=[boolean]
 com.arsdigita.london.portal.create_user_workspaces.example=false
 
+com.arsdigita.london.portal.excluded_portlet_types.title=Portlet types not available on this site
+com.arsdigita.london.portal.excluded_portlet_types.purpose=Prevent these type appearing in the drop down list of portlets to add to the page
+com.arsdigita.london.portal.excluded_portlet_types.format=[string,string,string]
+com.arsdigita.london.portal.excluded_portlet_types.example=com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet,com.arsdigita.london.portal.portlet.TimeOfDayPortlet
+
+com.arsdigita.london.portal.admin_only_portlet_types.title=Portlet types only available to page admin
+com.arsdigita.london.portal.admin_only_portlet_types.purpose=Only available to administrator of homepage, or subsite frontpage
+com.arsdigita.london.portal.admin_only_portlet_types.format=[string,string,string]
+com.arsdigita.london.portal.admin_only_portlet_types.example=com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet,com.arsdigita.london.portal.portlet.TimeOfDayPortlet

Modified: trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java
===================================================================
--- trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java	2005-09-22 03:20:38 UTC (rev 898)
+++ trunk/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java	2005-09-22 04:15:27 UTC (rev 899)
@@ -19,23 +19,38 @@
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.form.SingleSelect;
 import com.arsdigita.bebop.form.Submit;
+
+import java.util.List;
 import java.util.TooManyListenersException;
 import com.arsdigita.bebop.parameters.NotNullValidationListener;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.PrintListener;
 import com.arsdigita.bebop.form.OptionGroup;
 import com.arsdigita.bebop.event.PrintEvent;
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.User;
+import com.arsdigita.kernel.permissions.PermissionDescriptor;
+import com.arsdigita.kernel.permissions.PermissionService;
+import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
+import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.london.subsite.Subsite;
+import com.arsdigita.persistence.Filter;
 import com.arsdigita.portal.PortletTypeCollection;
 import com.arsdigita.portal.PortletType;
+import com.arsdigita.web.Application;
 import com.arsdigita.bebop.form.Option;
 import com.arsdigita.bebop.SimpleContainer;
+
 import java.math.BigDecimal;
 
+import org.apache.log4j.Logger;
+
 public class PortletTypeForm extends Form {
 
     private Label m_portletTypeLabel;
     private SingleSelect m_portletType;
     private Submit m_submit;
+    private static Logger s_log = Logger.getLogger(PortletTypeForm.class);
 
     private PrintListener m_portletTypePrintListener = new PrintListener() {
             public void prepare(PrintEvent e) {
@@ -45,8 +60,39 @@
                 
                 PortletTypeCollection portletTypes = 
                     PortletType.retrieveAllPortletTypes();
+                List excludedTypes = Workspace.getConfig().getExcludedPortletTypes();
+                if (!excludedTypes.isEmpty()) {
+                    Filter excludedTypesFilter =
+                    portletTypes.addFilter(Application.OBJECT_TYPE + " not in :nonDisplayTypes");
+                    excludedTypesFilter.set("nonDisplayTypes", excludedTypes);
+                }
+                User thisUser = (User) Kernel.getContext().getParty();
+                if (thisUser == null) {
+                    // can't actually happen, as user must be logged in at the point when the page with this portal in edit mode was requested 
+                    thisUser = Kernel.getPublicUser();
+                }
+                Workspace mainWorkspace;
+                if (Subsite.getContext().hasSite()) {
+                    mainWorkspace =    (Workspace) Subsite.getContext().getSite().getFrontPage();
+                } else {
+                    mainWorkspace = Workspace.getDefaultHomepageWorkspace();
+                }
+
+                PermissionDescriptor admin = new PermissionDescriptor(
+                    PrivilegeDescriptor.ADMIN,
+                    mainWorkspace,
+                    thisUser);
+                if (PermissionService.checkPermission(admin)) {
+                    s_log.debug(thisUser.getName() + " has admin rights on the current workspace");
+                } else {
+                    s_log.debug(thisUser.getName() + " cannot administer the current main workspace");
+                    List adminTypes = Workspace.getConfig().getAdminPortletTypes();
+                    if (!adminTypes.isEmpty()) {
+                        Filter adminTypesFilter = portletTypes.addFilter(Application.OBJECT_TYPE + " not in :adminTypes");
+                        adminTypesFilter.set("adminTypes", adminTypes);
+                    }
+                }
                 portletTypes.addOrder("title");
-
                 while (portletTypes.next()) {
                     PortletType portletType = portletTypes.getPortletType();
                     Option option = new Option

[Aplaws-commit] r898 - trunk/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher

From: <ap...@vh...> - 2005-09-22 03:30:00

Author: apevec
Date: 2005-09-22 05:20:38 +0200 (Thu, 22 Sep 2005)
New Revision: 898

Modified:
   trunk/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java
Log:
SF patch [ 1194553 ] Patch for SiteProxy bug 1194549


Modified: trunk/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java
===================================================================
--- trunk/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java	2005-09-22 03:07:25 UTC (rev 897)
+++ trunk/ccm-cms-types-siteproxy/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java	2005-09-22 03:20:38 UTC (rev 898)
@@ -31,6 +31,10 @@
 import com.arsdigita.xml.Element;
 import com.arsdigita.xml.Document;
 import org.apache.log4j.Logger;
+import javax.servlet.http.*;
+import java.util.*;
+import java.net.*;
+import java.io.*;
 
 
 /**
@@ -86,7 +90,7 @@
 
             ContentSection section = CMS.getContext().getContentSection();
             SiteProxy item = (SiteProxy)getContentItem(state);
-            String url = item.getURL();
+            String url = passParameters(state.getRequest(), item.getURL());
             
             URLData data = s_fetcher.fetchURLData(url, s_cacheServiceKey);
             if (data == null) {
@@ -152,4 +156,31 @@
             }
         }
     }
+
+    private String passParameters(HttpServletRequest request, String url){
+        StringBuffer sb = new StringBuffer(url);
+        String enc = request.getCharacterEncoding();
+        if (enc == null) enc = "UTF-8";
+        Enumeration en = request.getParameterNames();
+        while (en.hasMoreElements()){
+            String paramName = (String) en.nextElement();
+            String[] paramValues = request.getParameterValues(paramName);
+            for(int i=0; i<paramValues.length; ++i) {
+                if (sb.indexOf("?") < 0) {
+                    sb.append("?");
+                } else {
+                    sb.append("&");
+                }
+                sb.append(paramName).append("=");
+                try {
+                    sb.append(URLEncoder.encode(paramValues[i], enc));
+                } catch (UnsupportedEncodingException ex) {
+                    s_log.error("Unable to encode SiteProxy request", ex);
+                    return url;
+                }
+            }
+        }
+        return sb.toString();
+    }
+	
 }

[Aplaws-commit] r897 - in trunk: ccm-auth-http/web/WEB-INF ccm-core/web/WEB-INF ccm-formbuilder-pdf/web/WEB-INF ccm-forum/web/WEB-INF ccm-ldn-aplaws/bundles/camden/cfg ccm-ldn-aplaws/bundles/complete/cfg ccm-ldn-aplaws/web/WEB-INF ccm-ldn-atoz/web/WEB-INF ccm-ldn-rss/web/WEB-INF ccm-ldn-search/web/WEB-INF ccm-ldn-shortcuts/web/WEB-INF ccm-ldn-subsite/web/WEB-INF ccm-ldn-terms/web/WEB-INF ccm-ldn-theme/web/WEB-INF ccm-simplesurvey/web/WEB-INF tools/tools/server/tomcat/conf

From: <ap...@vh...> - 2005-09-22 03:16:58

Author: apevec
Date: 2005-09-22 05:07:25 +0200 (Thu, 22 Sep 2005)
New Revision: 897

Modified:
   trunk/ccm-auth-http/web/WEB-INF/web.xml
   trunk/ccm-core/web/WEB-INF/web.xml-default
   trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml
   trunk/ccm-forum/web/WEB-INF/web.xml
   trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml
   trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
   trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
   trunk/ccm-ldn-atoz/web/WEB-INF/web.xml
   trunk/ccm-ldn-rss/web/WEB-INF/web.xml
   trunk/ccm-ldn-search/web/WEB-INF/web.xml
   trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml
   trunk/ccm-ldn-subsite/web/WEB-INF/web.xml
   trunk/ccm-ldn-terms/web/WEB-INF/web.xml
   trunk/ccm-ldn-theme/web/WEB-INF/web.xml
   trunk/ccm-simplesurvey/web/WEB-INF/web.xml
   trunk/tools/tools/server/tomcat/conf/server-default.xml.in
   trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
Log:
SF patch [ 1205024 ] Patch for apache-tomcat connector in server.xml (AJP13)
SF patch [ 1221316 ] Aplaws with Tomcat 5 (taglibs in web.xml)


Modified: trunk/ccm-auth-http/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-auth-http/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-auth-http/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-core/web/WEB-INF/web.xml-default
===================================================================
--- trunk/ccm-core/web/WEB-INF/web.xml-default	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-core/web/WEB-INF/web.xml-default	2005-09-22 03:07:25 UTC (rev 897)
@@ -181,4 +181,16 @@
     <exception-type>java.lang.Error</exception-type>
     <location>/error/general.jsp</location>
   </error-page>
+
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -23,4 +23,15 @@
     <url-pattern>/Converter/</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-forum/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-forum/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-forum/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -23,4 +23,15 @@
     <url-pattern>/main/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -318,4 +318,15 @@
     <location>/error/404.jsp</location>
   </error-page>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -314,4 +314,15 @@
     <location>/error/general.jsp</location>
   </error-page>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
===================================================================
--- trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws	2005-09-22 03:07:25 UTC (rev 897)
@@ -293,4 +293,15 @@
     <location>/error/general.jsp</location>
   </error-page>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-atoz/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-atoz/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-atoz/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -28,4 +28,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-rss/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-rss/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-rss/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -32,4 +32,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-search/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-search/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-search/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -46,4 +46,16 @@
     <servlet-name>AxisServlet</servlet-name>
     <url-pattern>/services/*</url-pattern>
   </servlet-mapping>
+
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-subsite/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-subsite/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-subsite/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-terms/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-terms/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-terms/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -28,4 +28,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-theme/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-theme/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-theme/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -42,4 +42,15 @@
     <url-pattern>/theme-files/download/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-simplesurvey/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-simplesurvey/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-simplesurvey/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/tools/tools/server/tomcat/conf/server-default.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-default.xml.in	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/tools/tools/server/tomcat/conf/server-default.xml.in	2005-09-22 03:07:25 UTC (rev 897)
@@ -1,13 +1,23 @@
 <Server port="::shutdown-port::" shutdown="SHUTDOWN" debug="0">
   <!--
      - http-port => ::http-port::
+     - ajp-port => ::ajp-port::
      - shutdown-port => ::shutdown-port::
     -->
   <Service name="Tomcat-Standalone">
+
     <Connector className="org.apache.catalina.connector.http.HttpConnector"
       port="::http-port::" minProcessors="10" maxProcessors="20"
       enableLookups="true" redirectPort="8443"
       acceptCount="10" debug="0" connectionTimeout="60000"/>
+
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+      port="::ajp-port::" minProcessors="5" maxProcessors="75"
+      enableLookups="true" redirectPort="8443"
+      acceptCount="10" debug="0" connectionTimeout="0"
+      useURIValidationHack="false"
+      protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+
     <Engine name="Standalone::http-port::" defaultHost="localhost" debug="0">
       <Logger className="org.apache.catalina.logger.FileLogger"
         prefix="catalina." suffix=".log" directory="::log-dir::"

Modified: trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-devel.xml.in	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/tools/tools/server/tomcat/conf/server-devel.xml.in	2005-09-22 03:07:25 UTC (rev 897)
@@ -1,13 +1,23 @@
 <Server port="::shutdown-port::" shutdown="SHUTDOWN" debug="9">
   <!--
      - http-port => ::http-port::
+     - ajp-port => ::ajp-port::
      - shutdown-port => ::shutdown-port::
     -->
   <Service name="Tomcat-Standalone">
+
     <Connector className="org.apache.catalina.connector.http.HttpConnector"
       port="::http-port::" minProcessors="5" maxProcessors="20"
       enableLookups="true" redirectPort="8443"
       acceptCount="10" debug="9" connectionTimeout="60000"/>
+
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+      port="::ajp-port::" minProcessors="5" maxProcessors="75"
+      enableLookups="true" redirectPort="8443"
+      acceptCount="10" debug="9" connectionTimeout="0"
+      useURIValidationHack="false"
+      protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+
     <Engine name="Standalone::http-port::" defaultHost="localhost" debug="9">
       <Logger className="org.apache.catalina.logger.FileLogger"
         prefix="catalina." suffix=".log" directory="::log-dir::"

[Aplaws-commit] r896 - trunk/ccm-ldn-portal/web/packages/workspace/xsl

From: <ap...@vh...> - 2005-09-22 03:14:12

Author: apevec
Date: 2005-09-22 05:04:44 +0200 (Thu, 22 Sep 2005)
New Revision: 896

Modified:
   trunk/ccm-ldn-portal/web/packages/workspace/xsl/portlets.xsl
Log:
SF patch [ 1181342 ] Allow portlets to be packaged up as applications


Modified: trunk/ccm-ldn-portal/web/packages/workspace/xsl/portlets.xsl
===================================================================
--- trunk/ccm-ldn-portal/web/packages/workspace/xsl/portlets.xsl	2005-09-22 02:44:04 UTC (rev 895)
+++ trunk/ccm-ldn-portal/web/packages/workspace/xsl/portlets.xsl	2005-09-22 03:04:44 UTC (rev 896)
@@ -13,5 +13,5 @@
   <xsl:import href="workspace-directory-portlet.xsl"/>
   <xsl:import href="content-directory-portlet.xsl"/>
   <xsl:import href="../../../../ccm-forum/packages/forum/xsl/recent-postings-portlet.xsl"/>
-
+  <xsl:import href="/__ccm__/servlet/portlet-type/index.xsl"/>
 </xsl:stylesheet>

[Aplaws-commit] r895 - in trunk: ccm-core/src/com/arsdigita/dispatcher ccm-core/src/com/arsdigita/portal ccm-ldn-aplaws/bundles/camden/cfg ccm-ldn-aplaws/bundles/complete/cfg

From: <ap...@vh...> - 2005-09-22 02:53:29

Author: apevec
Date: 2005-09-22 04:44:04 +0200 (Thu, 22 Sep 2005)
New Revision: 895

Added:
   trunk/ccm-core/src/com/arsdigita/dispatcher/PortletTypeXSLServlet.java
Modified:
   trunk/ccm-core/src/com/arsdigita/portal/PortletType.java
   trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml
   trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
Log:
SF patch [ 1181342 ] Allow portlets to be packaged up as applications


Added: trunk/ccm-core/src/com/arsdigita/dispatcher/PortletTypeXSLServlet.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/dispatcher/PortletTypeXSLServlet.java	2005-09-22 01:46:23 UTC (rev 894)
+++ trunk/ccm-core/src/com/arsdigita/dispatcher/PortletTypeXSLServlet.java	2005-09-22 02:44:04 UTC (rev 895)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * The contents of this file are subject to the CCM Public
+ * License (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the
+ * License at http://www.redhat.com/licenses/ccmpl.html.
+ *
+ * Software distributed under the License is distributed on an
+ * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+ * or implied. See the License for the specific language
+ * governing rights and limitations under the License.
+ *
+ */
+package com.arsdigita.dispatcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import com.arsdigita.portal.PortletType;
+import com.arsdigita.templating.Templating;
+import com.arsdigita.util.IO;
+import com.arsdigita.web.BaseServlet;
+
+
+/**
+ * A servlet that multiplexes all XSL files registered
+ * against portlet types into one.
+ * 
+ * Copied from ccm-cms/com.arsdigita.cms.dispatcher.ContentTypeXSLServlet
+ */
+public class PortletTypeXSLServlet extends BaseServlet {
+    
+    private static final Logger s_log = 
+        Logger.getLogger(PortletTypeXSLServlet.class);
+
+    protected void doService(HttpServletRequest sreq,
+                             HttpServletResponse sresp)
+        throws ServletException, IOException {
+           s_log.debug("Servicing request for portlet type xsl imports");
+        String path = sreq.getPathInfo();
+        if (!path.equals("/index.xsl")) {
+            s_log.error("Only index.xsl is supported " + path);
+            sresp.sendError(HttpServletResponse.SC_NOT_FOUND);            
+        }
+        
+        Iterator paths = PortletType.getXSLFileURLs();
+        InputStream is = Templating.multiplexXSLFiles(paths);
+        
+        sresp.setContentType("text/xml; charset=UTF-8");
+        IO.copy(is, sresp.getOutputStream());
+    }
+    
+}

Modified: trunk/ccm-core/src/com/arsdigita/portal/PortletType.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/portal/PortletType.java	2005-09-22 01:46:23 UTC (rev 894)
+++ trunk/ccm-core/src/com/arsdigita/portal/PortletType.java	2005-09-22 02:44:04 UTC (rev 895)
@@ -18,17 +18,26 @@
  */
 package com.arsdigita.portal;
 
+import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.kernel.PackageType;
 import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.web.ApplicationType;
-import com.arsdigita.kernel.PackageType;
-import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.Assert;
-import org.apache.log4j.Logger;
-import java.math.BigDecimal;
+import com.arsdigita.util.UncheckedWrapperException;
+import com.arsdigita.web.ApplicationType;
+import com.arsdigita.web.Web;
 
 
 /**
@@ -215,4 +224,104 @@
         set("profile", profile);
     }
 
+    // SF patch [ 1181342 ] Allow portlets to be packaged up as applications
+    private static Set s_xsl = new HashSet();
+
+    /**
+	 * 
+	 * NB - Based on ccm-cms/com.arsdigita.cms.ContentType
+	 * interface is liable to change.
+	 * 
+	 * Registers an XSL file against a portlet type. 
+	 * @param portletType the portlet's base data object type
+	 * @param path the path relative to the server root
+	 */
+	public static void registerXSLFile(String portletType, String path) {
+		s_cat.debug("registering xsl file " + path + " to portlet type "
+				+ portletType);
+
+		s_xsl.add(new XSLEntry(portletType, path));
+	}
+
+	/**
+	 * NB this interface is liable to change.
+	 * 
+	 * Unregisters an XSL file against a content type. 
+	 * @param type the content type
+	 * @param path the path relative to the server root
+	 */
+	public static void unregisterXSLFile(String portletType, String path) {
+		s_xsl.remove(new XSLEntry(portletType, path));
+	}
+
+	/**
+	 * Gets an iterator of java.net.URL objects for
+	 * all registered XSL files
+	 */
+	public static Iterator getXSLFileURLs() {
+		s_cat.debug("getXSLFileURLs - returningan iterator over "
+				+ s_xsl.size() + " entries");
+		return new EntryIterator(s_xsl.iterator());
+	}
+
+	private static class EntryIterator implements Iterator {
+		private Iterator m_inner;
+
+		public EntryIterator(Iterator inner) {
+			m_inner = inner;
+		}
+
+		public boolean hasNext() {
+			return m_inner.hasNext();
+		}
+
+		public Object next() {
+			XSLEntry entry = (XSLEntry) m_inner.next();
+			String path = entry.getPath();
+
+			try {
+				return new URL(Web.getConfig().getDefaultScheme(), Web
+						.getConfig().getHost().getName(), Web.getConfig()
+						.getHost().getPort(), path);
+			} catch (MalformedURLException ex) {
+				throw new UncheckedWrapperException("path malformed" + path, ex);
+			}
+		}
+
+		public void remove() {
+			m_inner.remove();
+		}
+	}
+
+	private static class XSLEntry {
+		private String m_type;
+
+		private String m_path;
+
+		public XSLEntry(String portletType, String path) {
+			m_type = portletType;
+			m_path = path;
+		}
+
+		public PortletType getType() {
+			return PortletType.retrievePortletTypeForPortlet(m_type);
+		}
+
+		public String getPath() {
+			return m_path;
+		}
+
+		public boolean equals(Object o) {
+			if (!(o instanceof XSLEntry)) {
+				return false;
+			}
+			XSLEntry e = (XSLEntry) o;
+			return m_path.equals(e.m_path) && m_type.equals(e.m_type);
+		}
+
+		public int hashCode() {
+			return m_path.hashCode() + m_type.hashCode();
+		}
+	}
+
 }

Modified: trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml	2005-09-22 01:46:23 UTC (rev 894)
+++ trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml	2005-09-22 02:44:04 UTC (rev 895)
@@ -182,7 +182,17 @@
     </init-param>
   </servlet>
 
+  <servlet>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+  </servlet>
+
   <servlet-mapping>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
     <servlet-name>reg</servlet-name>
     <url-pattern>/__ccm__/null/reg/*</url-pattern>
   </servlet-mapping>

Modified: trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml	2005-09-22 01:46:23 UTC (rev 894)
+++ trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml	2005-09-22 02:44:04 UTC (rev 895)
@@ -182,7 +182,17 @@
     </init-param>
   </servlet>
 
+  <servlet>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+  </servlet>
+
   <servlet-mapping>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
     <servlet-name>reg</servlet-name>
     <url-pattern>/__ccm__/null/reg/*</url-pattern>
   </servlet-mapping>

[Aplaws-commit] r894 - trunk/tools/misc

From: <ap...@vh...> - 2005-09-22 01:56:15

Author: apevec
Date: 2005-09-22 03:46:23 +0200 (Thu, 22 Sep 2005)
New Revision: 894

Modified:
   trunk/tools/misc/build-all.sh
Log:
adjust build-all to modified bundle organisation


Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh	2005-09-22 01:22:25 UTC (rev 893)
+++ trunk/tools/misc/build-all.sh	2005-09-22 01:46:23 UTC (rev 894)
@@ -563,7 +563,7 @@
     set -e
     cd $BUNDLEDIR/bundles/$BUNDLE
     check_svn_tagged
-    ./rollingbuild.sh
+    ../TEMPLATE/rollingbuild.sh
   )  || exit $?
 done
 
@@ -704,8 +704,8 @@
     set -e
     cd $BUNDLEDIR/bundles/$BUNDLE
     check_svn_tagged
-    BUNDLE_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
-    BUNDLE_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
+    BUNDLE_VERSION=`grep 'VERSION=' bundle.in | sed -e 's/VERSION=//'`
+    BUNDLE_RELEASE="`grep 'RELEASE=' bundle.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
     cp $HOMERPMDIR/ccm-bundle-aplaws-plus-$BUNDLE-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
     cp $HOMESRPMDIR/ccm-bundle-aplaws-plus-$BUNDLE-$BUNDLE_VERSION-$BUNDLE_RELEASE.src.rpm $BUILD_HOME/dist/bundles/$BUNDLE/SRPMS
   )

[Aplaws-commit] r893 - in trunk/ccm-ldn-aplaws/bundles: TEMPLATE camden camden/cfg complete complete/cfg demo demo/cfg devel devel/cfg standard standard/cfg

From: <ap...@vh...> - 2005-09-22 01:32:13

Author: apevec
Date: 2005-09-22 03:22:25 +0200 (Thu, 22 Sep 2005)
New Revision: 893

Added:
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/ccm-bundle.spec.IN
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/make-zip.sh
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/reconf.sh
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/rollingbuild.sh
   trunk/ccm-ldn-aplaws/bundles/camden/bundle.in
   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
Removed:
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/cfg/
   trunk/ccm-ldn-aplaws/bundles/camden/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/camden/ccm-bundle-aplaws-plus-camden.spec.in
   trunk/ccm-ldn-aplaws/bundles/camden/cfg/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/camden/configure.in
   trunk/ccm-ldn-aplaws/bundles/camden/make-zip.sh
   trunk/ccm-ldn-aplaws/bundles/camden/reconf.sh
   trunk/ccm-ldn-aplaws/bundles/camden/rollingbuild.sh
   trunk/ccm-ldn-aplaws/bundles/complete/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/complete/ccm-bundle-aplaws-plus-complete.spec.in
   trunk/ccm-ldn-aplaws/bundles/complete/cfg/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/complete/configure.in
   trunk/ccm-ldn-aplaws/bundles/complete/make-zip.sh
   trunk/ccm-ldn-aplaws/bundles/complete/reconf.sh
   trunk/ccm-ldn-aplaws/bundles/complete/rollingbuild.sh
   trunk/ccm-ldn-aplaws/bundles/demo/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/demo/ccm-bundle-aplaws-plus-demo.spec.in
   trunk/ccm-ldn-aplaws/bundles/demo/cfg/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/demo/configure.in
   trunk/ccm-ldn-aplaws/bundles/demo/make-zip.sh
   trunk/ccm-ldn-aplaws/bundles/demo/reconf.sh
   trunk/ccm-ldn-aplaws/bundles/demo/rollingbuild.sh
   trunk/ccm-ldn-aplaws/bundles/devel/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/devel/ccm-bundle-aplaws-plus-devel.spec.in
   trunk/ccm-ldn-aplaws/bundles/devel/cfg/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/devel/configure.in
   trunk/ccm-ldn-aplaws/bundles/devel/make-zip.sh
   trunk/ccm-ldn-aplaws/bundles/devel/reconf.sh
   trunk/ccm-ldn-aplaws/bundles/devel/rollingbuild.sh
   trunk/ccm-ldn-aplaws/bundles/standard/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/standard/ccm-bundle-aplaws-plus-standard.spec.in
   trunk/ccm-ldn-aplaws/bundles/standard/cfg/Makefile.am
   trunk/ccm-ldn-aplaws/bundles/standard/configure.in
   trunk/ccm-ldn-aplaws/bundles/standard/make-zip.sh
   trunk/ccm-ldn-aplaws/bundles/standard/reconf.sh
   trunk/ccm-ldn-aplaws/bundles/standard/rollingbuild.sh
Modified:
   trunk/ccm-ldn-aplaws/bundles/camden/ChangeLog
   trunk/ccm-ldn-aplaws/bundles/complete/ChangeLog
   trunk/ccm-ldn-aplaws/bundles/demo/ChangeLog
   trunk/ccm-ldn-aplaws/bundles/devel/ChangeLog
   trunk/ccm-ldn-aplaws/bundles/standard/ChangeLog
Log:
Build all APLAWS+ bundles from the common set of templates.
    Now we need to maintain only two bundle descriptor files:
    bundle.in and ChangeLog for each bundle.
    Bundle configuration files under cfg/ stay the same:
    applications.cfg, integration.properties and web.xml.


Copied: trunk/ccm-ldn-aplaws/bundles/TEMPLATE/ccm-bundle.spec.IN (from rev 882, trunk/ccm-ldn-aplaws/bundles/camden/ccm-bundle-aplaws-plus-camden.spec.in)
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/ccm-bundle-aplaws-plus-camden.spec.in	2005-09-19 11:58:21 UTC (rev 882)
+++ trunk/ccm-ldn-aplaws/bundles/TEMPLATE/ccm-bundle.spec.IN	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,39 @@
+Summary: @BUNDLE_PRETTY_NAME@
+Name: @PACKAGE@
+Version: @VERSION@
+Release: @RELEASE@
+URL: http://www.aplaws.org.uk
+Source0: %{name}-%{version}.tar.gz
+License: LGPL
+Group: Applications/Internet/CCM
+BuildRoot: %{_tmppath}/%{name}-root
+Requires: ccm-tools-bundle
+Requires: @REQUIRES_LIST@
+BuildArch: noarch
+Prefix: /usr
+
+%description
+The @BUNDLE_PRETTY_NAME@ provides a mechanism to install 
+the pre-integrated set of APLAWS+ application.
+
+%prep
+%setup -q
+
+%build
+./configure --prefix=/usr
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+/usr/share/ccm-tools/bundles/@BUNDLE_NAME@/applications.cfg
+/usr/share/ccm-tools/bundles/@BUNDLE_NAME@/integration.properties
+/usr/share/ccm-tools/bundles/@BUNDLE_NAME@/web.xml
+
+%changelog

Copied: trunk/ccm-ldn-aplaws/bundles/TEMPLATE/make-zip.sh (from rev 882, trunk/ccm-ldn-aplaws/bundles/camden/make-zip.sh)
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/make-zip.sh	2005-09-19 11:58:21 UTC (rev 882)
+++ trunk/ccm-ldn-aplaws/bundles/TEMPLATE/make-zip.sh	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,44 @@
+##!/bin/bash
+#
+# Author: dg...@re...
+
+# Bundle specific values (must be executed in Bundle directory)
+. ./bundle.in
+
+BUILD_HOME=buildwin
+BUILD_ROOT=
+BUILD_DIR=$BUILD_HOME/$BUILD_ROOT
+
+VERSION=`cat configure.in | grep "^VERSION=" | sed -e 's/VERSION=//'`
+FILENAME="ccm-bundle-${BUNDLE_NAME}-${VERSION}.zip"
+mkdir_and_cp () {
+    # Copy a file to a directory, creating the directory if necessary
+    file="$1"
+    directory="$2"
+
+    mkdir -p "$directory"
+    cp "$file" "$directory"
+}
+
+echo "Building zip version of ccm-bundle-${BUNDLE_NAME}..."
+
+rm -rf "$BUILD_HOME"
+
+mkdir -p "$BUILD_DIR/usr/share/ccm-tools/bundles/${BUNDLE_NAME}"
+find cfg/ -name '.svn' -prune -o -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/bundles/${BUNDLE_NAME}/" \;
+
+(
+  cd "$BUILD_HOME";
+  zip -r "$FILENAME" *
+)
+
+mv "$BUILD_HOME/$FILENAME" .
+
+if [ "x$X_CCM_DIST_ZIP_DIR" != "x" ]; then
+  cp "$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+fi
+
+rm -rf "$BUILD_HOME"
+
+echo "Wrote $FILENAME"
+

Copied: trunk/ccm-ldn-aplaws/bundles/TEMPLATE/reconf.sh (from rev 882, trunk/ccm-ldn-aplaws/bundles/camden/reconf.sh)
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/reconf.sh	2005-09-19 11:58:21 UTC (rev 882)
+++ trunk/ccm-ldn-aplaws/bundles/TEMPLATE/reconf.sh	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,198 @@
+#!/bin/sh
+#
+# APLAWS+ Bundle reconfiguration script
+#
+# Idea from WindowMaker installation script by Alfredo K. Kojimo
+#
+# Copyright (C) 1999-2002 Daniel Berrange
+#
+
+CONFIG_OPT=""
+
+# -----------------------------------------------------------
+# First off we need a whole lot of clever functions
+
+if [ "$1" = "-mono" -o $TERM != "xterm" ]; then
+
+ES_DEF=""
+ES_BLK_FG=""
+ES_RED_FG=""
+ES_GRN_FG=""
+ES_YEL_FG=""
+ES_BLU_FG=""
+ES_PUR_FG=""
+ES_CYA_FG=""
+ES_GRY_FG=""
+
+ES_BLK_BG=""
+ES_RED_BG=""
+ES_GRN_BG=""
+ES_YEL_BG=""
+ES_BLU_BG=""
+ES_PUR_BG=""
+ES_CYA_BG=""
+ES_GRY_BG=""
+
+ES_BOLD=""
+ES_USCORE=""
+ES_BLINK=""
+ES_INVERT=""
+ES_HIDDEN=""
+
+else
+
+ES_DEF="\033[0m"
+ES_BLK_FG="\033[30m"
+ES_RED_FG="\033[31m"
+ES_GRN_FG="\033[32m"
+ES_YEL_FG="\033[33m"
+ES_BLU_FG="\033[34m"
+ES_PUR_FG="\033[35m"
+ES_CYA_FG="\033[36m"
+ES_GRY_FG="\033[37m"
+
+ES_BLK_BG="\033[40m"
+ES_RED_BG="\033[41m"
+ES_GRN_BG="\033[42m"
+ES_YEL_BG="\033[43m"
+ES_BLU_BG="\033[44m"
+ES_PUR_BG="\033[45m"
+ES_CYA_BG="\033[46m"
+ES_GRY_BG="\033[47m"
+
+ES_BOLD="\033[1m"
+ES_USCORE="\033[4m"
+ES_BLINK="\033[5m"
+ES_INVERT="\033[7m"
+ES_HIDDEN="\033[8m"
+
+fi
+
+
+plain()
+{
+  echo "$1"
+}
+
+pretty()
+{
+  echo -e "$ES_BOLD$ES_YEL_FG$1$ES_DEF"
+}
+
+alert()
+{
+  echo -e "$ES_RED_FG$1$ES_DEF"
+}
+
+
+death() 
+{
+  alert
+  bar
+  alert "Reconfiguration process failed. Please inform the APLAWS+ development"
+  alert "team of the problem encountered."
+  wide_bar
+  exit
+}
+
+abort()
+{
+  alert
+  bar
+  alert "Reconfiguration process aborted by user. Thankyou, please come again."
+  wide_bar
+  exit
+}
+
+prompt()
+{
+  echo -n -e "$ES_BOLD$ES_GRN_FG> $ES_GRY_FG"
+  read flibble
+  
+  if [ "x$flibble" = "x" ]; then
+    flibble="$1"
+  fi
+  echo -n -e "$ES_DEF"
+}
+
+
+bar()
+{
+  echo -e "$ES_BOLD--------------------------------------------------------------------$ES_DEF"
+}
+
+
+wide_bar()
+{
+  echo -e "$ES_BOLD====================================================================$ES_DEF"
+}
+
+
+command()
+{
+  echo -e "$ES_BOLD$1$ES_DEF"
+  echo -n -e "$ES_GRY_FG"
+  $1 || death
+  echo -n -e "$ES_DEF"
+}
+
+
+# -------------------------------------------------------------------------
+# We had better watch out for bad shit
+
+trap abort 2 3
+
+
+# --------------------------------------------------------------------------
+# On your marks, get set, GO!
+
+wide_bar
+pretty "           APLAWS+ Bundle Re-configuration Script         "
+wide_bar
+plain "This script will regenerate all the automatic configuration scripts"
+plain "and clever Makefiles used by this package. If you don't have autoconf,"
+plain "automake and libtool installed you could seriously screw up your"
+plain "distribution. Press Control-C now to exit if you are worried"
+prompt ""
+
+
+# -------------------------------------------------------------
+# cleanup
+bar
+plain "Cleaning up directory"
+command "rm -f acinclude.m4 aclocal.m4 config.guess config.sub \
+ configure ltconfig ltmain.sh stamp-h"
+
+
+
+# -------------------------------------------------------------
+# aclocal
+bar
+plain "Regenerating configuration header file"
+command "aclocal"
+
+
+# -------------------------------------------------------------
+# autoconf
+bar
+plain "Regenerating automatic configuration script"
+command "autoconf"
+
+
+# -------------------------------------------------------------
+# automake
+bar
+plain "Regenerating automatic makefiles"
+command "automake -a"
+
+
+# ------------------------------------------------------------
+# Say goodbye
+
+wide_bar
+pretty "The APLAWS+ Bundle package has been successfully reconfigured."
+pretty "Have a nice day "
+pretty "                 - The APLAWS+ development team."
+wide_bar
+exit
+

Copied: trunk/ccm-ldn-aplaws/bundles/TEMPLATE/rollingbuild.sh (from rev 882, trunk/ccm-ldn-aplaws/bundles/camden/rollingbuild.sh)
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/rollingbuild.sh	2005-09-19 11:58:21 UTC (rev 882)
+++ trunk/ccm-ldn-aplaws/bundles/TEMPLATE/rollingbuild.sh	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+
+# Exit immediately if command fails
+set -e
+
+# Print command executed to stdout
+set -v
+
+# Bundle specific values (must be executed in Bundle directory)
+. ./bundle.in
+
+# prepare .spec.in
+cat ../TEMPLATE/ccm-bundle.spec.IN ChangeLog > ccm-bundle-$BUNDLE_NAME.spec.in
+
+# prepare .am
+cat <<EOF > Makefile.am
+SUBDIRS = cfg
+
+dist-hook:
+	cp \$(top_builddir)/@PACKAGE@.spec \$(distdir)/
+
+EOF
+
+cat <<EOF > cfg/Makefile.am
+AUTOMAKE_OPTIONS = foreign no-dependencies 1.4
+
+cfgdir = \$(datadir)/ccm-tools/bundles/$BUNDLE_NAME
+cfg_DATA = web.xml applications.cfg integration.properties
+
+EXTRA_DIST = \$(cfg_DATA)
+
+EOF
+
+# prepare configure.in
+cat <<EOF > configure.in
+AC_INIT(ccm-bundle-$BUNDLE_NAME.spec.in)
+BUNDLE_NAME=$BUNDLE_NAME
+BUNDLE_PRETTY_NAME="$BUNDLE_PRETTY_NAME"
+VERSION=$VERSION
+RELEASE=$RELEASE${SVN_REVISION}
+EOF
+
+echo -n 'REQUIRES_LIST="' >> configure.in
+echo -n `cat cfg/applications.cfg | grep -v '#' | grep -v '^\s*$'` >> configure.in
+echo '"' >> configure.in
+
+cat <<EOF >> configure.in
+AM_INIT_AUTOMAKE(ccm-bundle-$BUNDLE_NAME, $VERSION)
+AC_SUBST(RELEASE)
+AC_SUBST(REQUIRES_LIST)
+AC_SUBST(BUNDLE_NAME)
+AC_SUBST(BUNDLE_PRETTY_NAME)
+
+AC_OUTPUT(Makefile
+          cfg/Makefile
+          ccm-bundle-$BUNDLE_NAME.spec)
+
+dnl End of file
+EOF
+
+# Initialise the build environment
+aclocal
+autoconf
+automake -a
+
+chmod +x configure
+
+# Do a VPATH build so we don't mess up the source dir
+#builddir=".rollingbuild-$$"
+#mkdir $builddir
+#ln -s `pwd` $builddir/.install_link
+#cd $builddir
+
+# Configure & make a distribution - no need to 
+# actually compile at this stage since this is 
+# done by rpm later
+#.install_link/configure --prefix=$AUTO_BUILD_PREFIX
+./configure --prefix=$AUTO_BUILD_ROOT
+
+make install
+
+rm -f ccm-bundle-$BUNDLE_NAME-*.tar.gz
+make dist
+
+# Build the rpms
+rpmbuild -ta --clean ccm-bundle-$BUNDLE_NAME-*.tar.gz
+
+../TEMPLATE/make-zip.sh
+
+# Cleanup the build dir
+#cd ..
+#rm -rf $builddir
+
+# We're all done!
+exit 0
+
+# End of file

Modified: trunk/ccm-ldn-aplaws/bundles/camden/ChangeLog
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/ChangeLog	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/camden/ChangeLog	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <ap...@re...>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <ap...@re...>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <ber...@re...>
+- Initial build.
+

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/Makefile.am

Added: trunk/ccm-ldn-aplaws/bundles/camden/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/bundle.in	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/camden/bundle.in	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-camden
+BUNDLE_PRETTY_NAME="APLAWS+ Camden Bundle"
+VERSION=1.0.3
+RELEASE=1.rc0

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/ccm-bundle-aplaws-plus-camden.spec.in

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/cfg/Makefile.am

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/configure.in

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/make-zip.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/reconf.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/camden/rollingbuild.sh

Modified: trunk/ccm-ldn-aplaws/bundles/complete/ChangeLog
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/ChangeLog	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/complete/ChangeLog	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <ap...@re...>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <ap...@re...>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <ber...@re...>
+- Initial build.
+

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/Makefile.am

Added: trunk/ccm-ldn-aplaws/bundles/complete/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/bundle.in	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/complete/bundle.in	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-complete
+BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
+VERSION=1.0.3
+RELEASE=1.rc0

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/ccm-bundle-aplaws-plus-complete.spec.in

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/cfg/Makefile.am

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/configure.in

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/make-zip.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/reconf.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/complete/rollingbuild.sh

Modified: trunk/ccm-ldn-aplaws/bundles/demo/ChangeLog
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/demo/ChangeLog	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/demo/ChangeLog	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <ap...@re...>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <ap...@re...>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <ber...@re...>
+- Initial build.
+

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/Makefile.am

Added: trunk/ccm-ldn-aplaws/bundles/demo/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/demo/bundle.in	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/demo/bundle.in	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-demo
+BUNDLE_PRETTY_NAME="APLAWS+ Demo Bundle"
+VERSION=1.0.3
+RELEASE=1.rc0

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/ccm-bundle-aplaws-plus-demo.spec.in

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/cfg/Makefile.am

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/configure.in

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/make-zip.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/reconf.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/demo/rollingbuild.sh

Modified: trunk/ccm-ldn-aplaws/bundles/devel/ChangeLog
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/devel/ChangeLog	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/devel/ChangeLog	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <ap...@re...>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <ap...@re...>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <ber...@re...>
+- Initial build.
+

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/Makefile.am

Added: trunk/ccm-ldn-aplaws/bundles/devel/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/devel/bundle.in	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/devel/bundle.in	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-devel
+BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
+VERSION=1.0.3
+RELEASE=1.rc0

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/ccm-bundle-aplaws-plus-devel.spec.in

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/cfg/Makefile.am

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/configure.in

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/make-zip.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/reconf.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/devel/rollingbuild.sh

Modified: trunk/ccm-ldn-aplaws/bundles/standard/ChangeLog
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/standard/ChangeLog	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/standard/ChangeLog	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <ap...@re...>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <ap...@re...>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <ber...@re...>
+- Initial build.
+

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/Makefile.am

Added: trunk/ccm-ldn-aplaws/bundles/standard/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/standard/bundle.in	2005-09-21 22:58:56 UTC (rev 892)
+++ trunk/ccm-ldn-aplaws/bundles/standard/bundle.in	2005-09-22 01:22:25 UTC (rev 893)
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-standard
+BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
+VERSION=1.0.3
+RELEASE=1.rc0

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/ccm-bundle-aplaws-plus-standard.spec.in

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/cfg/Makefile.am

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/configure.in

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/make-zip.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/reconf.sh

Deleted: trunk/ccm-ldn-aplaws/bundles/standard/rollingbuild.sh

[Aplaws-commit] r892 - trunk/ccm-ldn-aplaws/bundles/TEMPLATE

From: <ap...@vh...> - 2005-09-21 23:08:23

Author: apevec
Date: 2005-09-22 00:58:56 +0200 (Thu, 22 Sep 2005)
New Revision: 892

Added:
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/cfg/
Log:
directory for common files used to build aplaws bundles

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

Flat | Threaded

<< < 1 .. 30 31 32 33 34 .. 60 > >> (Page 32 of 60)