Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Author: mbooth
Date: 2005-02-18 15:54:58 +0100 (Fri, 18 Feb 2005)
New Revision: 273
Modified:
ccm-cms-assets-fileattachment/trunk/application.xml
ccm-cms-assets-relatedlink/trunk/application.xml
ccm-cms-types-address/trunk/application.xml
ccm-cms-types-agenda/trunk/application.xml
ccm-cms-types-article/trunk/application.xml
ccm-cms-types-bookmark/trunk/application.xml
ccm-cms-types-contact/trunk/application.xml
ccm-cms-types-esdservice/trunk/application.xml
ccm-cms-types-event/trunk/application.xml
ccm-cms-types-faqitem/trunk/application.xml
ccm-cms-types-filestorageitem/trunk/application.xml
ccm-cms-types-formitem/trunk/application.xml
ccm-cms-types-formsectionitem/trunk/application.xml
ccm-cms-types-glossaryitem/trunk/application.xml
ccm-cms-types-inlinesite/trunk/application.xml
ccm-cms-types-job/trunk/application.xml
ccm-cms-types-legalnotice/trunk/application.xml
ccm-cms-types-minutes/trunk/application.xml
ccm-cms-types-motditem/trunk/application.xml
ccm-cms-types-mparticle/trunk/application.xml
ccm-cms-types-newsitem/trunk/application.xml
ccm-cms-types-organization/trunk/application.xml
ccm-cms-types-pressrelease/trunk/application.xml
ccm-cms-types-service/trunk/application.xml
ccm-cms-types-siteproxy/trunk/application.xml
ccm-ldn-aplaws/trunk/application.xml
ccm-ldn-atoz/trunk/application.xml
ccm-ldn-dublin/trunk/application.xml
ccm-ldn-exporter/trunk/application.xml
ccm-ldn-freeform/trunk/application.xml
ccm-ldn-image-step/trunk/application.xml
ccm-ldn-importer/trunk/application.xml
ccm-ldn-navigation/trunk/application.xml
ccm-ldn-portal/trunk/application.xml
ccm-ldn-rss/trunk/application.xml
ccm-ldn-subsite/trunk/application.xml
ccm-ldn-terms/trunk/application.xml
ccm-ldn-util/trunk/application.xml
ccm-ldn-xmlfeed/trunk/application.xml
ccm-simplesurvey/trunk/application.xml
Log:
Bump version of ccm-cms to 6.1.1 across the board
Modified: ccm-cms-assets-fileattachment/trunk/application.xml
===================================================================
--- ccm-cms-assets-fileattachment/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-assets-fileattachment/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-assets-relatedlink/trunk/application.xml
===================================================================
--- ccm-cms-assets-relatedlink/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-assets-relatedlink/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-address/trunk/application.xml
===================================================================
--- ccm-cms-types-address/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-address/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-agenda/trunk/application.xml
===================================================================
--- ccm-cms-types-agenda/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-agenda/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-article/trunk/application.xml
===================================================================
--- ccm-cms-types-article/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-article/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-bookmark/trunk/application.xml
===================================================================
--- ccm-cms-types-bookmark/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-bookmark/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-contact/trunk/application.xml
===================================================================
--- ccm-cms-types-contact/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-contact/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-esdservice/trunk/application.xml
===================================================================
--- ccm-cms-types-esdservice/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-esdservice/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-cms-types-contact" version="6.1.0"/>
</ccm:dependencies>
Modified: ccm-cms-types-event/trunk/application.xml
===================================================================
--- ccm-cms-types-event/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-event/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-faqitem/trunk/application.xml
===================================================================
--- ccm-cms-types-faqitem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-faqitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-filestorageitem/trunk/application.xml
===================================================================
--- ccm-cms-types-filestorageitem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-filestorageitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-formitem/trunk/application.xml
===================================================================
--- ccm-cms-types-formitem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-formitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.0"/>
</ccm:dependencies>
Modified: ccm-cms-types-formsectionitem/trunk/application.xml
===================================================================
--- ccm-cms-types-formsectionitem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-formsectionitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-glossaryitem/trunk/application.xml
===================================================================
--- ccm-cms-types-glossaryitem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-glossaryitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-inlinesite/trunk/application.xml
===================================================================
--- ccm-cms-types-inlinesite/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-inlinesite/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-job/trunk/application.xml
===================================================================
--- ccm-cms-types-job/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-job/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-legalnotice/trunk/application.xml
===================================================================
--- ccm-cms-types-legalnotice/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-legalnotice/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-minutes/trunk/application.xml
===================================================================
--- ccm-cms-types-minutes/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-minutes/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-motditem/trunk/application.xml
===================================================================
--- ccm-cms-types-motditem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-motditem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-mparticle/trunk/application.xml
===================================================================
--- ccm-cms-types-mparticle/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-mparticle/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-newsitem/trunk/application.xml
===================================================================
--- ccm-cms-types-newsitem/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-newsitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-organization/trunk/application.xml
===================================================================
--- ccm-cms-types-organization/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-organization/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-pressrelease/trunk/application.xml
===================================================================
--- ccm-cms-types-pressrelease/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-pressrelease/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-service/trunk/application.xml
===================================================================
--- ccm-cms-types-service/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-service/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-cms-types-siteproxy/trunk/application.xml
===================================================================
--- ccm-cms-types-siteproxy/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-cms-types-siteproxy/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-ldn-aplaws/trunk/application.xml
===================================================================
--- ccm-ldn-aplaws/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-aplaws/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-subsite" version="1.4.1"/>
<ccm:requires name="ccm-ldn-portal" version="1.4.2"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
Modified: ccm-ldn-atoz/trunk/application.xml
===================================================================
--- ccm-ldn-atoz/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-atoz/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
</ccm:dependencies>
Modified: ccm-ldn-dublin/trunk/application.xml
===================================================================
--- ccm-ldn-dublin/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-dublin/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
</ccm:dependencies>
Modified: ccm-ldn-exporter/trunk/application.xml
===================================================================
--- ccm-ldn-exporter/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-exporter/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -14,7 +14,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-cms-types-filestorageitem" version="6.1.0"/>
<ccm:requires name="ccm-cms-types-mparticle" version="6.1.0"/>
Modified: ccm-ldn-freeform/trunk/application.xml
===================================================================
--- ccm-ldn-freeform/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-freeform/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: ccm-ldn-image-step/trunk/application.xml
===================================================================
--- ccm-ldn-image-step/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-image-step/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
</ccm:dependencies>
Modified: ccm-ldn-importer/trunk/application.xml
===================================================================
--- ccm-ldn-importer/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-importer/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
</ccm:dependencies>
Modified: ccm-ldn-navigation/trunk/application.xml
===================================================================
--- ccm-ldn-navigation/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-navigation/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
</ccm:dependencies>
Modified: ccm-ldn-portal/trunk/application.xml
===================================================================
--- ccm-ldn-portal/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-portal/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-forum" version="1.4.1"/>
<ccm:requires name="ccm-ldn-rss" version="1.4.1"/>
Modified: ccm-ldn-rss/trunk/application.xml
===================================================================
--- ccm-ldn-rss/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-rss/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
</ccm:dependencies>
Modified: ccm-ldn-subsite/trunk/application.xml
===================================================================
--- ccm-ldn-subsite/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-subsite/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
</ccm:dependencies>
Modified: ccm-ldn-terms/trunk/application.xml
===================================================================
--- ccm-ldn-terms/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-terms/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-atoz" version="1.0.1"/>
</ccm:dependencies>
Modified: ccm-ldn-util/trunk/application.xml
===================================================================
--- ccm-ldn-util/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-util/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:directories>
Modified: ccm-ldn-xmlfeed/trunk/application.xml
===================================================================
--- ccm-ldn-xmlfeed/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-ldn-xmlfeed/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -9,7 +9,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.0"/>
<ccm:requires name="ccm-cms-types-formitem" version="6.1.0"/>
</ccm:dependencies>
Modified: ccm-simplesurvey/trunk/application.xml
===================================================================
--- ccm-simplesurvey/trunk/application.xml 2005-02-18 14:02:39 UTC (rev 272)
+++ ccm-simplesurvey/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
@@ -8,7 +8,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
<ccm:contacts>
|
Author: mbooth
Date: 2005-02-18 16:04:51 +0100 (Fri, 18 Feb 2005)
New Revision: 274
Modified:
ccm-auth-http/trunk/application.xml
ccm-cms-assets-fileattachment/trunk/application.xml
ccm-cms-assets-relatedlink/trunk/application.xml
ccm-cms-types-address/trunk/application.xml
ccm-cms-types-agenda/trunk/application.xml
ccm-cms-types-article/trunk/application.xml
ccm-cms-types-bookmark/trunk/application.xml
ccm-cms-types-contact/trunk/application.xml
ccm-cms-types-esdservice/trunk/application.xml
ccm-cms-types-event/trunk/application.xml
ccm-cms-types-faqitem/trunk/application.xml
ccm-cms-types-filestorageitem/trunk/application.xml
ccm-cms-types-formitem/trunk/application.xml
ccm-cms-types-formsectionitem/trunk/application.xml
ccm-cms-types-glossaryitem/trunk/application.xml
ccm-cms-types-inlinesite/trunk/application.xml
ccm-cms-types-job/trunk/application.xml
ccm-cms-types-legalnotice/trunk/application.xml
ccm-cms-types-minutes/trunk/application.xml
ccm-cms-types-motditem/trunk/application.xml
ccm-cms-types-mparticle/trunk/application.xml
ccm-cms-types-newsitem/trunk/application.xml
ccm-cms-types-organization/trunk/application.xml
ccm-cms-types-pressrelease/trunk/application.xml
ccm-cms-types-service/trunk/application.xml
ccm-cms-types-siteproxy/trunk/application.xml
ccm-forum/trunk/application.xml
ccm-ldn-aplaws/trunk/application.xml
ccm-ldn-atoz/trunk/application.xml
ccm-ldn-dublin/trunk/application.xml
ccm-ldn-exporter/trunk/application.xml
ccm-ldn-freeform/trunk/application.xml
ccm-ldn-image-step/trunk/application.xml
ccm-ldn-importer/trunk/application.xml
ccm-ldn-navigation/trunk/application.xml
ccm-ldn-portal/trunk/application.xml
ccm-ldn-rss/trunk/application.xml
ccm-ldn-shortcuts/trunk/application.xml
ccm-ldn-subsite/trunk/application.xml
ccm-ldn-terms/trunk/application.xml
ccm-ldn-theme/trunk/application.xml
ccm-ldn-util/trunk/application.xml
ccm-ldn-xmlfeed/trunk/application.xml
ccm-simplesurvey/trunk/application.xml
ccm-user-preferences/trunk/application.xml
Log:
Bump version number of ccm-core to 6.1.1 across the board
Modified: ccm-auth-http/trunk/application.xml
===================================================================
--- ccm-auth-http/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-auth-http/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: ccm-cms-assets-fileattachment/trunk/application.xml
===================================================================
--- ccm-cms-assets-fileattachment/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-assets-fileattachment/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-assets-relatedlink/trunk/application.xml
===================================================================
--- ccm-cms-assets-relatedlink/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-assets-relatedlink/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-address/trunk/application.xml
===================================================================
--- ccm-cms-types-address/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-address/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-agenda/trunk/application.xml
===================================================================
--- ccm-cms-types-agenda/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-agenda/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-article/trunk/application.xml
===================================================================
--- ccm-cms-types-article/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-article/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-bookmark/trunk/application.xml
===================================================================
--- ccm-cms-types-bookmark/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-bookmark/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-contact/trunk/application.xml
===================================================================
--- ccm-cms-types-contact/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-contact/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-esdservice/trunk/application.xml
===================================================================
--- ccm-cms-types-esdservice/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-esdservice/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-cms-types-contact" version="6.1.0"/>
</ccm:dependencies>
Modified: ccm-cms-types-event/trunk/application.xml
===================================================================
--- ccm-cms-types-event/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-event/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-faqitem/trunk/application.xml
===================================================================
--- ccm-cms-types-faqitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-faqitem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-filestorageitem/trunk/application.xml
===================================================================
--- ccm-cms-types-filestorageitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-filestorageitem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-formitem/trunk/application.xml
===================================================================
--- ccm-cms-types-formitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-formitem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.0"/>
</ccm:dependencies>
Modified: ccm-cms-types-formsectionitem/trunk/application.xml
===================================================================
--- ccm-cms-types-formsectionitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-formsectionitem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-glossaryitem/trunk/application.xml
===================================================================
--- ccm-cms-types-glossaryitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-glossaryitem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-inlinesite/trunk/application.xml
===================================================================
--- ccm-cms-types-inlinesite/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-inlinesite/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-job/trunk/application.xml
===================================================================
--- ccm-cms-types-job/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-job/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-legalnotice/trunk/application.xml
===================================================================
--- ccm-cms-types-legalnotice/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-legalnotice/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-minutes/trunk/application.xml
===================================================================
--- ccm-cms-types-minutes/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-minutes/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-motditem/trunk/application.xml
===================================================================
--- ccm-cms-types-motditem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-motditem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-mparticle/trunk/application.xml
===================================================================
--- ccm-cms-types-mparticle/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-mparticle/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-newsitem/trunk/application.xml
===================================================================
--- ccm-cms-types-newsitem/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-newsitem/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-organization/trunk/application.xml
===================================================================
--- ccm-cms-types-organization/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-organization/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-pressrelease/trunk/application.xml
===================================================================
--- ccm-cms-types-pressrelease/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-pressrelease/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-service/trunk/application.xml
===================================================================
--- ccm-cms-types-service/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-service/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-cms-types-siteproxy/trunk/application.xml
===================================================================
--- ccm-cms-types-siteproxy/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-cms-types-siteproxy/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-forum/trunk/application.xml
===================================================================
--- ccm-forum/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-forum/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: ccm-ldn-aplaws/trunk/application.xml
===================================================================
--- ccm-ldn-aplaws/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-aplaws/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-subsite" version="1.4.1"/>
<ccm:requires name="ccm-ldn-portal" version="1.4.2"/>
Modified: ccm-ldn-atoz/trunk/application.xml
===================================================================
--- ccm-ldn-atoz/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-atoz/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
</ccm:dependencies>
Modified: ccm-ldn-dublin/trunk/application.xml
===================================================================
--- ccm-ldn-dublin/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-dublin/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
Modified: ccm-ldn-exporter/trunk/application.xml
===================================================================
--- ccm-ldn-exporter/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-exporter/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -13,7 +13,7 @@
</ccm:directories>
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-cms-types-filestorageitem" version="6.1.0"/>
Modified: ccm-ldn-freeform/trunk/application.xml
===================================================================
--- ccm-ldn-freeform/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-freeform/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-ldn-image-step/trunk/application.xml
===================================================================
--- ccm-ldn-image-step/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-image-step/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
</ccm:dependencies>
Modified: ccm-ldn-importer/trunk/application.xml
===================================================================
--- ccm-ldn-importer/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-importer/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
</ccm:dependencies>
Modified: ccm-ldn-navigation/trunk/application.xml
===================================================================
--- ccm-ldn-navigation/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-navigation/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
Modified: ccm-ldn-portal/trunk/application.xml
===================================================================
--- ccm-ldn-portal/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-portal/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-forum" version="1.4.1"/>
Modified: ccm-ldn-rss/trunk/application.xml
===================================================================
--- ccm-ldn-rss/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-rss/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
Modified: ccm-ldn-shortcuts/trunk/application.xml
===================================================================
--- ccm-ldn-shortcuts/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-shortcuts/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: ccm-ldn-subsite/trunk/application.xml
===================================================================
--- ccm-ldn-subsite/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-subsite/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
Modified: ccm-ldn-terms/trunk/application.xml
===================================================================
--- ccm-ldn-terms/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-terms/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-atoz" version="1.0.1"/>
Modified: ccm-ldn-theme/trunk/application.xml
===================================================================
--- ccm-ldn-theme/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-theme/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-ldn-subsite" version="1.4.1"/>
<!--ccm:requires name="ccm-ldn-aplaws" version="1.9.1"/-->
</ccm:dependencies>
Modified: ccm-ldn-util/trunk/application.xml
===================================================================
--- ccm-ldn-util/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-util/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-ldn-xmlfeed/trunk/application.xml
===================================================================
--- ccm-ldn-xmlfeed/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-ldn-xmlfeed/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -8,7 +8,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-cms-types-formsectionitem" version="6.1.0"/>
<ccm:requires name="ccm-cms-types-formitem" version="6.1.0"/>
Modified: ccm-simplesurvey/trunk/application.xml
===================================================================
--- ccm-simplesurvey/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-simplesurvey/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
</ccm:dependencies>
Modified: ccm-user-preferences/trunk/application.xml
===================================================================
--- ccm-user-preferences/trunk/application.xml 2005-02-18 14:54:58 UTC (rev 273)
+++ ccm-user-preferences/trunk/application.xml 2005-02-18 15:04:51 UTC (rev 274)
@@ -7,7 +7,7 @@
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1"/>
</ccm:dependencies>
<ccm:contacts>
|
Author: mbooth Date: 2005-02-18 15:02:39 +0100 (Fri, 18 Feb 2005) New Revision: 272 Added: users/mbooth/projects/aplaws-build/ccm-auth-http/ccm-auth-http/ users/mbooth/projects/aplaws-build/ccm-cms-assets-fileattachment/ccm-cms-assets-fileattachment/ users/mbooth/projects/aplaws-build/ccm-cms-assets-notes/ccm-cms-assets-notes/ users/mbooth/projects/aplaws-build/ccm-cms-assets-relatedlink/ccm-cms-assets-relatedlink/ users/mbooth/projects/aplaws-build/ccm-cms-types-address/ccm-cms-types-address/ users/mbooth/projects/aplaws-build/ccm-cms-types-agenda/ccm-cms-types-agenda/ users/mbooth/projects/aplaws-build/ccm-cms-types-article/ccm-cms-types-article/ users/mbooth/projects/aplaws-build/ccm-cms-types-bookmark/ccm-cms-types-bookmark/ users/mbooth/projects/aplaws-build/ccm-cms-types-contact/ccm-cms-types-contact/ users/mbooth/projects/aplaws-build/ccm-cms-types-esdservice/ccm-cms-types-esdservice/ users/mbooth/projects/aplaws-build/ccm-cms-types-event/ccm-cms-types-event/ users/mbooth/projects/aplaws-build/ccm-cms-types-faqitem/ccm-cms-types-faqitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-filestorageitem/ccm-cms-types-filestorageitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-formitem/ccm-cms-types-formitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-formsectionitem/ccm-cms-types-formsectionitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-glossaryitem/ccm-cms-types-glossaryitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-inlinesite/ccm-cms-types-inlinesite/ users/mbooth/projects/aplaws-build/ccm-cms-types-job/ccm-cms-types-job/ users/mbooth/projects/aplaws-build/ccm-cms-types-legalnotice/ccm-cms-types-legalnotice/ users/mbooth/projects/aplaws-build/ccm-cms-types-minutes/ccm-cms-types-minutes/ users/mbooth/projects/aplaws-build/ccm-cms-types-motditem/ccm-cms-types-motditem/ users/mbooth/projects/aplaws-build/ccm-cms-types-mparticle/ccm-cms-types-mparticle/ users/mbooth/projects/aplaws-build/ccm-cms-types-newsitem/ccm-cms-types-newsitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-organization/ccm-cms-types-organization/ users/mbooth/projects/aplaws-build/ccm-cms-types-pressrelease/ccm-cms-types-pressrelease/ users/mbooth/projects/aplaws-build/ccm-cms-types-service/ccm-cms-types-service/ users/mbooth/projects/aplaws-build/ccm-cms-types-siteproxy/ccm-cms-types-siteproxy/ users/mbooth/projects/aplaws-build/ccm-cms/ccm-cms/ users/mbooth/projects/aplaws-build/ccm-core/ccm-core/ users/mbooth/projects/aplaws-build/ccm-forum/ccm-forum/ users/mbooth/projects/aplaws-build/ccm-ldn-aplaws/ccm-ldn-aplaws/ users/mbooth/projects/aplaws-build/ccm-ldn-atoz/ccm-ldn-atoz/ users/mbooth/projects/aplaws-build/ccm-ldn-dublin/ccm-ldn-dublin/ users/mbooth/projects/aplaws-build/ccm-ldn-exporter/ccm-ldn-exporter/ users/mbooth/projects/aplaws-build/ccm-ldn-freeform/ccm-ldn-freeform/ users/mbooth/projects/aplaws-build/ccm-ldn-image-step/ccm-ldn-image-step/ users/mbooth/projects/aplaws-build/ccm-ldn-importer/ccm-ldn-importer/ users/mbooth/projects/aplaws-build/ccm-ldn-navigation/ccm-ldn-navigation/ users/mbooth/projects/aplaws-build/ccm-ldn-portal/ccm-ldn-portal/ users/mbooth/projects/aplaws-build/ccm-ldn-rss/ccm-ldn-rss/ users/mbooth/projects/aplaws-build/ccm-ldn-search/ccm-ldn-search/ users/mbooth/projects/aplaws-build/ccm-ldn-shortcuts/ccm-ldn-shortcuts/ users/mbooth/projects/aplaws-build/ccm-ldn-subsite/ccm-ldn-subsite/ users/mbooth/projects/aplaws-build/ccm-ldn-terms/ccm-ldn-terms/ users/mbooth/projects/aplaws-build/ccm-ldn-theme/ccm-ldn-theme/ users/mbooth/projects/aplaws-build/ccm-ldn-util/ccm-ldn-util/ users/mbooth/projects/aplaws-build/ccm-ldn-xmlfeed/ccm-ldn-xmlfeed/ users/mbooth/projects/aplaws-build/ccm-simplesurvey/ccm-simplesurvey/ users/mbooth/projects/aplaws-build/ccm-user-preferences/ccm-user-preferences/ users/mbooth/projects/aplaws-build/svn-switch.sh Removed: users/mbooth/projects/aplaws-build/ccm-ldn-surreycc-50plus/ Log: More subversion wrestling Added: users/mbooth/projects/aplaws-build/svn-switch.sh =================================================================== --- users/mbooth/projects/aplaws-build/svn-switch.sh 2005-02-18 13:52:34 UTC (rev 271) +++ users/mbooth/projects/aplaws-build/svn-switch.sh 2005-02-18 14:02:39 UTC (rev 272) @@ -0,0 +1,51 @@ +#!/bin/sh + +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-auth-http/trunk ccm-auth-http/ccm-auth-http/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms/trunk ccm-cms/ccm-cms/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-assets-fileattachment/trunk ccm-cms-assets-fileattachment/ccm-cms-assets-fileattachment/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-assets-relatedlink/trunk ccm-cms-assets-relatedlink/ccm-cms-assets-relatedlink/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-address/trunk ccm-cms-types-address/ccm-cms-types-address/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-agenda/trunk ccm-cms-types-agenda/ccm-cms-types-agenda/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-article/trunk ccm-cms-types-article/ccm-cms-types-article/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-bookmark/trunk ccm-cms-types-bookmark/ccm-cms-types-bookmark/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-contact/trunk ccm-cms-types-contact/ccm-cms-types-contact/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-esdservice/trunk ccm-cms-types-esdservice/ccm-cms-types-esdservice/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-event/trunk ccm-cms-types-event/ccm-cms-types-event/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-faqitem/trunk ccm-cms-types-faqitem/ccm-cms-types-faqitem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-filestorageitem/trunk ccm-cms-types-filestorageitem/ccm-cms-types-filestorageitem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-formitem/trunk ccm-cms-types-formitem/ccm-cms-types-formitem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-formsectionitem/trunk ccm-cms-types-formsectionitem/ccm-cms-types-formsectionitem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-glossaryitem/trunk ccm-cms-types-glossaryitem/ccm-cms-types-glossaryitem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-inlinesite/trunk ccm-cms-types-inlinesite/ccm-cms-types-inlinesite/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-job/trunk ccm-cms-types-job/ccm-cms-types-job/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-legalnotice/trunk ccm-cms-types-legalnotice/ccm-cms-types-legalnotice/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-minutes/trunk ccm-cms-types-minutes/ccm-cms-types-minutes/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-motditem/trunk ccm-cms-types-motditem/ccm-cms-types-motditem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-mparticle/trunk ccm-cms-types-mparticle/ccm-cms-types-mparticle/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-newsitem/trunk ccm-cms-types-newsitem/ccm-cms-types-newsitem/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-organization/trunk ccm-cms-types-organization/ccm-cms-types-organization/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-pressrelease/trunk ccm-cms-types-pressrelease/ccm-cms-types-pressrelease/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-service/trunk ccm-cms-types-service/ccm-cms-types-service/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-siteproxy/trunk ccm-cms-types-siteproxy/ccm-cms-types-siteproxy/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-core/trunk ccm-core/ccm-core/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-forum/trunk ccm-forum/ccm-forum/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-aplaws/trunk ccm-ldn-aplaws/ccm-ldn-aplaws/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-atoz/trunk ccm-ldn-atoz/ccm-ldn-atoz/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-dublin/trunk ccm-ldn-dublin/ccm-ldn-dublin/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-exporter/trunk ccm-ldn-exporter/ccm-ldn-exporter/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-freeform/trunk ccm-ldn-freeform/ccm-ldn-freeform/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-image-step/trunk ccm-ldn-image-step/ccm-ldn-image-step/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-importer/trunk ccm-ldn-importer/ccm-ldn-importer/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-navigation/trunk ccm-ldn-navigation/ccm-ldn-navigation/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-portal/trunk ccm-ldn-portal/ccm-ldn-portal/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-rss/trunk ccm-ldn-rss/ccm-ldn-rss/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-search/trunk ccm-ldn-search/ccm-ldn-search/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-shortcuts/trunk ccm-ldn-shortcuts/ccm-ldn-shortcuts/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-subsite/trunk ccm-ldn-subsite/ccm-ldn-subsite/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-terms/trunk ccm-ldn-terms/ccm-ldn-terms/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-theme/trunk ccm-ldn-theme/ccm-ldn-theme/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-util/trunk ccm-ldn-util/ccm-ldn-util/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-ldn-xmlfeed/trunk ccm-ldn-xmlfeed/ccm-ldn-xmlfeed/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-cms-assets-notes/trunk ccm-cms-assets-notes/ccm-cms-assets-notes/ +svn switch http://aplaws.redhat.com/svn/aplaws/ccm-simplesurvey/trunk ccm-simplesurvey/ccm-simplesurvey/ +svn switch http://aplaws.redhat.com/svn/aplaws/tools/trunk tools/ Property changes on: users/mbooth/projects/aplaws-build/svn-switch.sh ___________________________________________________________________ Name: svn:executable + * |
|
From: <mb...@re...> - 2005-02-18 13:53:41
|
Author: mbooth Date: 2005-02-18 14:52:34 +0100 (Fri, 18 Feb 2005) New Revision: 271 Added: users/mbooth/projects/aplaws-build/ users/mbooth/projects/aplaws-build/ccm-auth-http/ users/mbooth/projects/aplaws-build/ccm-cms-assets-fileattachment/ users/mbooth/projects/aplaws-build/ccm-cms-assets-notes/ users/mbooth/projects/aplaws-build/ccm-cms-assets-relatedlink/ users/mbooth/projects/aplaws-build/ccm-cms-types-address/ users/mbooth/projects/aplaws-build/ccm-cms-types-agenda/ users/mbooth/projects/aplaws-build/ccm-cms-types-article/ users/mbooth/projects/aplaws-build/ccm-cms-types-bookmark/ users/mbooth/projects/aplaws-build/ccm-cms-types-contact/ users/mbooth/projects/aplaws-build/ccm-cms-types-esdservice/ users/mbooth/projects/aplaws-build/ccm-cms-types-event/ users/mbooth/projects/aplaws-build/ccm-cms-types-faqitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-filestorageitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-formitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-formsectionitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-glossaryitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-inlinesite/ users/mbooth/projects/aplaws-build/ccm-cms-types-job/ users/mbooth/projects/aplaws-build/ccm-cms-types-legalnotice/ users/mbooth/projects/aplaws-build/ccm-cms-types-minutes/ users/mbooth/projects/aplaws-build/ccm-cms-types-motditem/ users/mbooth/projects/aplaws-build/ccm-cms-types-mparticle/ users/mbooth/projects/aplaws-build/ccm-cms-types-newsitem/ users/mbooth/projects/aplaws-build/ccm-cms-types-organization/ users/mbooth/projects/aplaws-build/ccm-cms-types-pressrelease/ users/mbooth/projects/aplaws-build/ccm-cms-types-service/ users/mbooth/projects/aplaws-build/ccm-cms-types-siteproxy/ users/mbooth/projects/aplaws-build/ccm-cms/ users/mbooth/projects/aplaws-build/ccm-core/ users/mbooth/projects/aplaws-build/ccm-forum/ users/mbooth/projects/aplaws-build/ccm-ldn-aplaws/ users/mbooth/projects/aplaws-build/ccm-ldn-atoz/ users/mbooth/projects/aplaws-build/ccm-ldn-dublin/ users/mbooth/projects/aplaws-build/ccm-ldn-exporter/ users/mbooth/projects/aplaws-build/ccm-ldn-freeform/ users/mbooth/projects/aplaws-build/ccm-ldn-image-step/ users/mbooth/projects/aplaws-build/ccm-ldn-importer/ users/mbooth/projects/aplaws-build/ccm-ldn-navigation/ users/mbooth/projects/aplaws-build/ccm-ldn-portal/ users/mbooth/projects/aplaws-build/ccm-ldn-rss/ users/mbooth/projects/aplaws-build/ccm-ldn-search/ users/mbooth/projects/aplaws-build/ccm-ldn-shortcuts/ users/mbooth/projects/aplaws-build/ccm-ldn-subsite/ users/mbooth/projects/aplaws-build/ccm-ldn-surreycc-50plus/ users/mbooth/projects/aplaws-build/ccm-ldn-terms/ users/mbooth/projects/aplaws-build/ccm-ldn-theme/ users/mbooth/projects/aplaws-build/ccm-ldn-util/ users/mbooth/projects/aplaws-build/ccm-ldn-xmlfeed/ users/mbooth/projects/aplaws-build/ccm-simplesurvey/ users/mbooth/projects/aplaws-build/ccm-user-preferences/ users/mbooth/projects/aplaws-build/tools/ Log: Genesis of build project |
Author: mbooth
Date: 2005-02-18 14:42:39 +0100 (Fri, 18 Feb 2005)
New Revision: 270
Added:
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentEmailField.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java
Removed:
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/jsp/
Modified:
ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/ui/formbuilder/FormProperties.java
ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init
ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/PlaceholdersInitListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/HeadingForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextFieldForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetLabelForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java
ccm-core/trunk/src/com/arsdigita/formbuilder/util/Placeholders.java
ccm-core/trunk/src/com/arsdigita/mail/MailConfig.java
ccm-core/trunk/src/com/arsdigita/util/StringUtils.java
ccm-core/trunk/web/packages/formbuilder/xsl/TextWidgets.xsl
ccm-core/trunk/web/packages/formbuilder/xsl/formbuilder.xsl
ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
Log:
Integrate formbuilder changes from InfoAxon
Add PersistentEmailField which sets the origin of an email
Add data protected text to forms in APLAWS stylesheets
Fix HiddenIDGenerator
Removed unused code in com.arsdigita.formbuilder.ui.jsp
Add tool to aid authoring templated emails
Modified: ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init 2005-02-18 13:42:39 UTC (rev 270)
@@ -219,7 +219,10 @@
"com.arsdigita.formbuilder.ui.editors.HeadingForm" },
{ "forms-cms", "Section Break", "Section Break",
"com.arsdigita.formbuilder.PersistentHorizontalRule",
- "com.arsdigita.formbuilder.ui.editors.HorizontalRuleForm" }
+ "com.arsdigita.formbuilder.ui.editors.HorizontalRuleForm" },
+ { "forms-cms", "User Email Fields", "User Email Fields",
+ "com.arsdigita.formbuilder.PersistentEmailField",
+ "com.arsdigita.formbuilder.ui.editors.EmailFieldForm" }
};
processListenerTypes = {
{ "forms-cms", "Confirmation email", "Confirmation emails",
Modified: ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/ui/formbuilder/FormProperties.java
===================================================================
--- ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/ui/formbuilder/FormProperties.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/ui/formbuilder/FormProperties.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -102,11 +102,10 @@
add(new Label(GlobalizationUtil
.globalize("cms.ui.formbuilder.description")));
add(m_desc);
-
- add(new Label(GlobalizationUtil
- .globalize("cms.formbuilder.css")));
+ //Css control hidden
+ /*add(new Label(GlobalizationUtil.globalize("cms.formbuilder.css")));
m_css = new TextField(new StringParameter("css"));
- add(m_css);
+ add(m_css);*/
}
public void init(FormSectionEvent e)
@@ -130,7 +129,8 @@
PersistentForm form = item.getForm();
m_desc.setValue(e.getPageState(), form.getDescription());
- m_css.setValue(e.getPageState(), item.getCSS());
+ //Css hidden
+ //m_css.setValue(e.getPageState(), item.getCSS());
return item;
}
@@ -140,8 +140,9 @@
FormItem item = (FormItem)super.processBasicWidgets(e);
PersistentForm form = item.getForm();
-
- item.setCSS((String)m_css.getValue(e.getPageState()));
+
+ //Css hidden
+ //item.setCSS((String)m_css.getValue(e.getPageState()));
item.save();
form.setAdminName(item.getName());
form.setHTMLName(item.getName());
@@ -171,8 +172,10 @@
ContentPage.TITLE);
add(GlobalizationUtil.globalize("cms.ui.formbuilder.description"),
"form", new FormFormatter());
- add(GlobalizationUtil.globalize("cms.formbuilder.css"),
- FormItem.CSS);
+ //Css hidden temporarily
+
+ //add(GlobalizationUtil.globalize("cms.formbuilder.css"),
+ // FormItem.CSS);
}
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -18,17 +18,27 @@
*/
package com.arsdigita.formbuilder;
+import com.arsdigita.bebop.FormData;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.RequestLocal;
+import com.arsdigita.db.Sequences;
import com.arsdigita.formbuilder.PersistentHidden;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.ObjectType;
-import java.math.BigDecimal;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.persistence.OID;
+import com.arsdigita.util.UncheckedWrapperException;
+import com.arsdigita.web.Web;
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import javax.servlet.http.HttpServletRequest;
+public class HiddenIDGenerator extends PersistentHidden {
+ private RequestLocal m_value = new RequestLocal();
+ private static final String FORMS_UNIQUE_ID = "forms_unique_id_seq";
-public class HiddenIDGenerator extends PersistentHidden {
public static final String BASE_DATA_OBJECT_TYPE =
PersistentHidden.BASE_DATA_OBJECT_TYPE;
@@ -38,14 +48,10 @@
public HiddenIDGenerator(String typeName) {
super(typeName);
-
- setDefaultValue("::system.uniqueid::");
}
public HiddenIDGenerator(ObjectType type) {
super(type);
-
- setDefaultValue("::system.uniqueid::");
}
public HiddenIDGenerator(DataObject obj) {
@@ -63,4 +69,19 @@
super(oid);
}
+
+ public Object getValue(FormData data) {
+ HttpServletRequest req = Web.getRequest();
+ BigDecimal id = (BigDecimal) req.getAttribute(FORMS_UNIQUE_ID);
+ if (null != id) return id.toString();
+
+ try {
+ id = Sequences.getNextValue("forms_unique_id_seq");
+ } catch (SQLException ex) {
+ throw new UncheckedWrapperException(ex);
+ }
+ req.setAttribute(FORMS_UNIQUE_ID, id);
+
+ return id.toString();
+ }
}
Added: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentEmailField.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentEmailField.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentEmailField.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+package com.arsdigita.formbuilder;
+
+import java.math.BigDecimal;
+
+import com.arsdigita.bebop.Component;
+import com.arsdigita.bebop.form.TextField;
+import com.arsdigita.persistence.OID;
+import com.arsdigita.persistence.DataObject;
+import com.arsdigita.persistence.metadata.ObjectType;
+
+import org.apache.log4j.Logger;
+
+/**
+ * This class is responsible for persisting Bebop TextFields. The TextField
+ * is saved with the save() method. To resurrect the TextField, use the constructor
+ * taking the id of the saved TextField and then invoke createComponent().
+ *
+ * @author Shubham nagar
+ * @company Infoaxon Technology
+ * @date 13-12-2004
+ *
+ */
+public class PersistentEmailField extends PersistentWidget {
+
+ public static final String versionId = "$Id: //core-platform/dev/src/com/arsdigita/formbuilder/PersistentTextField.java#9 $ by $Author$, $DateTime: 2004/08/16 18:10:38 $";
+
+ private static final Logger s_log =
+ Logger.getLogger(PersistentEmailField.class.getName());
+
+ /**
+ * The fully qualified name of the underlying DataObject of this class.
+ */
+ public static final String BASE_DATA_OBJECT_TYPE =
+ "com.arsdigita.formbuilder.Widget";
+
+ // *** Constructors -------------
+
+ /**
+ * Constructor that creates a new TextField domain object that
+ * can be saved to the database later on. This class was only
+ * included to make it possible to use this DomainObject with the
+ * FormGenerator (to make the class JavaBean compliant). Use the constructor
+ * taking a parameter name instead if possible.
+ */
+ public PersistentEmailField() {
+ this(BASE_DATA_OBJECT_TYPE);
+ }
+
+ /**
+ * Constructor that creates a new TextField domain object that
+ * can be saved to the database later on.
+ */
+ public PersistentEmailField(String typeName) {
+ super(typeName);
+ }
+
+ public PersistentEmailField(ObjectType type) {
+ super(type);
+ }
+
+ public PersistentEmailField(DataObject obj) {
+ super(obj);
+ }
+
+ /**
+ * Constructor that retrieves an existing TextField domain object
+ * from the database.
+ *
+ * @param id The object id of the TextField domain object to retrieve
+ */
+ public PersistentEmailField(BigDecimal id) {
+ this(new OID(BASE_DATA_OBJECT_TYPE, id));
+ }
+
+ /**
+ * Extending classes can use this constructor to set the sub class
+ * id and object type.
+ */
+ public PersistentEmailField(OID oID) {
+ super(oID);
+ }
+
+ public static PersistentEmailField create(String parameterName) {
+ PersistentEmailField t = new PersistentEmailField();
+ t.setup(parameterName);
+ return t;
+ }
+
+ /**
+ * Create the TextField whose persistence is managed
+ * by this domain object.
+ */
+ public Component createComponent() {
+ TextField textField = new TextField(getParameterName());
+
+ copyValuesToWidget(textField);
+
+ if (getComponentAttribute("maxlength") != null) {
+ textField.setMaxLength(getMaxLength());
+ }
+
+ if (getComponentAttribute("size") != null) {
+ textField.setSize(getSize());
+ }
+
+ return textField;
+ }
+
+ //*** Attribute Methods
+ public void setMaxLength(int maxLength) {
+
+ setComponentAttribute("maxlength", Integer.toString(maxLength));
+ }
+
+ /**
+ * Defaults to 50 if no value has been set.
+ */
+ public int getMaxLength() {
+
+ String maxLength = getComponentAttribute("maxlength");
+
+ if (maxLength == null) {
+ return 50;
+ }
+
+ return Integer.parseInt(maxLength);
+ }
+
+ public void setSize(int size) {
+
+ setComponentAttribute("size", Integer.toString(size));
+ }
+
+ /**
+ * Defaults to 12 if no value is set.
+ */
+ public int getSize() {
+
+ String size = getComponentAttribute("size");
+
+ if (size == null) {
+ return 12;
+ }
+
+ return Integer.parseInt(size);
+ }
+
+ //*** Attribute metadata
+ public AttributeMetaDataList getAttributeMetaData() {
+
+ AttributeMetaDataList list = super.getAttributeMetaData();
+
+ list.add(new AttributeMetaData("size", "The size of the Text field as shown on the form"));
+ list.add(new AttributeMetaData("maxLength", "Maximum number of characters that user can input"));
+
+ return list;
+ }
+}
Property changes on: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentEmailField.java
___________________________________________________________________
Name: svn:keywords
+ "Id Author DateTime"
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -21,6 +21,9 @@
import com.arsdigita.formbuilder.parameters.PersistentParameterListener;
import com.arsdigita.formbuilder.util.FormBuilderUtil;
+import com.arsdigita.bebop.Form;
+import com.arsdigita.bebop.FormData;
+import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.form.Widget;
import com.arsdigita.domain.DataObjectNotFoundException;
@@ -322,6 +325,15 @@
return DEFAULT_VALUE_CLASS;
}
+ /**
+ * Get the value of this widget in the current request. This is the
+ * preferred method for retrieving this value. Override this method to
+ * customise this behaviour.
+ */
+ public Object getValue(FormData data) {
+ return data.get(getParameterName());
+ }
+
//*** Attribute metadata
public AttributeMetaDataList getAttributeMetaData() {
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -152,8 +152,7 @@
public void process(FormSectionEvent e)
throws FormProcessException {
- Placeholders p = new Placeholders(e.getPageState(),
- e.getFormData());
+ Placeholders p = new Placeholders(getForm(), e.getFormData());
User user = (User) Kernel.getContext().getParty();
if( null == user ) {
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -152,8 +152,10 @@
public void process(FormSectionEvent e)
throws FormProcessException {
+ FormData data = e.getFormData();
+
PersistentFormSection form = getForm();
- Placeholders p = new Placeholders(e.getPageState(), e.getFormData());
+ Placeholders p = new Placeholders(form, data);
String subject = p.interpolate(m_subject);
@@ -161,27 +163,17 @@
String from;
if( null == user ) {
from = Mail.getConfig().getDefaultFrom();
- if (from == null || "".equals(from)) {
- from = "notloggedin@" +
- Web.getConfig().getServer().getName();
- }
} else {
from = user.getPrimaryEmail().getEmailAddress();
}
StringBuffer body = new StringBuffer();
- if( null != user ) {
- PersonName name = user.getPersonName();
+ body.append(from);
+ body.append(" submitted the following:\n\n");
- body.append( name.getGivenName() ).append( ' ' );
- body.append( name.getFamilyName() );
- body.append( " submitted the following:\n\n" );
- }
-
String submit = null;
- FormData data = e.getFormData();
DataAssociationCursor components = form.getComponents();
while( components.next() ) {
PersistentComponent c = (PersistentComponent)
@@ -200,20 +192,20 @@
else
body.append( label.getLabel() );
- body.append( '\n' );
+ body.append( ": " );
- Object value = data.get( w.getParameterName() );
+ Object value = w.getValue(data);
if( null != value ) {
if( value.getClass().isArray() ) {
Object[] values = (Object[]) value;
for( int i = 0; i < values.length; i++ ) {
body.append( values[i].toString() );
- body.append( '\n' );
+ if( values.length - 1 != i )
+ body.append( ", " );
}
} else {
body.append( value.toString() );
- body.append( '\n' );
}
body.append( '\n' );
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -21,6 +21,7 @@
import com.arsdigita.formbuilder.PersistentProcessListener;
import com.arsdigita.formbuilder.util.Placeholders;
+import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
@@ -151,16 +152,18 @@
public void process(FormSectionEvent e)
throws FormProcessException {
- Placeholders p = new Placeholders(e.getPageState(),
- e.getFormData());
+ FormData data = e.getFormData();
- String from;
- User user = (User) Kernel.getContext().getParty();
- if( null == user ) {
- from = "notloggedin@" +
- Web.getConfig().getServer().getName();
- } else {
- from = user.getPrimaryEmail().getEmailAddress();
+ Placeholders p = new Placeholders(getForm(), data);
+
+ String from = (String) p.interpolate("::user.email::");
+ if (null == from) {
+ User user = (User) Kernel.getContext().getParty();
+ if( null == user ) {
+ from = Mail.getConfig().getDefaultFrom();
+ } else {
+ from = user.getPrimaryEmail().getEmailAddress();
+ }
}
String subject = p.interpolate(m_subject);
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -163,15 +163,15 @@
public void process(FormSectionEvent e)
throws FormProcessException {
- Placeholders p = new Placeholders(e.getPageState(), e.getFormData());
+ Placeholders p = new Placeholders(getForm(), e.getFormData());
+
String to = p.interpolate(m_to);
String subject = p.interpolate(m_subject);
String from;
User user = (User)Kernel.getContext().getParty();
if( null == user ) {
- from = "notloggedin@" +
- Web.getConfig().getServer().getName();
+ from = Mail.getConfig().getDefaultFrom();
} else {
from = user.getPrimaryEmail().getEmailAddress();
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties 2005-02-18 13:42:39 UTC (rev 270)
@@ -18,9 +18,12 @@
formbuilder.ui.editors.description=Description:
formbuilder.ui.editors.to=To:
formbuilder.ui.editors.label=Widget Variable Label:
+formbuilder.ui.editors.UserEmailLabel=Widget Label:
formbuilder.ui.editors.height=Height:
formbuilder.ui.editors.data_type=Data type:
formbuilder.ui.editors.answer_required=Answer Required:
+formbuilder.ui.editors.textfieldmsg=Leave these fields blank unless you want to select a maximum number of characters a user can fill in. If you want more space than 3 lines of space for the customer to answer in change enter the number of lines you want in the "width" box.
+formbuilder.ui.editors.textareamsg=Leave these fields blank unless you want to select a maximum number of characters a user can fill in.
formbuilder.ui.manage_questions_of_a_form=Manage Questions of a Form
formbuilder.ui.label_to_be_ignored=label to be ignored
formbuilder.ui.select_widget=Select Widget
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/PlaceholdersInitListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/PlaceholdersInitListener.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/PlaceholdersInitListener.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -36,16 +36,12 @@
Form f = (Form)e.getSource();
- Placeholders placeholders = getPlaceholders(e.getPageState());
+ Placeholders placeholders = new Placeholders();
PlaceholdersTraversal t = new PlaceholdersTraversal(placeholders, e.getPageState());
t.preorder(f);
}
- protected Placeholders getPlaceholders(PageState state) {
- return new Placeholders(state);
- }
-
private class PlaceholdersTraversal extends Traversal {
Placeholders m_placeholders;
PageState m_state;
Added: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -0,0 +1,144 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * This class is newly created to give support for user email field..
+ * @author Shubham nagar
+ * @company Infoaxon Technology
+ * @date 13-12-2004
+ */
+
+package com.arsdigita.formbuilder.ui.editors;
+
+import com.arsdigita.formbuilder.PersistentEmailField;
+import com.arsdigita.formbuilder.PersistentWidget;
+import com.arsdigita.formbuilder.parameters.PersistentParameterListener;
+import com.arsdigita.formbuilder.util.GlobalizationUtil;
+
+import com.arsdigita.bebop.ColumnPanel;
+import com.arsdigita.bebop.FormData;
+import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.FormSection;
+import com.arsdigita.bebop.Label;
+import com.arsdigita.bebop.Page;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.SingleSelectionModel;
+import com.arsdigita.bebop.event.FormSectionEvent;
+import com.arsdigita.bebop.form.TextField;
+import com.arsdigita.bebop.parameters.IntegerParameter;
+import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.bebop.parameters.StringParameter;
+
+import java.math.BigDecimal;
+import java.util.Iterator;
+
+import org.apache.log4j.Logger;
+
+public class EmailFieldForm extends WidgetLabelForm {
+ private static final Logger s_log = Logger.getLogger(EmailFieldForm.class);
+ private TextField m_width;
+ private SingleSelectionModel m_control;
+
+ public EmailFieldForm(String name,
+ SingleSelectionModel form,
+ SingleSelectionModel control) {
+ super(name, form, control);
+ m_control = control;
+ }
+
+ protected void addWidgets(FormSection section) {
+ super.addWidgets(section);
+ //Add code to add a message label for textarea dimension
+ m_width = new TextField(new IntegerParameter("width"));
+ m_width.setSize(5);
+ //m_width.addValidationListener(new NotNullValidationListener());
+ section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.width")), ColumnPanel.RIGHT);
+ section.add(m_width);
+ }
+
+ protected PersistentWidget getWidget() {
+ return new PersistentEmailField();
+ }
+
+ protected PersistentWidget getWidget(BigDecimal id) {
+ return new PersistentEmailField(id);
+ }
+
+ protected void addName(FormSection section) {
+ TextField name = new TextField(new StringParameter(NAME));
+ name.setSize(50);
+ section.add(name);
+
+ m_name = name;
+ }
+
+ protected void automaticallySetName(ParameterModel model) { }
+
+ protected String getName(PageState ps, FormData data) {
+ return "::user.email::";
+ }
+
+ protected void initWidgets(FormSectionEvent e,
+ PersistentWidget w)
+ throws FormProcessException {
+ super.initWidgets(e, w);
+ PersistentEmailField widget = (PersistentEmailField)w;
+ PageState state = e.getPageState();
+
+ if (widget == null) {
+ m_width.setValue(state, "");
+ }
+ else {
+ if(widget.getSize()==0) {
+ m_width.setValue(state, "");
+ } else {
+ m_width.setValue(state, new Integer(widget.getSize()));
+ }
+ }
+ }
+
+ protected void processWidgets(FormSectionEvent e,
+ PersistentWidget w)
+ throws FormProcessException {
+ super.processWidgets(e, w);
+
+ String listenerClassNameEmail =
+ "com.arsdigita.bebop.parameters.EmailValidationListener";
+ PersistentParameterListener listenerEmail =
+ new PersistentParameterListener(listenerClassNameEmail);
+ w.addValidationListener(listenerEmail);
+ }
+
+ /**
+ * This determines whether or not the "required value" radio group
+ * is part of the form. This returns true and should be overridden
+ * by fields where it does not make sense to ask. For instance,
+ * when the widget is a hidden field then asking if it is required
+ * or not does not make any logical sense so those widgets should
+ * return false.
+ *
+ * This will always return the same value for a given widget no matter
+ * what state the widget is in.
+ */
+ protected boolean includeRequiredRadioGroup() {
+ return false;
+ }
+
+ public void register(Page p) {
+ super.register(p);
+
+ p.setVisibleDefault(m_name, false);
+ }
+}
Property changes on: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java
___________________________________________________________________
Name: svn:keywords
+ "Id Author DateTime"
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/HeadingForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/HeadingForm.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/HeadingForm.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -15,27 +15,33 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * Revision:
+ * Method : getTextWidget()
+ * Description : New htmlarea component is created inside a textarea.
*/
+
package com.arsdigita.formbuilder.ui.editors;
+import com.arsdigita.formbuilder.PersistentHeading;
+import com.arsdigita.formbuilder.PersistentText;
+import com.arsdigita.formbuilder.util.GlobalizationUtil ;
-import com.arsdigita.formbuilder.util.GlobalizationUtil ;
import com.arsdigita.bebop.SingleSelectionModel;
-import com.arsdigita.bebop.form.TextField;
+import com.arsdigita.bebop.form.TextArea;
+import com.arsdigita.bebop.form.DHTMLEditor;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.formbuilder.PersistentHeading;
-import com.arsdigita.formbuilder.PersistentText;
import com.arsdigita.bebop.form.Widget;
import com.arsdigita.globalization.GlobalizedMessage;
+
import java.math.BigDecimal;
-
/**
* This is the form used to create a persistent heading element
*/
public class HeadingForm extends TextForm {
+ public static final String TEXT_ENTRY = "text_entry";
+
public HeadingForm(String name,
SingleSelectionModel form,
SingleSelectionModel control) {
@@ -47,9 +53,13 @@
* can provides subclasses with the ability to use any size desired
*/
protected Widget getTextWidget(StringParameter parameter) {
- TextField field = new TextField(parameter);
- field.setSize(40);
- return field;
+ //Create htmlarea component inside textarea
+ TextArea m_textWidget = new DHTMLEditor(TEXT_ENTRY);
+ m_textWidget.setRows(25);
+ m_textWidget.setCols(70);
+ m_textWidget.setWrap(DHTMLEditor.SOFT);
+
+ return m_textWidget;
}
/**
@@ -65,8 +75,7 @@
return new PersistentHeading();
}
- protected PersistentText getPersistentText(BigDecimal id)
- throws DataObjectNotFoundException {
+ protected PersistentText getPersistentText(BigDecimal id) {
return new PersistentHeading(id);
}
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -101,7 +101,7 @@
m_controls = new SingleSelect("controls");
m_controls.addOption(new Option("", "Select a control"));
- m_controls.setOnChange("if(this.value.length>0) document.getElementById('templatedEmailBody').value+='::form.'+this.value+'::';");
+ m_controls.setOnChange("if(this.value.length>0) document.getElementById('templatedEmailBody').value+=this.value;");
try {
m_controls.addPrintListener(new PrintListener() {
public void prepare(PrintEvent ev) {
@@ -115,6 +115,8 @@
new OID( PersistentFormSection.BASE_DATA_OBJECT_TYPE,
formID );
+ m_controls.addOption(new Option("::user.email::", "Email address"), ps);
+
PersistentFormSection form = (PersistentFormSection)
DomainObjectFactory.newInstance( formOID );
@@ -126,7 +128,11 @@
if( c instanceof PersistentWidget ) {
PersistentWidget w = (PersistentWidget) c;
- m_controls.addOption(new Option(w.getParameterName(), w.getParameterName()), ps);
+ if (!"::user.email::".equals(w.getParameterName())) {
+ String parameter = "::form." +
+ w.getParameterName() + "::";
+ m_controls.addOption(new Option(parameter, w.getParameterName()), ps);
+ }
}
}
}
@@ -188,4 +194,8 @@
l.setSubject(subject);
l.setBody(body);
}
+
+ protected boolean showName() {
+ return false;
+ }
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -1,55 +1,52 @@
/*
- * Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved.
- *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * Revision:
+ * Method : addWidgets()
+ * Description : Message Label added for textarea dimensions.
+ * NullValidationListener disabled for width and height of the control to make the attributes
+ * optional.
+ * Method : processWidgets()
+ * Description : Set the default value of width and height as 0 which would be replaced by the XSL ont the frontend
*/
+
package com.arsdigita.formbuilder.ui.editors;
-
import com.arsdigita.formbuilder.util.GlobalizationUtil ;
-
-
+import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState;
-
+import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.event.FormSectionEvent;
-
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.TextField;
-
import com.arsdigita.bebop.parameters.IntegerParameter;
+import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
-
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.formbuilder.PersistentTextArea;
+import com.arsdigita.formbuilder.PersistentWidget;
-
import java.math.BigDecimal;
-import com.arsdigita.bebop.SingleSelectionModel;
-import com.arsdigita.formbuilder.PersistentWidget;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
-import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
-import com.arsdigita.bebop.ColumnPanel;
-
public class TextAreaForm extends WidgetLabelForm {
private TextField m_width;
private TextField m_height;
@@ -66,14 +63,16 @@
m_width = new TextField(new IntegerParameter("width"));
m_width.setSize(5);
- m_width.addValidationListener(new NotNullValidationListener());
+ //m_width.addValidationListener(new NotNullValidationListener());
//m_width.addValidationListener(new NumberInRangeValidationListener(1, 70));
+ section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.textareamsg")), ColumnPanel.RIGHT);
+ section.add(new Label(""));
section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.width")), ColumnPanel.RIGHT);
section.add(m_width);
m_height = new TextField(new IntegerParameter("height"));
m_height.setSize(5);
- m_height.addValidationListener(new NotNullValidationListener());
+ //m_height.addValidationListener(new NotNullValidationListener());
m_height.addValidationListener(new NumberInRangeValidationListener(1, 70));
section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.height")), ColumnPanel.RIGHT);
section.add(m_height);
@@ -108,9 +107,20 @@
m_width.setValue(state, "");
m_height.setValue(state, "");
m_value.setValue(state, "");
- } else {
- m_width.setValue(state, new Integer(widget.getCols()));
- m_height.setValue(state, new Integer(widget.getRows()));
+ }
+ else {
+ if(widget.getCols()==0) {
+ m_width.setValue(state, "");
+ }
+ else{
+ m_width.setValue(state, new Integer(widget.getCols()));
+ }
+ if(widget.getRows()==0) {
+ m_height.setValue(state, "");
+ }
+ else{
+ m_height.setValue(state, new Integer(widget.getRows()));
+ }
m_value.setValue(state, widget.getDefaultValue());
}
}
@@ -119,17 +129,22 @@
PersistentWidget w)
throws FormProcessException {
super.processWidgets(e, w);
-
+ //set the default width and height to 0
PersistentTextArea widget = (PersistentTextArea)w;
FormData data = e.getFormData();
-
- Integer width = (Integer)data.get("width");
- Integer height = (Integer)data.get("height");
+ Integer width = new Integer(0);
+ Integer height = new Integer(0);
+ if(data.get("width")!=null) {
+ width = (Integer)data.get("width");
+ }
+ if(data.get("height")!=null) {
+ height = (Integer)data.get("height");
+ }
+
String value = (String)data.get("value");
-
widget.setCols(width.intValue());
- widget.setRows(height.intValue());
+ widget.setRows(height.intValue());
widget.setDefaultValue(value);
}
}
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextFieldForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextFieldForm.java 2005-02-18 13:21:09 UTC (rev 269)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextFieldForm.java 2005-02-18 13:42:39 UTC (rev 270)
@@ -16,44 +16,32 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+
package com.arsdigita.formbuilder.ui.editors;
-
-import com.arsdigita.formbuilder.util.GlobalizationUtil ;
-
-
+import com.arsdigita.formbuilder.PersistentTextField;
+import com.arsdigita.formbuilder.PersistentWidget;
+import com.arsdigita.formbuilder.parameters.PersistentParameterListener;
import com.arsdigita.formbuilder.parameters.TextValidationListener;
+import com.arsdigita.formbuilder.util.GlobalizationUtil ;
+import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
..
|
|
From: <mb...@re...> - 2005-02-18 13:22:20
|
Author: mbooth
Date: 2005-02-18 14:21:09 +0100 (Fri, 18 Feb 2005)
New Revision: 269
Added:
ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SpliceEnvironment.java
Log:
Fix compile error
Added: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SpliceEnvironment.java
===================================================================
--- ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SpliceEnvironment.java 2005-02-18 13:14:44 UTC (rev 268)
+++ ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SpliceEnvironment.java 2005-02-18 13:21:09 UTC (rev 269)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.redhat.persistence.engine.rdbms;
+
+import com.redhat.persistence.common.Path;
+
+class SpliceEnvironment extends Environment {
+
+ private Environment m_base;
+ private Path m_path;
+ private Environment m_splice;
+
+ public SpliceEnvironment(Environment base, Path path, Environment splice) {
+ super(base.getEngine(), null);
+ m_base = base;
+ m_path = path;
+ m_splice = splice;
+ }
+
+ private Path unsplice(Path path) {
+ return Path.get(":" + m_path.getRelative(path).getPath());
+ }
+
+ public boolean contains(Path path) {
+ if (m_path.isAncestor(path)) {
+ return m_splice.contains(unsplice(path));
+ } else {
+ return m_base.contains(path);
+ }
+ }
+
+ public void set(Path parameter, Object value) {
+ if (m_path.isAncestor(parameter)) {
+ m_splice.set(unsplice(parameter), value);
+ } else {
+ m_base.set(parameter, value);
+ }
+ }
+
+ public void set(Path parameter, Object value, int type) {
+ if (m_path.isAncestor(parameter)) {
+ m_splice.set(unsplice(parameter), value, type);
+ } else {
+ m_base.set(parameter, value, type);
+ }
+ }
+
+ public Object get(Path parameter) {
+ if (m_path.isAncestor(parameter)) {
+ return m_splice.get(unsplice(parameter));
+ } else {
+ return m_base.get(parameter);
+ }
+ }
+
+ public int getType(Path parameter) {
+ if (m_path.isAncestor(parameter)) {
+ return m_splice.getType(unsplice(parameter));
+ } else {
+ return m_base.getType(parameter);
+ }
+ }
+
+ public String toString() {
+ return "<env " + m_base + " splice on " + m_path + " with " +
+ m_splice + ">";
+ }
+
+}
Property changes on: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SpliceEnvironment.java
___________________________________________________________________
Name: svn:keywords
+ "Id Author DateTime"
|
|
From: <mb...@re...> - 2005-02-18 13:15:56
|
Author: mbooth Date: 2005-02-18 14:14:44 +0100 (Fri, 18 Feb 2005) New Revision: 268 Modified: ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java Log: Change a couple of CCM licenses to LGPL Modified: ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java =================================================================== --- ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java 2005-02-18 13:06:15 UTC (rev 267) +++ ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java 2005-02-18 13:14:44 UTC (rev 268) @@ -1,16 +1,17 @@ /* - * Copyright (C) 2003, 2003 Red Hat Corporation. 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.arsdigita.com/ADPL.txt - * - * 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. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.london.theme.dispatcher; @@ -30,7 +31,6 @@ import java.io.IOException; import org.apache.log4j.Logger; - /** * This class pulls out the theme information from the * URL so that other sections can correctly allow "previewing". Modified: ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java =================================================================== --- ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java 2005-02-18 13:06:15 UTC (rev 267) +++ ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java 2005-02-18 13:14:44 UTC (rev 268) @@ -1,16 +1,17 @@ /* - * Copyright (C) 2001, 2002 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. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.london.util; |
|
From: <ap...@re...> - 2005-02-15 13:49:31
|
Author: apevec Date: 2005-02-15 14:48:33 +0100 (Tue, 15 Feb 2005) New Revision: 214 Modified: users/apevec/todo.txt Log: todo update Modified: users/apevec/todo.txt =================================================================== --- users/apevec/todo.txt 2005-02-15 13:42:56 UTC (rev 213) +++ users/apevec/todo.txt 2005-02-15 13:48:33 UTC (rev 214) @@ -1,3 +1,4 @@ -building bundle rpms -multiple ccm homes with runtime rpms -sox custom JSPs +$Id$ +building bundle rpms - dependencies missing +multiple ccm homes with runtime rpms - done: ccm mkservice +sox custom JSPs - navigation.ui.DirectoryComponent Property changes on: users/apevec/todo.txt ___________________________________________________________________ Name: svn:keywords + Id Author |
|
From: <mb...@re...> - 2005-02-15 13:21:30
|
Author: mbooth Date: 2005-02-15 14:20:33 +0100 (Tue, 15 Feb 2005) New Revision: 212 Added: users/mbooth/projects/aplaws/ccm-auth-http/ users/mbooth/projects/aplaws/ccm-cms-assets-fileattachment/ users/mbooth/projects/aplaws/ccm-cms-assets-relatedlink/ users/mbooth/projects/aplaws/ccm-cms-types-address/ users/mbooth/projects/aplaws/ccm-cms-types-agenda/ users/mbooth/projects/aplaws/ccm-cms-types-article/ users/mbooth/projects/aplaws/ccm-cms-types-bookmark/ users/mbooth/projects/aplaws/ccm-cms-types-contact/ users/mbooth/projects/aplaws/ccm-cms-types-esdservice/ users/mbooth/projects/aplaws/ccm-cms-types-event/ users/mbooth/projects/aplaws/ccm-cms-types-faqitem/ users/mbooth/projects/aplaws/ccm-cms-types-filestorageitem/ users/mbooth/projects/aplaws/ccm-cms-types-formitem/ users/mbooth/projects/aplaws/ccm-cms-types-formsectionitem/ users/mbooth/projects/aplaws/ccm-cms-types-glossaryitem/ users/mbooth/projects/aplaws/ccm-cms-types-inlinesite/ users/mbooth/projects/aplaws/ccm-cms-types-job/ users/mbooth/projects/aplaws/ccm-cms-types-legalnotice/ users/mbooth/projects/aplaws/ccm-cms-types-minutes/ users/mbooth/projects/aplaws/ccm-cms-types-motditem/ users/mbooth/projects/aplaws/ccm-cms-types-mparticle/ users/mbooth/projects/aplaws/ccm-cms-types-newsitem/ users/mbooth/projects/aplaws/ccm-cms-types-organization/ users/mbooth/projects/aplaws/ccm-cms-types-pressrelease/ users/mbooth/projects/aplaws/ccm-cms-types-service/ users/mbooth/projects/aplaws/ccm-cms-types-siteproxy/ users/mbooth/projects/aplaws/ccm-cms/ users/mbooth/projects/aplaws/ccm-core/ users/mbooth/projects/aplaws/ccm-forum/ users/mbooth/projects/aplaws/ccm-ldn-aplaws/ users/mbooth/projects/aplaws/ccm-ldn-atoz/ users/mbooth/projects/aplaws/ccm-ldn-dublin/ users/mbooth/projects/aplaws/ccm-ldn-exporter/ users/mbooth/projects/aplaws/ccm-ldn-freeform/ users/mbooth/projects/aplaws/ccm-ldn-image-step/ users/mbooth/projects/aplaws/ccm-ldn-importer/ users/mbooth/projects/aplaws/ccm-ldn-navigation/ users/mbooth/projects/aplaws/ccm-ldn-portal/ users/mbooth/projects/aplaws/ccm-ldn-rss/ users/mbooth/projects/aplaws/ccm-ldn-search/ users/mbooth/projects/aplaws/ccm-ldn-shortcuts/ users/mbooth/projects/aplaws/ccm-ldn-subsite/ users/mbooth/projects/aplaws/ccm-ldn-terms/ users/mbooth/projects/aplaws/ccm-ldn-theme/ users/mbooth/projects/aplaws/ccm-ldn-util/ users/mbooth/projects/aplaws/ccm-ldn-xmlfeed/ users/mbooth/projects/aplaws/ccm-simplesurvey/ users/mbooth/projects/aplaws/ccm-user-preferences/ Modified: users/mbooth/projects/aplaws/ Log: Trying something different Property changes on: users/mbooth/projects/aplaws ___________________________________________________________________ Name: svn:externals - ccm-auth-http http://aplaws.redhat.com/svn/aplaws/ccm-auth-http/trunk ccm-cms http://aplaws.redhat.com/svn/aplaws/ccm-cms/trunk ccm-cms-assets-fileattachment http://aplaws.redhat.com/svn/aplaws/ccm-cms-assets-fileattachment/trunk ccm-cms-assets-relatedlink http://aplaws.redhat.com/svn/aplaws/ccm-cms-assets-relatedlink/trunk ccm-cms-types-address http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-address/trunk ccm-cms-types-agenda http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-agenda/trunk ccm-cms-types-article http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-article/trunk ccm-cms-types-bookmark http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-bookmark/trunk ccm-cms-types-contact http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-contact/trunk ccm-cms-types-esdservice http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-esdservice/trunk ccm-cms-types-event http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-event/trunk ccm-cms-types-faqitem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-faqitem/trunk ccm-cms-types-filestorageitem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-filestorageitem/trunk ccm-cms-types-formitem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-formitem/trunk ccm-cms-types-formsectionitem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-formsectionitem/trunk ccm-cms-types-glossaryitem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-glossaryitem/trunk ccm-cms-types-inlinesite http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-inlinesite/trunk ccm-cms-types-job http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-job/trunk ccm-cms-types-legalnotice http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-legalnotice/trunk ccm-cms-types-minutes http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-minutes/trunk ccm-cms-types-motditem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-motditem/trunk ccm-cms-types-mparticle http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-mparticle/trunk ccm-cms-types-newsitem http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-newsitem/trunk ccm-cms-types-organization http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-organization/trunk ccm-cms-types-pressrelease http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-pressrelease/trunk ccm-cms-types-service http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-service/trunk ccm-cms-types-siteproxy http://aplaws.redhat.com/svn/aplaws/ccm-cms-types-siteproxy/trunk ccm-core http://aplaws.redhat.com/svn/aplaws/ccm-core/trunk ccm-forum http://aplaws.redhat.com/svn/aplaws/ccm-forum/trunk ccm-ldn-aplaws http://aplaws.redhat.com/svn/aplaws/ccm-ldn-aplaws/trunk ccm-ldn-atoz http://aplaws.redhat.com/svn/aplaws/ccm-ldn-atoz/trunk ccm-ldn-dublin http://aplaws.redhat.com/svn/aplaws/ccm-ldn-dublin/trunk ccm-ldn-exporter http://aplaws.redhat.com/svn/aplaws/ccm-ldn-exporter/trunk ccm-ldn-freeform http://aplaws.redhat.com/svn/aplaws/ccm-ldn-freeform/trunk ccm-ldn-image-step http://aplaws.redhat.com/svn/aplaws/ccm-ldn-image-step/trunk ccm-ldn-importer http://aplaws.redhat.com/svn/aplaws/ccm-ldn-importer/trunk ccm-ldn-navigation http://aplaws.redhat.com/svn/aplaws/ccm-ldn-navigation/trunk ccm-ldn-portal http://aplaws.redhat.com/svn/aplaws/ccm-ldn-portal/trunk ccm-ldn-rss http://aplaws.redhat.com/svn/aplaws/ccm-ldn-rss/trunk ccm-ldn-search http://aplaws.redhat.com/svn/aplaws/ccm-ldn-search/trunk ccm-ldn-shortcuts http://aplaws.redhat.com/svn/aplaws/ccm-ldn-shortcuts/trunk ccm-ldn-subsite http://aplaws.redhat.com/svn/aplaws/ccm-ldn-subsite/trunk ccm-ldn-terms http://aplaws.redhat.com/svn/aplaws/ccm-ldn-terms/trunk ccm-ldn-theme http://aplaws.redhat.com/svn/aplaws/ccm-ldn-theme/trunk ccm-ldn-util http://aplaws.redhat.com/svn/aplaws/ccm-ldn-util/trunk ccm-ldn-xmlfeed http://aplaws.redhat.com/svn/aplaws/ccm-ldn-xmlfeed/trunk ccm-simplesurvey http://aplaws.redhat.com/svn/aplaws/ccm-simplesurvey/trunk ccm-user-preferences http://aplaws.redhat.com/svn/aplaws/ccm-user-preferences/trunk/ |
Author: mbooth Date: 2005-02-15 11:57:04 +0100 (Tue, 15 Feb 2005) New Revision: 210 Added: ccm-auth-http/trunk/.svnignore ccm-cms-assets-fileattachment/trunk/.svnignore ccm-cms-assets-notes/trunk/.svnignore ccm-cms-assets-relatedlink/trunk/.svnignore ccm-cms-types-address/trunk/.svnignore ccm-cms-types-agenda/trunk/.svnignore ccm-cms-types-article/trunk/.svnignore ccm-cms-types-bookmark/trunk/.svnignore ccm-cms-types-contact/trunk/.svnignore ccm-cms-types-esdservice/trunk/.svnignore ccm-cms-types-event/trunk/.svnignore ccm-cms-types-faqitem/trunk/.svnignore ccm-cms-types-filestorageitem/trunk/.svnignore ccm-cms-types-formitem/trunk/.svnignore ccm-cms-types-formsectionitem/trunk/.svnignore ccm-cms-types-glossaryitem/trunk/.svnignore ccm-cms-types-inlinesite/trunk/.svnignore ccm-cms-types-job/trunk/.svnignore ccm-cms-types-legalnotice/trunk/.svnignore ccm-cms-types-minutes/trunk/.svnignore ccm-cms-types-motditem/trunk/.svnignore ccm-cms-types-mparticle/trunk/.svnignore ccm-cms-types-newsitem/trunk/.svnignore ccm-cms-types-organization/trunk/.svnignore ccm-cms-types-pressrelease/trunk/.svnignore ccm-cms-types-service/trunk/.svnignore ccm-cms-types-siteproxy/trunk/.svnignore ccm-cms/trunk/.svnignore ccm-core/trunk/.svnignore ccm-forum/trunk/.svnignore ccm-ldn-aplaws/trunk/.svnignore ccm-ldn-atoz/trunk/.svnignore ccm-ldn-dublin/trunk/.svnignore ccm-ldn-exporter/trunk/.svnignore ccm-ldn-freeform/trunk/.svnignore ccm-ldn-image-step/trunk/.svnignore ccm-ldn-importer/trunk/.svnignore ccm-ldn-navigation/trunk/.svnignore ccm-ldn-portal/trunk/.svnignore ccm-ldn-rss/trunk/.svnignore ccm-ldn-search/trunk/.svnignore ccm-ldn-shortcuts/trunk/.svnignore ccm-ldn-subsite/trunk/.svnignore ccm-ldn-terms/trunk/.svnignore ccm-ldn-theme/trunk/.svnignore ccm-ldn-util/trunk/.svnignore ccm-ldn-xmlfeed/trunk/.svnignore ccm-simplesurvey/trunk/.svnignore Modified: ccm-auth-http/trunk/ ccm-cms-assets-fileattachment/trunk/ ccm-cms-assets-notes/trunk/ ccm-cms-assets-relatedlink/trunk/ ccm-cms-types-address/trunk/ ccm-cms-types-agenda/trunk/ ccm-cms-types-article/trunk/ ccm-cms-types-bookmark/trunk/ ccm-cms-types-contact/trunk/ ccm-cms-types-esdservice/trunk/ ccm-cms-types-event/trunk/ ccm-cms-types-faqitem/trunk/ ccm-cms-types-filestorageitem/trunk/ ccm-cms-types-formitem/trunk/ ccm-cms-types-formsectionitem/trunk/ ccm-cms-types-glossaryitem/trunk/ ccm-cms-types-inlinesite/trunk/ ccm-cms-types-job/trunk/ ccm-cms-types-legalnotice/trunk/ ccm-cms-types-minutes/trunk/ ccm-cms-types-motditem/trunk/ ccm-cms-types-mparticle/trunk/ ccm-cms-types-newsitem/trunk/ ccm-cms-types-organization/trunk/ ccm-cms-types-pressrelease/trunk/ ccm-cms-types-service/trunk/ ccm-cms-types-siteproxy/trunk/ ccm-cms/trunk/ ccm-core/trunk/ ccm-forum/trunk/ ccm-ldn-aplaws/trunk/ ccm-ldn-atoz/trunk/ ccm-ldn-dublin/trunk/ ccm-ldn-exporter/trunk/ ccm-ldn-freeform/trunk/ ccm-ldn-image-step/trunk/ ccm-ldn-importer/trunk/ ccm-ldn-navigation/trunk/ ccm-ldn-portal/trunk/ ccm-ldn-rss/trunk/ ccm-ldn-search/trunk/ ccm-ldn-shortcuts/trunk/ ccm-ldn-subsite/trunk/ ccm-ldn-terms/trunk/ ccm-ldn-theme/trunk/ ccm-ldn-util/trunk/ ccm-ldn-xmlfeed/trunk/ ccm-simplesurvey/trunk/ Log: Add svn:ignores to applications. Note that .svnignore doesn't work the same way as .cvsignores. Changes to this file need to be manually applied to the directory containing it. It's added for convenience. Property changes on: ccm-auth-http/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-auth-http/trunk/.svnignore =================================================================== --- ccm-auth-http/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-auth-http/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms/trunk/.svnignore =================================================================== --- ccm-cms/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-assets-fileattachment/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-assets-fileattachment/trunk/.svnignore =================================================================== --- ccm-cms-assets-fileattachment/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-assets-fileattachment/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-assets-notes/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-assets-notes/trunk/.svnignore =================================================================== --- ccm-cms-assets-notes/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-assets-notes/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-assets-relatedlink/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-assets-relatedlink/trunk/.svnignore =================================================================== --- ccm-cms-assets-relatedlink/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-assets-relatedlink/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-address/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-address/trunk/.svnignore =================================================================== --- ccm-cms-types-address/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-address/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-agenda/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-agenda/trunk/.svnignore =================================================================== --- ccm-cms-types-agenda/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-agenda/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-article/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-article/trunk/.svnignore =================================================================== --- ccm-cms-types-article/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-article/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-bookmark/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-bookmark/trunk/.svnignore =================================================================== --- ccm-cms-types-bookmark/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-bookmark/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-contact/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-contact/trunk/.svnignore =================================================================== --- ccm-cms-types-contact/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-contact/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-esdservice/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-esdservice/trunk/.svnignore =================================================================== --- ccm-cms-types-esdservice/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-esdservice/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-event/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-event/trunk/.svnignore =================================================================== --- ccm-cms-types-event/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-event/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-faqitem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-faqitem/trunk/.svnignore =================================================================== --- ccm-cms-types-faqitem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-faqitem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-filestorageitem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-filestorageitem/trunk/.svnignore =================================================================== --- ccm-cms-types-filestorageitem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-filestorageitem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-formitem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-formitem/trunk/.svnignore =================================================================== --- ccm-cms-types-formitem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-formitem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-formsectionitem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-formsectionitem/trunk/.svnignore =================================================================== --- ccm-cms-types-formsectionitem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-formsectionitem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-glossaryitem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-glossaryitem/trunk/.svnignore =================================================================== --- ccm-cms-types-glossaryitem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-glossaryitem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-inlinesite/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-inlinesite/trunk/.svnignore =================================================================== --- ccm-cms-types-inlinesite/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-inlinesite/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-job/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-job/trunk/.svnignore =================================================================== --- ccm-cms-types-job/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-job/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-legalnotice/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-legalnotice/trunk/.svnignore =================================================================== --- ccm-cms-types-legalnotice/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-legalnotice/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-minutes/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-minutes/trunk/.svnignore =================================================================== --- ccm-cms-types-minutes/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-minutes/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-motditem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-motditem/trunk/.svnignore =================================================================== --- ccm-cms-types-motditem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-motditem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-mparticle/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-mparticle/trunk/.svnignore =================================================================== --- ccm-cms-types-mparticle/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-mparticle/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-newsitem/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-newsitem/trunk/.svnignore =================================================================== --- ccm-cms-types-newsitem/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-newsitem/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-organization/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-organization/trunk/.svnignore =================================================================== --- ccm-cms-types-organization/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-organization/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-pressrelease/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-pressrelease/trunk/.svnignore =================================================================== --- ccm-cms-types-pressrelease/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-pressrelease/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-service/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-service/trunk/.svnignore =================================================================== --- ccm-cms-types-service/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-service/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-cms-types-siteproxy/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-cms-types-siteproxy/trunk/.svnignore =================================================================== --- ccm-cms-types-siteproxy/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-cms-types-siteproxy/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-core/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-core/trunk/.svnignore =================================================================== --- ccm-core/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-core/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-forum/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-forum/trunk/.svnignore =================================================================== --- ccm-forum/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-forum/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-aplaws/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-aplaws/trunk/.svnignore =================================================================== --- ccm-ldn-aplaws/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-aplaws/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-atoz/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-atoz/trunk/.svnignore =================================================================== --- ccm-ldn-atoz/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-atoz/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-dublin/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-dublin/trunk/.svnignore =================================================================== --- ccm-ldn-dublin/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-dublin/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-exporter/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-exporter/trunk/.svnignore =================================================================== --- ccm-ldn-exporter/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-exporter/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-freeform/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-freeform/trunk/.svnignore =================================================================== --- ccm-ldn-freeform/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-freeform/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-image-step/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-image-step/trunk/.svnignore =================================================================== --- ccm-ldn-image-step/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-image-step/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-importer/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-importer/trunk/.svnignore =================================================================== --- ccm-ldn-importer/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-importer/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-navigation/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-navigation/trunk/.svnignore =================================================================== --- ccm-ldn-navigation/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-navigation/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-portal/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-portal/trunk/.svnignore =================================================================== --- ccm-ldn-portal/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-portal/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-rss/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-rss/trunk/.svnignore =================================================================== --- ccm-ldn-rss/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-rss/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-search/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-search/trunk/.svnignore =================================================================== --- ccm-ldn-search/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-search/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-shortcuts/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-shortcuts/trunk/.svnignore =================================================================== --- ccm-ldn-shortcuts/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-shortcuts/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-subsite/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-subsite/trunk/.svnignore =================================================================== --- ccm-ldn-subsite/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-subsite/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-terms/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-terms/trunk/.svnignore =================================================================== --- ccm-ldn-terms/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-terms/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-theme/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-theme/trunk/.svnignore =================================================================== --- ccm-ldn-theme/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-theme/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-util/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-util/trunk/.svnignore =================================================================== --- ccm-ldn-util/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-util/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-ldn-xmlfeed/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-ldn-xmlfeed/trunk/.svnignore =================================================================== --- ccm-ldn-xmlfeed/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-ldn-xmlfeed/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build Property changes on: ccm-simplesurvey/trunk ___________________________________________________________________ Name: svn:ignore + build Added: ccm-simplesurvey/trunk/.svnignore =================================================================== --- ccm-simplesurvey/trunk/.svnignore 2005-02-14 10:34:16 UTC (rev 209) +++ ccm-simplesurvey/trunk/.svnignore 2005-02-15 10:57:04 UTC (rev 210) @@ -0,0 +1 @@ +build |
|
From: <ap...@re...> - 2005-02-14 10:35:20
|
Author: apevec Date: 2005-02-14 11:34:16 +0100 (Mon, 14 Feb 2005) New Revision: 209 Modified: tools/trunk/misc/build-all.sh Log: one more dependecy is needed in fake.spec Modified: tools/trunk/misc/build-all.sh =================================================================== --- tools/trunk/misc/build-all.sh 2005-02-11 16:58:13 UTC (rev 208) +++ tools/trunk/misc/build-all.sh 2005-02-14 10:34:16 UTC (rev 209) @@ -214,6 +214,7 @@ Provides: perl(File::Spec) Provides: perl(File::Copy) Provides: perl(File::Find) +Provides: perl(File::stat) Provides: perl(POSIX) Provides: perl(Carp) Provides: perl(lib) |
|
From: <mb...@re...> - 2005-02-11 16:59:04
|
Author: mbooth
Date: 2005-02-11 17:58:13 +0100 (Fri, 11 Feb 2005)
New Revision: 208
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
Log:
Add friendly component name substitution in Templated Email editor. Loosely
based on code from InfoAxon.
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties 2005-02-11 12:07:06 UTC (rev 207)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormbuilderResources.properties 2005-02-11 16:58:13 UTC (rev 208)
@@ -2,6 +2,7 @@
formbuilder.ui.editors.from=From:
formbuilder.ui.editors.subject=Subject:
formbuilder.ui.editors.body=Body:
+formbuilder.ui.editors.control_names=Controls:
formbuilder.ui.editors.url=URL:
formbuilder.ui.editors.query=Query:
formbuilder.ui.editors.multiselect=Multi-select
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-02-11 12:07:06 UTC (rev 207)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-02-11 16:58:13 UTC (rev 208)
@@ -35,6 +35,8 @@
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.PrintEvent;
import com.arsdigita.bebop.event.PrintListener;
+import com.arsdigita.bebop.form.Option;
+import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.EmailParameter;
@@ -46,9 +48,11 @@
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.OID;
import com.arsdigita.util.Assert;
+import com.arsdigita.util.UncheckedWrapperException;
import java.math.BigDecimal;
import java.util.Iterator;
+import java.util.TooManyListenersException;
import org.apache.log4j.Logger;
@@ -56,7 +60,7 @@
private TextField m_to;
private TextField m_subject;
private TextArea m_body;
- private Label m_bodyLabel;
+ private SingleSelect m_controls;
private SingleSelectionModel m_form;
@@ -89,50 +93,51 @@
section.add(m_subject);
m_body = new TextArea(new StringParameter("body"));
+ m_body.setIdAttr("templatedEmailBody");
m_body.setCols(50);
m_body.setRows(20);
m_body.addValidationListener(new NotNullValidationListener());
m_body.addValidationListener(new StringInRangeValidationListener(1, 4000));
- m_bodyLabel = new Label(new PrintListener() {
- public void prepare( PrintEvent ev ) {
- PageState state = ev.getPageState();
- Label target = (Label) ev.getTarget();
+ m_controls = new SingleSelect("controls");
+ m_controls.addOption(new Option("", "Select a control"));
+ m_controls.setOnChange("if(this.value.length>0) document.getElementById('templatedEmailBody').value+='::form.'+this.value+'::';");
+ try {
+ m_controls.addPrintListener(new PrintListener() {
+ public void prepare(PrintEvent ev) {
+ PageState ps = ev.getPageState();
- BigDecimal formID = (BigDecimal) m_form.getSelectedKey( state );
- Assert.exists( formID, BigDecimal.class );
+ BigDecimal formID = (BigDecimal)
+ m_form.getSelectedKey( ps );
+ Assert.exists( formID, BigDecimal.class );
- OID formOID = new OID( PersistentFormSection.BASE_DATA_OBJECT_TYPE,
- formID );
+ OID formOID =
+ new OID( PersistentFormSection.BASE_DATA_OBJECT_TYPE,
+ formID );
- PersistentFormSection form = (PersistentFormSection)
- DomainObjectFactory.newInstance( formOID );
+ PersistentFormSection form = (PersistentFormSection)
+ DomainObjectFactory.newInstance( formOID );
- StringBuffer buf = new StringBuffer();
- buf.append( GlobalizationUtil.globalize("formbuilder.ui.editors.body").localize( state.getRequest() ) );
- buf.append( "<ul>" );
+ DataAssociationCursor components = form.getComponents();
+ while( components.next() ) {
+ PersistentComponent c = (PersistentComponent)
+ DomainObjectFactory.newInstance( components.getDataObject() );
- DataAssociationCursor components = form.getComponents();
- while( components.next() ) {
- PersistentComponent c = (PersistentComponent)
- DomainObjectFactory.newInstance( components.getDataObject() );
+ if( c instanceof PersistentWidget ) {
+ PersistentWidget w = (PersistentWidget) c;
- if( c instanceof PersistentWidget ) {
- PersistentWidget w = (PersistentWidget) c;
-
- buf.append( "<li>::form." );
- buf.append( w.getParameterName() );
- buf.append( "::</li>" );
+ m_controls.addOption(new Option(w.getParameterName(), w.getParameterName()), ps);
+ }
}
}
- buf.append( "</ul>" );
+ });
+ } catch (TooManyListenersException ex) {
+ throw new UncheckedWrapperException(ex);
+ }
- target.setLabel( buf.toString() );
- }
- });
- m_bodyLabel.setOutputEscaping( false );
-
- section.add(m_bodyLabel, ColumnPanel.RIGHT);
+ section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.control_names")), ColumnPanel.RIGHT);
+ section.add(m_controls);
+ section.add(new Label(GlobalizationUtil.globalize("formbuilder.ui.editors.body")), ColumnPanel.RIGHT);
section.add(m_body);
}
|
|
From: <mb...@re...> - 2005-02-11 12:07:58
|
Author: mbooth
Date: 2005-02-11 13:07:06 +0100 (Fri, 11 Feb 2005)
New Revision: 207
Modified:
ccm-cms/trunk/pdl/com/arsdigita/portlet/ContentItemPortlet.pdl
ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletEditor.java
ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java
Log:
Fix ContentItemPortlet. Association is no longer deleted when item is
unpublished. Use can paste complete URL of a published item and it will be recognised. User can also use preview URL. When item is not currently published, preview URL will always be used, and portlet will not display anything to public.
Modified: ccm-cms/trunk/pdl/com/arsdigita/portlet/ContentItemPortlet.pdl
===================================================================
--- ccm-cms/trunk/pdl/com/arsdigita/portlet/ContentItemPortlet.pdl 2005-02-10 15:55:32 UTC (rev 206)
+++ ccm-cms/trunk/pdl/com/arsdigita/portlet/ContentItemPortlet.pdl 2005-02-11 12:07:06 UTC (rev 207)
@@ -23,12 +23,19 @@
import com.arsdigita.portal.Portlet;
object type ContentItemPortlet extends Portlet {
+ ContentItem[0..1] item =
+ join portlet_content_item.item_id to cms_items.item_id;
+
reference key (portlet_content_item.portlet_id);
}
-association {
- ContentItem[0..1] item =
- join portlet_content_item.item_id to cms_items.item_id;
- ContentItemPortlet[0..n] itemPortlets =
- join cms_items.item_id to portlet_content_item.item_id;
-}
+// Removed the 2 way association, as it was causing the association to be
+// deleted when the item was unpublished even though the association is with
+// the draft item.
+
+//association {
+// ContentItem[0..1] item =
+// join portlet_content_item.item_id to cms_items.item_id;
+// ContentItemPortlet[0..n] itemPortlets =
+// join cms_items.item_id to portlet_content_item.item_id;
+//}
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletEditor.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletEditor.java 2005-02-10 15:55:32 UTC (rev 206)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletEditor.java 2005-02-11 12:07:06 UTC (rev 207)
@@ -28,17 +28,26 @@
import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.portal.PortletConfigFormSection;
-import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.ContentSection;
-import com.arsdigita.cms.dispatcher.ItemResolver;
-import com.arsdigita.cms.dispatcher.MultilingualItemResolver;
-import com.arsdigita.cms.portlet.ContentItemPortlet;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.kernel.ResourceType;
import com.arsdigita.kernel.SiteNode;
import com.arsdigita.portal.Portlet;
+import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Application;
import com.arsdigita.web.URL;
+import com.arsdigita.web.Web;
+
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.cms.ContentSectionCollection;
+import com.arsdigita.cms.dispatcher.CMSDispatcher;
+import com.arsdigita.cms.dispatcher.ItemResolver;
+import com.arsdigita.cms.dispatcher.MultilingualItemResolver;
+import com.arsdigita.cms.portlet.ContentItemPortlet;
+
+import java.net.MalformedURLException;
+import java.util.StringTokenizer;
+
import org.apache.log4j.Logger;
public class ContentItemPortletEditor extends PortletConfigFormSection {
@@ -49,44 +58,76 @@
private TextField m_url;
private RequestLocal m_contentItem = new RequestLocal() {
- protected Object initialValue( PageState ps ) {
- String url = (String) m_url.getValue(ps);
- String dp = URL.getDispatcherPath();
+ protected Object initialValue( PageState ps ) {
+ String userURL = (String) m_url.getValue(ps);
+ java.net.URL contextURL;
+ try {
+ contextURL = new java.net.URL( Web.getRequest().getRequestURL().toString() );
+ } catch ( MalformedURLException ex ) {
+ throw new UncheckedWrapperException( ex );
+ }
- if ( url.startsWith(dp) ) {
- url = url.substring(dp.length());
- }
+ java.net.URL url;
+ try {
+ url = new java.net.URL( contextURL, userURL );
+ } catch( MalformedURLException ex ) {
+ s_log.info( "Malformed URL " + userURL );
+ return null;
+ }
- SiteNode node = null;
+ String dp = URL.getDispatcherPath();
+ String path = url.getPath();
+ if( path.startsWith( dp ) ) {
+ path = path.substring(dp.length());
+ }
- try {
- node = SiteNode.getSiteNode(url);
- } catch (DataObjectNotFoundException ex) {
- s_log.debug( "Couldn't fetch sitenode for " + url );
- return null;
- }
+ StringTokenizer tok = new StringTokenizer( path, "/" );
+ if( !tok.hasMoreTokens() ) {
+ s_log.info( "Couldn't find a content section for " + path +
+ " in " + userURL );
+ return null;
+ }
- ContentSection section = null;
- section = ContentSection.getSectionFromNode(node);
- ItemResolver resolver = section.getItemResolver();
+ String sectionPath = '/' + tok.nextToken() + '/';
- String base = node.getURL();
- url = url.substring(base.length(), url.length());
+ String context = ContentItem.LIVE;
+ if( tok.hasMoreTokens() &&
+ CMSDispatcher.PREVIEW.equals( tok.nextToken() ) ) {
- if (url.endsWith(".jsp")) {
- url = url.substring(0, url.length()-4);
- }
+ context = CMSDispatcher.PREVIEW;
+ }
- ContentItem item = resolver.getItem(section, url, ContentItem.LIVE);
- if (item == null) {
- s_log.debug( "Couldn't resolve item " + url );
- return null;
- }
+ ContentSectionCollection sections = ContentSection.getAllSections();
+ sections.addEqualsFilter( Application.PRIMARY_URL, sectionPath );
- return item;
+ ContentSection section;
+ if( sections.next() ) {
+ section = sections.getContentSection();
+ sections.close();
+ } else {
+ s_log.info( "Content section " + sectionPath + " in " +
+ userURL + " doesn't exist." );
+ return null;
}
- };
+ ItemResolver resolver = section.getItemResolver();
+
+ path = path.substring( sectionPath.length() );
+
+ if (path.endsWith(".jsp")) {
+ path = path.substring(0, path.length()-4);
+ }
+
+ ContentItem item = resolver.getItem(section, path, context);
+ if (item == null) {
+ s_log.debug( "Couldn't resolve item " + path );
+ return null;
+ }
+
+ return item.getDraftVersion();
+ }
+ };
+
public ContentItemPortletEditor(ResourceType resType,
RequestLocal parentAppRL) {
super(resType, parentAppRL);
@@ -117,9 +158,16 @@
ItemResolver resolver = new MultilingualItemResolver();
ContentItem item = myportlet.getContentItem();
if (item != null) {
+ String context;
+ if( item.isLive() ) {
+ item = item.getPublicVersion();
+ context = ContentItem.LIVE;
+ }
+ else context = CMSDispatcher.PREVIEW;
+
m_url.setValue(state, resolver.generateItemURL(state, item,
item.getContentSection(),
- ContentItem.LIVE));
+ context));
} else {
m_url.setValue(state, "");
}
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java 2005-02-10 15:55:32 UTC (rev 206)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java 2005-02-11 12:07:06 UTC (rev 207)
@@ -33,7 +33,6 @@
private static org.apache.log4j.Logger s_log =
org.apache.log4j.Logger.getLogger(ContentItemPortletRenderer.class);
- private RequestLocalSelectionModel m_item = new RequestLocalSelectionModel();
private ContentItemPortlet m_portlet;
public ContentItemPortletRenderer(ContentItemPortlet portlet) {
@@ -46,26 +45,38 @@
"http://www.arsdigita.com/portlet/1.0");
ContentItem item = m_portlet.getContentItem();
- if (item != null) {
- m_item.setSelectedObject(state, item);
+ if( null == item ) {
+ s_log.warn( "No content item for content item portlet " +
+ m_portlet.getOID() );
+ return;
+ }
+ if( !item.isLive() ) {
+ s_log.info( "No live version for content item portlet " +
+ m_portlet.getOID() );
+ return;
+ }
- Element contentItem = content.newChildElement
- ( "cms:item", CMS.CMS_XML_NS );
+ Element contentItem = content.newChildElement
+ ( "cms:item", CMS.CMS_XML_NS );
- DomainObjectXMLRenderer renderer =
- new DomainObjectXMLRenderer(contentItem);
+ DomainObjectXMLRenderer renderer =
+ new DomainObjectXMLRenderer(contentItem);
- renderer.setWrapAttributes( true );
- renderer.setWrapRoot( false );
- renderer.setWrapObjects( false );
+ renderer.setWrapAttributes( true );
+ renderer.setWrapRoot( false );
+ renderer.setWrapObjects( false );
- renderer.walk( item, SimpleXMLGenerator.ADAPTER_CONTEXT );
- }
+ renderer.walk( item.getPublicVersion(),
+ SimpleXMLGenerator.ADAPTER_CONTEXT );
}
public Object getCacheKey() {
ContentItem item = m_portlet.getContentItem();
- return item == null ? null : item;
+ if( null == item ) return null;
+ if( item.isLive() ) return item.getPublicVersion().getOID();
+
+ // Don't cache it if it's not live
+ return null;
}
// For a given cache key a contnet item is *never* dirty,
|
|
From: <mb...@re...> - 2005-02-10 15:56:23
|
Author: mbooth Date: 2005-02-10 16:55:32 +0100 (Thu, 10 Feb 2005) New Revision: 206 Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/portal/content-item-portlet.xsl Log: Remove debugging from live stylesheets Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/portal/content-item-portlet.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/portal/content-item-portlet.xsl 2005-02-09 20:16:33 UTC (rev 205) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/portal/content-item-portlet.xsl 2005-02-10 15:55:32 UTC (rev 206) @@ -13,7 +13,6 @@ <xsl:template match="portlet:contentItem"> -<h1>HI</h1> <xsl:for-each select="./cms:item"> <div class="CI"> <h2> @@ -26,4 +25,4 @@ </div> </xsl:for-each> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> |
|
From: <mb...@re...> - 2005-02-09 20:17:14
|
Author: mbooth
Date: 2005-02-09 21:16:33 +0100 (Wed, 09 Feb 2005)
New Revision: 205
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java
ccm-cms/trunk/web/__ccm__/static/cms/admin/action-group/action-group.xsl
Log:
Only publishers can publish or republish
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java 2005-02-09 16:06:55 UTC (rev 204)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java 2005-02-09 20:16:33 UTC (rev 205)
@@ -19,20 +19,17 @@
package com.arsdigita.cms.ui.lifecycle;
import com.arsdigita.bebop.ActionLink;
+import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.Label;
+import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.ContentSection;
-import com.arsdigita.cms.dispatcher.Utilities;
-import com.arsdigita.cms.lifecycle.Lifecycle;
-import com.arsdigita.cms.ui.BaseItemPane;
-import com.arsdigita.cms.ui.ContentItemPage;
-import com.arsdigita.cms.ui.item.ContentItemRequestLocal;
-import com.arsdigita.cms.workflow.CMSTask;
+import com.arsdigita.bebop.event.RequestEvent;
+import com.arsdigita.bebop.event.RequestListener;
import com.arsdigita.kernel.User;
import com.arsdigita.toolbox.ui.ActionGroup;
import com.arsdigita.toolbox.ui.PropertyList;
@@ -44,7 +41,18 @@
import com.arsdigita.workflow.simple.Engine;
import com.arsdigita.workflow.simple.TaskException;
import com.arsdigita.workflow.simple.Workflow;
+import com.arsdigita.xml.Element;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.cms.SecurityManager;
+import com.arsdigita.cms.dispatcher.Utilities;
+import com.arsdigita.cms.lifecycle.Lifecycle;
+import com.arsdigita.cms.ui.BaseItemPane;
+import com.arsdigita.cms.ui.ContentItemPage;
+import com.arsdigita.cms.ui.item.ContentItemRequestLocal;
+import com.arsdigita.cms.workflow.CMSTask;
+
import org.apache.log4j.Logger;
import java.text.DateFormat;
@@ -132,7 +140,42 @@
}
}
- private class UnpublishLink extends ActionLink {
+ private class PublishLink extends ActionLink {
+ private RequestLocal m_canPublish = new RequestLocal();
+
+ PublishLink(Component c) { super(c); }
+
+ public void generateXML(PageState ps, Element parent) {
+ Boolean canPublish = (Boolean) m_canPublish.get(ps);
+ if (null == canPublish) {
+ SecurityManager sm = Utilities.getSecurityManager(ps);
+ ContentItem item = m_item.getContentItem(ps);
+ if (sm.canAccess(ps.getRequest(),
+ SecurityManager.PUBLISH,
+ item)) {
+ canPublish = Boolean.TRUE;
+ } else {
+ canPublish = Boolean.FALSE;
+ }
+
+ m_canPublish.set(ps, canPublish);
+ }
+
+ if (canPublish.booleanValue()) {
+ if (s_log.isDebugEnabled()) {
+ ContentItem item = m_item.getContentItem(ps);
+ s_log.debug ("User can publish " + item.getOID());
+ }
+
+ super.generateXML(ps, parent);
+ } else if (s_log.isDebugEnabled()) {
+ ContentItem item = m_item.getContentItem(ps);
+ s_log.debug ("User cannot publish " + item.getOID());
+ }
+ }
+ }
+
+ private class UnpublishLink extends PublishLink {
UnpublishLink() {
super(new Label(gz("cms.ui.item.lifecycle.unpublish")));
@@ -155,7 +198,7 @@
}
}
- private class RepublishLink extends ActionLink {
+ private class RepublishLink extends PublishLink {
RepublishLink() {
super(new Label(gz("cms.ui.item.lifecycle.republish")));
Modified: ccm-cms/trunk/web/__ccm__/static/cms/admin/action-group/action-group.xsl
===================================================================
--- ccm-cms/trunk/web/__ccm__/static/cms/admin/action-group/action-group.xsl 2005-02-09 16:06:55 UTC (rev 204)
+++ ccm-cms/trunk/web/__ccm__/static/cms/admin/action-group/action-group.xsl 2005-02-09 20:16:33 UTC (rev 205)
@@ -11,7 +11,7 @@
</div>
<table class="actions">
- <xsl:for-each select="bebop:action">
+ <xsl:for-each select="bebop:action[*]">
<tr class="action">
<td class="action-icon">
<xsl:choose>
@@ -31,4 +31,4 @@
</table>
</div>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
|
|
From: <mb...@re...> - 2005-02-09 16:07:38
|
Author: mbooth
Date: 2005-02-09 17:06:55 +0100 (Wed, 09 Feb 2005)
New Revision: 204
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java
ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java
Log:
Delete workflow after publish or republish
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java 2005-02-09 15:31:19 UTC (rev 203)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java 2005-02-09 16:06:55 UTC (rev 204)
@@ -192,6 +192,8 @@
}
}
}
+
+ workflow.delete();
}
if (ContentSection.getConfig().getUseStreamlinedCreation()) {
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java 2005-02-09 15:31:19 UTC (rev 203)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java 2005-02-09 16:06:55 UTC (rev 204)
@@ -515,6 +515,8 @@
while (iter.hasNext()) {
final CMSTask task = (CMSTask) iter.next();
+ if( s_log.isDebugEnabled() )
+ s_log.debug( "Task is " + task.getOID().toString() );
if (task.getTaskType().equals(CMSTask.DEPLOY)) {
s_log.debug("Found DEPLOY task, ID=" + CMSTask.DEPLOY);
@@ -525,6 +527,8 @@
}
}
}
+
+ workflow.delete();
}
// redirect to /content-center if streamlined creation mode is active.
|
Author: mbooth Date: 2005-02-09 16:31:19 +0100 (Wed, 09 Feb 2005) New Revision: 203 Modified: ccm-core/trunk/LICENSE ccm-core/trunk/application.xml ccm-core/trunk/bin/ccm-run ccm-core/trunk/bin/extract-reports.pl ccm-core/trunk/bin/run.sh ccm-core/trunk/bin/test-package-loading.sh ccm-core/trunk/build-hooks.xml ccm-core/trunk/doc/schemas/search.xsd ccm-core/trunk/etc/LICENSE ccm-core/trunk/etc/java-libs.txt ccm-core/trunk/etc/lib/JavaCC.zip ccm-core/trunk/etc/lib/mockobjects-core-0.09.jar ccm-core/trunk/etc/lib/mockobjects-jdk1.4-0.09.jar ccm-core/trunk/etc/lib/xmlunit1.0.jar ccm-core/trunk/lib/PDFBox-0.6.5.jar ccm-core/trunk/lib/Tidy.jar ccm-core/trunk/lib/activation.jar ccm-core/trunk/lib/aspectjrt-1.0.5.jar ccm-core/trunk/lib/cactus-1.4.1.jar ccm-core/trunk/lib/commons-beanutils.jar ccm-core/trunk/lib/commons-cli-1.0-beta-2-dev.jar ccm-core/trunk/lib/commons-codec-1.2.jar ccm-core/trunk/lib/commons-collections-3.0.jar ccm-core/trunk/lib/commons-httpclient-2.0alpha1-20020606.jar ccm-core/trunk/lib/commons-logging-1.0.jar ccm-core/trunk/lib/commons-primitives-1.0.jar ccm-core/trunk/lib/i18n.jar ccm-core/trunk/lib/jakarta-oro-2.0.7.jar ccm-core/trunk/lib/jaxp.jar ccm-core/trunk/lib/jdom.jar ccm-core/trunk/lib/jdxslt.jar ccm-core/trunk/lib/log4j.jar ccm-core/trunk/lib/lucene-1.2.jar ccm-core/trunk/lib/mail.jar ccm-core/trunk/lib/poi-2.5-final-20040302.jar ccm-core/trunk/lib/postgresql.jar ccm-core/trunk/lib/saxon.jar ccm-core/trunk/lib/tm-extractors-0.4.jar ccm-core/trunk/lib/xalan.jar ccm-core/trunk/lib/xerces.jar ccm-core/trunk/lib/xsltc.jar ccm-core/trunk/pdl/com/arsdigita/auditing/BasicAuditTrail.pdl ccm-core/trunk/pdl/com/arsdigita/categorization/Category.pdl ccm-core/trunk/pdl/com/arsdigita/categorization/CategoryPurpose.pdl ccm-core/trunk/pdl/com/arsdigita/categorization/query-getRootCategory.ora.pdl ccm-core/trunk/pdl/com/arsdigita/categorization/query-getRootCategory.pg.pdl ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.ora.pdl ccm-core/trunk/pdl/com/arsdigita/categorization/query-getSubcategories.pg.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/Component.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/DataDrivenSelect.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/DataQueries.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/FormSection.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/Listener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/MetaObject.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/ObjectType.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/Option.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/PersistentDataQuery.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/ProcessListener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/Widget.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/WidgetLabel.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/actions/ConfirmEmailListener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/actions/ConfirmRedirectListener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/actions/RemoteServerPostListener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/actions/SimpleEmailListener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/actions/TemplateEmailListener.pdl ccm-core/trunk/pdl/com/arsdigita/formbuilder/actions/XMLEmailListener.pdl ccm-core/trunk/pdl/com/arsdigita/globalization/Charset.pdl ccm-core/trunk/pdl/com/arsdigita/globalization/Locale.pdl ccm-core/trunk/pdl/com/arsdigita/globalization/MessageCatalog.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/ACSObject.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/EmailAddress.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/Group.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/Package.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/Party.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/PersonName.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/Resource.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/Role.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/SiteNode.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/Stylesheet.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/User.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/UserAuthentication.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/permissions.pdl ccm-core/trunk/pdl/com/arsdigita/kernel/security/KeyStore.pdl ccm-core/trunk/pdl/com/arsdigita/messaging/Message.pdl ccm-core/trunk/pdl/com/arsdigita/messaging/MessagePart.pdl ccm-core/trunk/pdl/com/arsdigita/messaging/Thread.pdl ccm-core/trunk/pdl/com/arsdigita/messaging/ThreadedMessage.pdl ccm-core/trunk/pdl/com/arsdigita/messaging/query-getMessageTree.ora.pdl ccm-core/trunk/pdl/com/arsdigita/messaging/query-getMessageTree.pg.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/ImageMimeType.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/MimeType.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/MimeTypeExtension.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/MimeTypeStatus.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/PostConvertHTML.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/PreConvertHTML.pdl ccm-core/trunk/pdl/com/arsdigita/mimetypes/TextMimeType.pdl ccm-core/trunk/pdl/com/arsdigita/notification/Digest.pdl ccm-core/trunk/pdl/com/arsdigita/notification/Notification.pdl ccm-core/trunk/pdl/com/arsdigita/persistence/DynamicAssociation.pdl ccm-core/trunk/pdl/com/arsdigita/persistence/DynamicObjectType.pdl ccm-core/trunk/pdl/com/arsdigita/portal/AgentPortlet.pdl ccm-core/trunk/pdl/com/arsdigita/portal/Portal.pdl ccm-core/trunk/pdl/com/arsdigita/portal/Portlet.pdl ccm-core/trunk/pdl/com/arsdigita/preferences/PreferenceParameter.pdl ccm-core/trunk/pdl/com/arsdigita/preferences/Preferences.pdl ccm-core/trunk/pdl/com/arsdigita/runtime/Initializer.pdl ccm-core/trunk/pdl/com/arsdigita/search/Search.pdl ccm-core/trunk/pdl/com/arsdigita/search/intermedia/ContentChangeTime.pdl ccm-core/trunk/pdl/com/arsdigita/search/intermedia/IndexingTime.pdl ccm-core/trunk/pdl/com/arsdigita/search/intermedia/SearchContent.pdl ccm-core/trunk/pdl/com/arsdigita/search/lucene/Document.pdl ccm-core/trunk/pdl/com/arsdigita/search/lucene/IndexId.pdl ccm-core/trunk/pdl/com/arsdigita/ui/admin/Admin.pdl ccm-core/trunk/pdl/com/arsdigita/ui/permissions/Permissions.pdl ccm-core/trunk/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl ccm-core/trunk/pdl/com/arsdigita/ui/sitemap/Sitemap.ora.pdl ccm-core/trunk/pdl/com/arsdigita/ui/sitemap/Sitemap.pg.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/BlobOperation.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/ClobOperation.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/DataObjectChange.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/EventType.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/GenericOperation.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/JavaClass.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/Operation.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/Txn.pdl ccm-core/trunk/pdl/com/arsdigita/versioning/VersionedACSObject.pdl ccm-core/trunk/pdl/com/arsdigita/web/Application.pdl ccm-core/trunk/pdl/com/arsdigita/web/Host.pdl ccm-core/trunk/pdl/com/arsdigita/web/WebApp.pdl ccm-core/trunk/pdl/com/arsdigita/web/monitoring/DBTest.pdl ccm-core/trunk/pdl/com/arsdigita/webdevsupport/QueryPlan.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/Engine.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/Task.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/TaskComment.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/UserTask.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/Workflow.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/WorkflowTemplate.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/query-getOverDueProcesses.ora.pdl ccm-core/trunk/pdl/com/arsdigita/workflow/query-getOverDueProcesses.pg.pdl ccm-core/trunk/sql/ccm-core/default/auditing/index-acs_auditing.sql ccm-core/trunk/sql/ccm-core/default/auditing/table-acs_auditing.sql ccm-core/trunk/sql/ccm-core/default/categorization/comment-cat_categories.sql ccm-core/trunk/sql/ccm-core/default/categorization/comment-cat_category_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/comment-cat_object_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/comment-cat_purposes.sql ccm-core/trunk/sql/ccm-core/default/categorization/index-cat_cat_deflt_ancestors.sql ccm-core/trunk/sql/ccm-core/default/categorization/index-cat_cat_subcat_trans_index.sql ccm-core/trunk/sql/ccm-core/default/categorization/index-cat_category_purpose_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/index-cat_object_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/index-cat_object_root_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/index-cat_root_cat_object_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/insert-acs_privileges.sql ccm-core/trunk/sql/ccm-core/default/categorization/table-cat_cat_subcat_trans_index.sql ccm-core/trunk/sql/ccm-core/default/categorization/table-cat_category_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/table-cat_category_purpose_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/table-cat_object_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/table-cat_object_root_category_map.sql ccm-core/trunk/sql/ccm-core/default/categorization/table-cat_purposes.sql ccm-core/trunk/sql/ccm-core/default/categorization/trigger-cat_category_category_map.sql ccm-core/trunk/sql/ccm-core/default/dmi/dmi-create.sql ccm-core/trunk/sql/ccm-core/default/dmi/dmi-drop.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_component_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_components.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_form_process_listeners.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_form_sections.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_listener_map.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_listeners.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_meta_object.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_object_type.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_options.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_process_listeners.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-bebop_widgets.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_dataquery.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_dd_select.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_lstnr_conf_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_lstnr_conf_redirect.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_lstnr_simple_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_lstnr_tmpl_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_lstnr_xml_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_unique_id_seq.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/comment-forms_widget_label.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/index-forms_dd_select.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/index-forms_widget_label.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/sequence-forms_unique_id_seq.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_component_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_components.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_form_process_listeners.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_form_sections.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_listener_map.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_listeners.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_meta_object.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_object_type.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_options.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_process_listeners.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-bebop_widgets.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_dataquery.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_dd_select.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_lstnr_conf_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_lstnr_conf_redirect.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_lstnr_simple_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_lstnr_tmpl_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_lstnr_xml_email.sql ccm-core/trunk/sql/ccm-core/default/formbuilder/table-forms_widget_label.sql ccm-core/trunk/sql/ccm-core/default/function-currentDate.sql ccm-core/trunk/sql/ccm-core/default/globalization/index-g11n_catalogs.sql ccm-core/trunk/sql/ccm-core/default/globalization/index-g11n_charsets.sql ccm-core/trunk/sql/ccm-core/default/globalization/index-g11n_locale_charset_map.sql ccm-core/trunk/sql/ccm-core/default/globalization/index-g11n_locales.sql ccm-core/trunk/sql/ccm-core/default/globalization/table-g11n_catalogs.sql ccm-core/trunk/sql/ccm-core/default/globalization/table-g11n_charsets.sql ccm-core/trunk/sql/ccm-core/default/globalization/table-g11n_locale_charset_map.sql ccm-core/trunk/sql/ccm-core/default/globalization/table-g11n_locales.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-acs_permissions.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-acs_privileges.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-dnm_privilege_col_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-dnm_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-email_addresses.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-object_context.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-parties.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-party_email_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-person_names.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-roles.sql ccm-core/trunk/sql/ccm-core/default/kernel/comment-users.sql ccm-core/trunk/sql/ccm-core/default/kernel/constraint-email_addresses.sql ccm-core/trunk/sql/ccm-core/default/kernel/constraint-group_subgroup_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/constraint-roles.sql ccm-core/trunk/sql/ccm-core/default/kernel/constraint-site_nodes.sql ccm-core/trunk/sql/ccm-core/default/kernel/function-package_id_for_object_id.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-acs_objects.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-acs_permissions.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-acs_stylesheet_node_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-acs_stylesheet_type_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-acs_stylesheets.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-apm_package_type_listener_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-apm_packages.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-foreign_keys.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-group_member_map_group_id_idx.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-group_member_trans_index.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-group_subgroup_map_grp_id_idx.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-group_subgroup_trans_index.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-object_container_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-parties.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-party_email_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-roles.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-site_nodes.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-user_authentication.sql ccm-core/trunk/sql/ccm-core/default/kernel/index-users.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-dnm_context.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-groups.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-object_zero.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-permissions.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-privileges.sql ccm-core/trunk/sql/ccm-core/default/kernel/insert-users.sql ccm-core/trunk/sql/ccm-core/default/kernel/package-hierarchy_denormalization.sql ccm-core/trunk/sql/ccm-core/default/kernel/package-parties_denormalization.sql ccm-core/trunk/sql/ccm-core/default/kernel/sequence-acs_object_id_seq.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_object_grants.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_party_grants.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_privilege_col_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_privilege_hierarchy_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-group_member_trans_index.sql ccm-core/trunk/sql/ccm-core/default/kernel/table-group_subgroup_trans_index.sql ccm-core/trunk/sql/ccm-core/default/kernel/trigger-acs_parties.sql ccm-core/trunk/sql/ccm-core/default/kernel/view-group_member_trans_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/view-group_subgroup_trans_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/view-object_package_map.sql ccm-core/trunk/sql/ccm-core/default/kernel/view-party_member_trans_map.sql ccm-core/trunk/sql/ccm-core/default/messaging/comment-message_parts.sql ccm-core/trunk/sql/ccm-core/default/messaging/comment-messages.sql ccm-core/trunk/sql/ccm-core/default/messaging/index-message_parts.sql ccm-core/trunk/sql/ccm-core/default/messaging/index-messages.sql ccm-core/trunk/sql/ccm-core/default/messaging/table-message_parts.sql ccm-core/trunk/sql/ccm-core/default/messaging/table-message_threads.sql ccm-core/trunk/sql/ccm-core/default/messaging/table-messages.sql ccm-core/trunk/sql/ccm-core/default/mimetypes/insert-cms_mime_status.sql ccm-core/trunk/sql/ccm-core/default/notification/index-nt_digests.sql ccm-core/trunk/sql/ccm-core/default/notification/index-nt_requests.sql ccm-core/trunk/sql/ccm-core/default/notification/table-nt_digests.sql ccm-core/trunk/sql/ccm-core/default/notification/table-nt_queue.sql ccm-core/trunk/sql/ccm-core/default/notification/table-nt_requests.sql ccm-core/trunk/sql/ccm-core/default/persistence/table-persistence_dynamic_assoc.sql ccm-core/trunk/sql/ccm-core/default/persistence/table-persistence_dynamic_ot.sql ccm-core/trunk/sql/ccm-core/default/portal/index-portlets.sql ccm-core/trunk/sql/ccm-core/default/preferences/comment-preferences.sql ccm-core/trunk/sql/ccm-core/default/preferences/index-preferences.sql ccm-core/trunk/sql/ccm-core/default/preferences/table-preferences.sql ccm-core/trunk/sql/ccm-core/default/search/block-autogroup.sql ccm-core/trunk/sql/ccm-core/default/search/index-raw_content_index.sql ccm-core/trunk/sql/ccm-core/default/search/index-xml_content_index.sql ccm-core/trunk/sql/ccm-core/default/search/insert-dummy.sql ccm-core/trunk/sql/ccm-core/default/search/package-search_indexing.sql ccm-core/trunk/sql/ccm-core/default/search/table-content_change_time.sql ccm-core/trunk/sql/ccm-core/default/search/table-search_content.sql ccm-core/trunk/sql/ccm-core/default/search/table-search_indexing_jobs.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.0-5.2.1/alter-requests.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/alter-categories.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/drop-search-test.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql ccm-core/trunk/sql/ccm-core/default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql ccm-core/trunk/sql/ccm-core/default/upgrade/6.0.1-6.1.0/dot-step-1.sql ccm-core/trunk/sql/ccm-core/default/upgrade/6.0.1-6.1.0/dot-step-2.sql ccm-core/trunk/sql/ccm-core/default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql ccm-core/trunk/sql/ccm-core/default/upgrade/6.1.0-6.2.0/upgrade-mime-types.sql ccm-core/trunk/sql/ccm-core/default/versioning/comment-vc_actions.sql ccm-core/trunk/sql/ccm-core/default/versioning/comment-vc_generic_operations.sql ccm-core/trunk/sql/ccm-core/default/versioning/comment-vc_objects.sql ccm-core/trunk/sql/ccm-core/default/versioning/comment-vc_operations.sql ccm-core/trunk/sql/ccm-core/default/versioning/comment-vc_transactions.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vc_operations.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vc_transactions.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vcx_obj_changes_txn_id_idx.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vcx_operations_change_id_idx.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vcx_operations_class_id_idx.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vcx_operations_evnt_typ_id_idx.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vcx_tags_txn_id_idx.sql ccm-core/trunk/sql/ccm-core/default/versioning/index-vcx_txns_modifying_user_idx.sql ccm-core/trunk/sql/ccm-core/default/versioning/insert-vc_actions.sql ccm-core/trunk/sql/ccm-core/default/versioning/insert-vcx_event_types.sql ccm-core/trunk/sql/ccm-core/default/versioning/insert-vcx_java_classes.sql ccm-core/trunk/sql/ccm-core/default/versioning/sequence-vcx_id_seq.sql ccm-core/trunk/sql/ccm-core/default/versioning/sequence-vcx_txns_id_seq.sql ccm-core/trunk/sql/ccm-core/default/versioning/table-vc_actions.sql ccm-core/trunk/sql/ccm-core/default/versioning/table-vc_generic_operations.sql ccm-core/trunk/sql/ccm-core/default/versioning/table-vc_objects.sql ccm-core/trunk/sql/ccm-core/default/versioning/table-vc_operations.sql ccm-core/trunk/sql/ccm-core/default/versioning/table-vc_transactions.sql ccm-core/trunk/sql/ccm-core/default/web/index-application_type_privilege_map.sql ccm-core/trunk/sql/ccm-core/default/web/index-application_types.sql ccm-core/trunk/sql/ccm-core/default/web/index-applications.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_processes.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_task_comments.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_task_dependencies.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_task_group_assignees.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_task_listeners.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_task_listeners_tid_ltid.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_task_user_assignees.sql ccm-core/trunk/sql/ccm-core/default/workflow/index-cw_tasks.sql ccm-core/trunk/sql/ccm-core/default/workflow/sequence-cw_sequences.sql ccm-core/trunk/sql/ccm-core/default/workflow/table-cw_process_definitions.sql ccm-core/trunk/sql/ccm-core/default/workflow/table-cw_processes.sql ccm-core/trunk/sql/ccm-core/default/workflow/table-cw_system_tasks.sql ccm-core/trunk/sql/ccm-core/default/workflow/table-cw_task_comments.sql ccm-core/trunk/sql/ccm-core/default/workflow/table-cw_tasks.sql ccm-core/trunk/sql/ccm-core/default/workflow/table-cw_user_tasks.sql ccm-core/trunk/sql/ccm-core/fixes/formbuilder/delete-bogus-form-widgets.sql ccm-core/trunk/sql/ccm-core/fixes/messaging/update-thread-replies.sql ccm-core/trunk/sql/ccm-core/oracle-se-create.sql ccm-core/trunk/sql/ccm-core/oracle-se/auditing/auditing-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/auditing/table-acs_auditing.sql ccm-core/trunk/sql/ccm-core/oracle-se/categorization/categorization-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/formbuilder/bebop-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/formbuilder/formbuilder-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/formbuilder/widgets-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/function-currentDate.sql ccm-core/trunk/sql/ccm-core/oracle-se/globalization/g11n-catalog-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/globalization/g11n-charsets-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/globalization/g11n-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/globalization/g11n-locales-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/drop-all.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/package-dnm_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/package-dnm_parties.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/package-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/triggers-dnm_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/triggers-dnm_parties.sql ccm-core/trunk/sql/ccm-core/oracle-se/kernel/triggers-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/lucene/proc-update-dirty.sql ccm-core/trunk/sql/ccm-core/oracle-se/messaging/messaging-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/messaging/table-message_threads.sql ccm-core/trunk/sql/ccm-core/oracle-se/messaging/table-messages.sql ccm-core/trunk/sql/ccm-core/oracle-se/mimetypes/function-convert_to_html.sql ccm-core/trunk/sql/ccm-core/oracle-se/mimetypes/index-convert_to_html_index.sql ccm-core/trunk/sql/ccm-core/oracle-se/notification/notification-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/notification/table-nt_digests.sql ccm-core/trunk/sql/ccm-core/oracle-se/notification/table-nt_requests.sql ccm-core/trunk/sql/ccm-core/oracle-se/persistence/persistence-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/preferences/preferences-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/preferences/table-preferences.sql ccm-core/trunk/sql/ccm-core/oracle-se/search/00-README ccm-core/trunk/sql/ccm-core/oracle-se/search/ContentChangeTime-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/search/SearchContent-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/search/search-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/search/search-index-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/search/search-indexing-procs-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/templating/acs-templating-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/templating/demo-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/categorization.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/create-fk-indices.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/drop-sec_session_properties.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/messaging.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/objects.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/permissioning.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/versioning.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.1-5.1.2/site-nodes-url.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-applications.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-bebop-object.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-forms.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-lucene-docs.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portals.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portlet-portals-constraints.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portlets.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-search-test.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/categorization.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-category-map-id.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-notes.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-places.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-table-secret-tokens.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-us-addresses.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-currentDate.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-last_attr_value.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/misc.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-hierarchy_denormalization.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-parties_denormalization.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-permission_denormalization.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-search_indexing.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_parties.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_permissions.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-cat_category_category_map.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/update-constraints.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/update-indexes.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/alter-lucene.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/auto-upgrade.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/mime-types.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/misc.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/update-web-hosts.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/vcx_deferred.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.0-6.0.1/function-convert_to_html.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/create.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/deferred.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_parties.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-inits-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-keystore-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-webapps-auto.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-applications.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-host-unique-index.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/oracle-se/versioning/table-vc_transactions.sql ccm-core/trunk/sql/ccm-core/oracle-se/versioning/versioning-drop.sql ccm-core/trunk/sql/ccm-core/oracle-se/workflow/table-cw_task_comments.sql ccm-core/trunk/sql/ccm-core/oracle-se/workflow/table-cw_user_tasks.sql ccm-core/trunk/sql/ccm-core/oracle-se/workflow/workflow-drop.sql ccm-core/trunk/sql/ccm-core/postgres-create.sql ccm-core/trunk/sql/ccm-core/postgres/categorization/trigger-cat_category_category_map.sql ccm-core/trunk/sql/ccm-core/postgres/drop-all.sql ccm-core/trunk/sql/ccm-core/postgres/globalization/table-g11n_catalogs.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/function-package_id_for_object_id.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/index-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/index-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/index-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/index-dnm_ungranted_context.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/package-dnm_context.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/package-dnm_parties.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/package-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/package-hierarchy_denormalization.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/package-parties_denormalization.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/stats-dnm_tables.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/table-dnm_ungranted_context.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/trigger-acs_parties.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/triggers-dnm_context.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/triggers-dnm_parties.sql ccm-core/trunk/sql/ccm-core/postgres/kernel/triggers-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/lucene/proc-update-dirty.sql ccm-core/trunk/sql/ccm-core/postgres/messaging/table-message_parts.sql ccm-core/trunk/sql/ccm-core/postgres/oracle-compatibility.sql ccm-core/trunk/sql/ccm-core/postgres/persistence/table-persistence_dynamic_assoc.sql ccm-core/trunk/sql/ccm-core/postgres/persistence/table-persistence_dynamic_ot.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/index-nt_requests.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.0-5.3.0/alter-lucene.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/add-permissions-rebuild.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/alter-lucene.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/auto-upgrade.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/drop-ri-triggers.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/drop-unique-indexes.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/mime-types.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/misc.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/update-web-hosts.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/vcx_deferred.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/deferred.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_ungranted_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-dnm_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_parties.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_ungranted_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-inits-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-keystore-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-webapps-auto.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-applications.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-host-unique-index.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql ccm-core/trunk/sql/ccm-core/postgres/workflow/sequence-cw_sequences.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-5.1.0-5.1.1.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql ccm-core/trunk/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql ccm-core/trunk/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.0.0-6.0.1.sql ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql ccm-core/trunk/src/WEB-INF/resources/stylesheet-paths.txt ccm-core/trunk/src/ccm-core.checklist ccm-core/trunk/src/ccm-core.config ccm-core/trunk/src/ccm-core.load ccm-core/trunk/src/ccm-core.upgrade ccm-core/trunk/src/com/arsdigita/auditing/Audited.java ccm-core/trunk/src/com/arsdigita/auditing/AuditedACSObject.java ccm-core/trunk/src/com/arsdigita/auditing/AuditingObserver.java ccm-core/trunk/src/com/arsdigita/auditing/AuditingSaveFactory.java ccm-core/trunk/src/com/arsdigita/auditing/AuditingSaveInfo.java ccm-core/trunk/src/com/arsdigita/auditing/BasicAuditTrail.java ccm-core/trunk/src/com/arsdigita/auditing/Initializer.java ccm-core/trunk/src/com/arsdigita/auditing/WebAuditingSaveInfo.java ccm-core/trunk/src/com/arsdigita/auditing/package.html ccm-core/trunk/src/com/arsdigita/bebop/AbstractPortlet.java ccm-core/trunk/src/com/arsdigita/bebop/AbstractSingleSelectionModel.java ccm-core/trunk/src/com/arsdigita/bebop/ActionLink.java ccm-core/trunk/src/com/arsdigita/bebop/BaseLink.java ccm-core/trunk/src/com/arsdigita/bebop/BasePage.java ccm-core/trunk/src/com/arsdigita/bebop/Bebop.java ccm-core/trunk/src/com/arsdigita/bebop/BebopApplicationServlet.java ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig.java ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig_parameter.properties ccm-core/trunk/src/com/arsdigita/bebop/BebopMapDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/BlockStylable.java ccm-core/trunk/src/com/arsdigita/bebop/BoxPanel.java ccm-core/trunk/src/com/arsdigita/bebop/Column.java ccm-core/trunk/src/com/arsdigita/bebop/ColumnPanel.java ccm-core/trunk/src/com/arsdigita/bebop/Completable.java ccm-core/trunk/src/com/arsdigita/bebop/Component.java ccm-core/trunk/src/com/arsdigita/bebop/ComponentPool.java ccm-core/trunk/src/com/arsdigita/bebop/ComponentSelectionModel.java ccm-core/trunk/src/com/arsdigita/bebop/CompoundComponent.java ccm-core/trunk/src/com/arsdigita/bebop/ConfirmPage.java ccm-core/trunk/src/com/arsdigita/bebop/Container.java ccm-core/trunk/src/com/arsdigita/bebop/ControlLink.java ccm-core/trunk/src/com/arsdigita/bebop/DefaultSingleSelectionModel.java ccm-core/trunk/src/com/arsdigita/bebop/DimensionalNavbar.java ccm-core/trunk/src/com/arsdigita/bebop/DynamicListWizard.java ccm-core/trunk/src/com/arsdigita/bebop/ElementComponent.java ccm-core/trunk/src/com/arsdigita/bebop/ExcursionComponent.java ccm-core/trunk/src/com/arsdigita/bebop/ExternalLink.java ccm-core/trunk/src/com/arsdigita/bebop/Form.java ccm-core/trunk/src/com/arsdigita/bebop/FormData.java ccm-core/trunk/src/com/arsdigita/bebop/FormModel.java ccm-core/trunk/src/com/arsdigita/bebop/FormProcessException.java ccm-core/trunk/src/com/arsdigita/bebop/FormSection.java ccm-core/trunk/src/com/arsdigita/bebop/FormStep.java ccm-core/trunk/src/com/arsdigita/bebop/FormValidationException.java ccm-core/trunk/src/com/arsdigita/bebop/Grid.java ccm-core/trunk/src/com/arsdigita/bebop/GridPanel.java ccm-core/trunk/src/com/arsdigita/bebop/GridTableModel.java ccm-core/trunk/src/com/arsdigita/bebop/HorizontalLine.java ccm-core/trunk/src/com/arsdigita/bebop/Image.java ccm-core/trunk/src/com/arsdigita/bebop/Label.java ccm-core/trunk/src/com/arsdigita/bebop/Link.java ccm-core/trunk/src/com/arsdigita/bebop/List.java ccm-core/trunk/src/com/arsdigita/bebop/ListPanel.java ccm-core/trunk/src/com/arsdigita/bebop/MapComponentSelectionModel.java ccm-core/trunk/src/com/arsdigita/bebop/MapWizard.java ccm-core/trunk/src/com/arsdigita/bebop/MetaForm.java ccm-core/trunk/src/com/arsdigita/bebop/ModalContainer.java ccm-core/trunk/src/com/arsdigita/bebop/MultiStepForm.java ccm-core/trunk/src/com/arsdigita/bebop/Multiple.java ccm-core/trunk/src/com/arsdigita/bebop/Page.java ccm-core/trunk/src/com/arsdigita/bebop/PageDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/PageErrorDisplay.java ccm-core/trunk/src/com/arsdigita/bebop/PageFactory.java ccm-core/trunk/src/com/arsdigita/bebop/PageState.java ccm-core/trunk/src/com/arsdigita/bebop/PaginationModelBuilder.java ccm-core/trunk/src/com/arsdigita/bebop/Paginator.java ccm-core/trunk/src/com/arsdigita/bebop/ParameterSingleSelectionModel.java ccm-core/trunk/src/com/arsdigita/bebop/Portlet.java ccm-core/trunk/src/com/arsdigita/bebop/PropertyEditor.java ccm-core/trunk/src/com/arsdigita/bebop/PropertyEditorModel.java ccm-core/trunk/src/com/arsdigita/bebop/PropertyEditorModelBuilder.java ccm-core/trunk/src/com/arsdigita/bebop/PropertySheet.java ccm-core/trunk/src/com/arsdigita/bebop/PropertySheetModel.java ccm-core/trunk/src/com/arsdigita/bebop/PropertySheetModelBuilder.java ccm-core/trunk/src/com/arsdigita/bebop/RequestLocal.java ccm-core/trunk/src/com/arsdigita/bebop/Resettable.java ccm-core/trunk/src/com/arsdigita/bebop/RowSequenceBuilder.java ccm-core/trunk/src/com/arsdigita/bebop/SaveCancelSection.java ccm-core/trunk/src/com/arsdigita/bebop/SegmentedPanel.java ccm-core/trunk/src/com/arsdigita/bebop/SessionExpiredException.java ccm-core/trunk/src/com/arsdigita/bebop/SimpleComponent.java ccm-core/trunk/src/com/arsdigita/bebop/SimpleContainer.java ccm-core/trunk/src/com/arsdigita/bebop/SingleSelectionModel.java ccm-core/trunk/src/com/arsdigita/bebop/SlaveComponent.java ccm-core/trunk/src/com/arsdigita/bebop/SplitPanel.java ccm-core/trunk/src/com/arsdigita/bebop/SplitWizard.java ccm-core/trunk/src/com/arsdigita/bebop/TabbedPane.java ccm-core/trunk/src/com/arsdigita/bebop/Table.java ccm-core/trunk/src/com/arsdigita/bebop/TextStylable.java ccm-core/trunk/src/com/arsdigita/bebop/ToggleLink.java ccm-core/trunk/src/com/arsdigita/bebop/Tree.java ccm-core/trunk/src/com/arsdigita/bebop/Wizard.java ccm-core/trunk/src/com/arsdigita/bebop/YesNoSection.java ccm-core/trunk/src/com/arsdigita/bebop/demo/AutoDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/demo/BebopDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/demo/DemoDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/demo/HelloDate.java ccm-core/trunk/src/com/arsdigita/bebop/demo/MinimalDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/demo/MySitePage.java ccm-core/trunk/src/com/arsdigita/bebop/demo/OtherDispatcher.java ccm-core/trunk/src/com/arsdigita/bebop/demo/UserList.java ccm-core/trunk/src/com/arsdigita/bebop/demo/WorkflowAdminPage.java ccm-core/trunk/src/com/arsdigita/bebop/demo/package.html ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/AddProcess.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/AddTask.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/AdminPane.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/Listing.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/Process.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/Task.java ccm-core/trunk/src/com/arsdigita/bebop/demo/workflow/package.html ccm-core/trunk/src/com/arsdigita/bebop/event/ActionEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/ActionListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/ChangeEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/ChangeListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/EventListenerList.java ccm-core/trunk/src/com/arsdigita/bebop/event/FormCancelListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/FormInitListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/FormProcessListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/FormSectionEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/FormSubmissionListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/FormValidationListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/PageEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/ParameterEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/ParameterListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/PrintEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/PrintListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/RequestEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/RequestListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/SearchAndSelectListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/SearchAndSelectModel.java ccm-core/trunk/src/com/arsdigita/bebop/event/TableActionAdapter.java ccm-core/trunk/src/com/arsdigita/bebop/event/TableActionEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/TableActionListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/TreeExpansionEvent.java ccm-core/trunk/src/com/arsdigita/bebop/event/TreeExpansionListener.java ccm-core/trunk/src/com/arsdigita/bebop/event/package.html ccm-core/trunk/src/com/arsdigita/bebop/form/CheckboxGroup.java ccm-core/trunk/src/com/arsdigita/bebop/form/DHTMLEditor.java ccm-core/trunk/src/com/arsdigita/bebop/form/Date.java ccm-core/trunk/src/com/arsdigita/bebop/form/DateTime.java ccm-core/trunk/src/com/arsdigita/bebop/form/Deditor.java ccm-core/trunk/src/com/arsdigita/bebop/form/FileUpload.java ccm-core/trunk/src/com/arsdigita/bebop/form/FormErrorDisplay.java ccm-core/trunk/src/com/arsdigita/bebop/form/Hidden.java ccm-core/trunk/src/com/arsdigita/bebop/form/ImageSubmit.java ccm-core/trunk/src/com/arsdigita/bebop/form/MultipleSelect.java ccm-core/trunk/src/com/arsdigita/bebop/form/MultipleSelectPairWidget.java ccm-core/trunk/src/com/arsdigita/bebop/form/Option.java ccm-core/trunk/src/com/arsdigita/bebop/form/OptionGroup.java ccm-core/trunk/src/com/arsdigita/bebop/form/Password.java ccm-core/trunk/src/com/arsdigita/bebop/form/RadioGroup.java ccm-core/trunk/src/com/arsdigita/bebop/form/Reset.java ccm-core/trunk/src/com/arsdigita/bebop/form/SearchAndSelect.java ccm-core/trunk/src/com/arsdigita/bebop/form/Select.java ccm-core/trunk/src/com/arsdigita/bebop/form/SingleSelect.java ccm-core/trunk/src/com/arsdigita/bebop/form/Submit.java ccm-core/trunk/src/com/arsdigita/bebop/form/TextArea.java ccm-core/trunk/src/com/arsdigita/bebop/form/TextEntryFormSection.java ccm-core/trunk/src/com/arsdigita/bebop/form/TextField.java ccm-core/trunk/src/com/arsdigita/bebop/form/Time.java ccm-core/trunk/src/com/arsdigita/bebop/form/Widget.java ccm-core/trunk/src/com/arsdigita/bebop/form/package.html ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineComponent.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineComponentExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineComponentImpl.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineContainer.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineForm.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineFormExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineImage.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineLink.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineList.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineListExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineMultipleSelect.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineOption.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineOptionGroup.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefinePage.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefinePageExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefinePassword.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineRadioGroup.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineSelect.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineSlave.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineSubmit.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineTab.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineTabbedPane.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineTable.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineTableExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineText.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineTextArea.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/DefineWidgetExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/JSPConstants.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/JspWrapperException.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowAll.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowCellList.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowComponent.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowContainer.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowForm.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowList.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowListItem.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowPage.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowPageExtraInfo.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowSlave.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowTable.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowTableBody.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowTableHeader.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/ShowTableRow.java ccm-core/trunk/src/com/arsdigita/bebop/jsp/package.html ccm-core/trunk/src/com/arsdigita/bebop/list/AbstractListModelBuilder.java ccm-core/trunk/src/com/arsdigita/bebop/list/DefaultListCellRenderer.java ccm-core/trunk/src/com/arsdigita/bebop/list/ListCellRenderer.java ccm-core/trunk/src/com/arsdigita/bebop/list/ListModel.java ccm-core/trunk/src/com/arsdigita/bebop/list/ListModelBuilder.java ccm-core/trunk/src/com/arsdigita/bebop/list/package.html ccm-core/trunk/src/com/arsdigita/bebop/package.html ccm-core/trunk/src/com/arsdigita/bebop/... [truncated message content] |
|
From: <mb...@re...> - 2005-02-09 14:08:02
|
Author: mbooth
Date: 2005-02-09 15:07:10 +0100 (Wed, 09 Feb 2005)
New Revision: 202
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java
Log:
Add the ability to browse and select other content sections in the item search popup.
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java 2005-02-07 22:45:34 UTC (rev 201)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java 2005-02-09 14:07:10 UTC (rev 202)
@@ -18,25 +18,41 @@
*/
package com.arsdigita.cms.ui;
+import com.arsdigita.bebop.BoxPanel;
+import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.Resettable;
+import com.arsdigita.bebop.Tree;
import com.arsdigita.bebop.event.ChangeEvent;
import com.arsdigita.bebop.event.ChangeListener;
+import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.event.TreeExpansionEvent;
import com.arsdigita.bebop.event.TreeExpansionListener;
+import com.arsdigita.bebop.form.Option;
+import com.arsdigita.bebop.form.SingleSelect;
+import com.arsdigita.bebop.form.Submit;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.persistence.OID;
+import com.arsdigita.toolbox.ui.OIDParameter;
+
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.cms.ContentSectionCollection;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ui.CMSContainer;
import com.arsdigita.cms.ui.folder.FolderSelectionModel;
-import com.arsdigita.cms.ui.folder.FolderTree;
+import com.arsdigita.cms.ui.folder.FolderTreeModelBuilder;
import com.arsdigita.cms.util.GlobalizationUtil;
import java.math.BigDecimal;
+import org.apache.log4j.Logger;
+
/**
* A pane that contains a folder tree on the left and a folder
* manipulator on the right.
@@ -48,11 +64,15 @@
implements Resettable, TreeExpansionListener, ChangeListener,
FormProcessListener, FormSubmissionListener {
+ private static final Logger s_log =
+ Logger.getLogger( ItemSearchBrowsePane.class );
+
public static final String versionId = "$Id: //cms/dev/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java#9 $ by $Author: dennis $, $DateTime: 2004/08/17 23:15:09 $";
- FolderSelectionModel m_folderSel;
- FolderTree m_tree;
- ItemSearchFolderBrowser m_browser;
+ private FolderSelectionModel m_folderSel;
+ private Tree m_tree;
+ private ItemSearchFolderBrowser m_browser;
+ private SingleSelect m_section;
public ItemSearchBrowsePane() {
setClassAttr("sidebarNavPanel");
@@ -62,10 +82,28 @@
l.setClassAttr("heading");
add(l);
- m_folderSel = new FolderSelectionModel("folder");
+ m_folderSel = new FolderSelectionModel("folder") {
+ protected BigDecimal getRootFolderID( PageState ps ) {
+ Folder root = getRootFolder( ps );
+
+ if( null == root ) return super.getRootFolderID( ps );
+ return root.getID();
+ }
+ };
m_folderSel.addChangeListener(this);
- m_tree = new FolderTree(m_folderSel);
+ Form sectionForm = getSectionForm();
+ add( sectionForm );
+
+ m_tree = new Tree( new FolderTreeModelBuilder() {
+ protected Folder getRoot( PageState ps ) {
+ Folder root = getRootFolder( ps );
+
+ if( null == root ) return super.getRoot( ps );
+ return root;
+ }
+ } );
+ m_tree.setSelectionModel( m_folderSel );
m_tree.setClassAttr("navbar");
m_tree.addTreeExpansionListener(this);
add(m_tree);
@@ -80,9 +118,57 @@
add( container );
}
+ private Form getSectionForm() {
+ Form sectionForm = new Form( "isfbSectionForm",
+ new BoxPanel( BoxPanel.HORIZONTAL ) );
+ sectionForm.setClassAttr("navbar");
+
+ m_section = new SingleSelect( new OIDParameter( "isfbSection" ) );
+ ContentSectionCollection sections = ContentSection.getAllSections();
+ while( sections.next() ) {
+ ContentSection section = sections.getContentSection();
+ m_section.addOption( new Option( section.getOID().toString(),
+ section.getDisplayName() ) );
+ }
+
+ sectionForm.addInitListener( new FormInitListener() {
+ public void init( FormSectionEvent ev ) {
+ PageState ps = ev.getPageState();
+
+ if( null == m_section.getValue( ps ) ) {
+ ContentSection section = CMS.getContext().getContentSection();
+ m_section.setValue( ps, section.getOID() );
+ }
+ }
+ } );
+
+ sectionForm.add( m_section );
+ sectionForm.add( new Submit( "Change Section" ) );
+
+ return sectionForm;
+ }
+
+ private Folder getRootFolder( PageState ps ) {
+ OID sectionOID = (OID) m_section.getValue( ps );
+ if( s_log.isDebugEnabled() ) {
+ if( null != sectionOID )
+ s_log.debug( "Using section " + sectionOID.toString() );
+ else
+ s_log.debug( "Using default section" );
+ }
+
+ if( null == sectionOID ) return null;
+
+ ContentSection section = (ContentSection)
+ DomainObjectFactory.newInstance( sectionOID );
+
+ return section.getRootFolder();
+ }
+
public void register(Page p) {
super.register(p);
p.addComponentStateParam(this, m_folderSel.getStateParameter());
+ p.addComponentStateParam(this, m_section.getParameterModel());
}
public void reset(PageState s) {
|
|
From: <mb...@re...> - 2005-02-07 22:46:18
|
Author: mbooth
Date: 2005-02-07 23:45:34 +0100 (Mon, 07 Feb 2005)
New Revision: 201
Added:
ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.ora.pdl
ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.pg.pdl
ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortal.java
ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java
ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortlet.java
ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortletRenderer.java
Modified:
ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PersistentPortal.java
Log:
Add support for stateful portlets from west sussex
Added: ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.ora.pdl
===================================================================
--- ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.ora.pdl 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.ora.pdl 2005-02-07 22:45:34 UTC (rev 201)
@@ -0,0 +1,19 @@
+model com.arsdigita.london.portal;
+
+query MaxPortletInstances {
+ Integer maxCount;
+ do {
+ select nvl(max(count (*)), 0) count
+ from applications a,
+ portlets b
+ where a.application_type_id = :portletType
+ and b.portlet_id = a.application_id
+ group by b.portal_id
+
+ } map {
+ maxCount = count;
+ }
+}
+
+
+
Added: ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.pg.pdl
===================================================================
--- ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.pg.pdl 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/Portal.pg.pdl 2005-02-07 22:45:34 UTC (rev 201)
@@ -0,0 +1,19 @@
+model com.arsdigita.london.portal;
+
+query MaxPortletInstances {
+ Integer maxCount;
+ do {
+ select coalesce(max(count (*)), 0) count
+ from applications a,
+ portlets b
+ where a.application_type_id = :portletType
+ and b.portlet_id = a.application_id
+ group by b.portal_id
+
+ } map {
+ maxCount = count;
+ }
+}
+
+
+
Added: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortal.java
===================================================================
--- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortal.java 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortal.java 2005-02-07 22:45:34 UTC (rev 201)
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved.
+ *
+ * The contents of this file are subject to the ArsDigita Public
+ * License (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of
+ * the License at http://www.arsdigita.com/ADPL.txt
+ *
+ * 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.london.portal;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.ParameterSingleSelectionModel;
+import com.arsdigita.bebop.SimpleContainer;
+import com.arsdigita.bebop.SingleSelectionModel;
+import com.arsdigita.bebop.parameters.IntegerParameter;
+import com.arsdigita.bebop.portal.Portal;
+import com.arsdigita.london.portal.ui.PortalSelectionModel;
+import com.arsdigita.london.portal.ui.PortletSelectionModel;
+import com.arsdigita.london.portal.ui.PortletTypeSelectionModel;
+import com.arsdigita.london.portal.ui.WorkspaceSelectionModel;
+import com.arsdigita.persistence.DataQuery;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.metadata.ObjectType;
+import com.arsdigita.portal.Portlet;
+import com.arsdigita.portal.PortletType;
+import com.arsdigita.portal.PortletTypeCollection;
+import com.arsdigita.xml.Element;
+
+public class StatefulPersistentPortal extends SimpleContainer {
+
+ private static final Logger s_log =
+ Logger.getLogger(StatefulPersistentPortal.class);
+
+ private WorkspaceSelectionModel m_workspace;
+ private PortalSelectionModel m_portal;
+ private PortletTypeSelectionModel m_portletType;
+ private PortletSelectionModel m_portlet;
+
+ // static to enable access from Page and PersistantPortal, and also, page is dirty if any instance of Portal exceeds
+ // current max number of stateful portlets
+ //public static boolean pageDirty = false;
+
+
+ private int m_columns;
+ // make life easier - if no state allowed in edit mode then this class can get rid of all the editor/adder stuff
+ // need to make sure that default state of stateful portlets is reasonable
+ // added cg
+
+ /**
+ * maps portlet type to list of empty renderers
+ */
+ private HashMap m_stateful;
+ /**
+ * static map of portlet types to the number of renderers that is contained by any Portal
+ */
+ public static HashMap portletTypeCount;
+ private Portal m_portalDisplay;
+
+ private SingleSelectionModel m_column;
+
+ public StatefulPersistentPortal(PortalSelectionModel portal) {
+ this(portal, "portal", 1);
+ }
+
+ public StatefulPersistentPortal(
+ PortalSelectionModel portal,
+ int ncolumns) {
+ this(portal, "portal", ncolumns);
+ }
+
+ public StatefulPersistentPortal(PortalSelectionModel portal, String name) {
+ this(portal, name, 1);
+ }
+
+ public StatefulPersistentPortal(
+ PortalSelectionModel portal,
+ String name,
+ int columns) {
+ s_log.debug("IN constructor" + name + " " + columns);
+ m_portal = portal;
+
+ m_column =
+ new ParameterSingleSelectionModel(new IntegerParameter("column"));
+
+ // retrieve empty renderers for any stateful portlets and add them to the component hierarchy
+
+ PortletTypeCollection types = PortletType.retrieveAllPortletTypes();
+ m_stateful = new HashMap();
+ // refresh the type counts if we are recreating the page
+ portletTypeCount = new HashMap();
+
+ while (types.next()) {
+
+ PortletType type = types.getPortletType();
+ s_log.debug("checking portlet type " + type.getDescription());
+ Portlet portlet = Portlet.createPortlet(type, null);
+ if (portlet instanceof StatefulPortlet) {
+ StatefulPortlet statefulPortlet = (StatefulPortlet) portlet;
+ DataQuery findMaxInstances = SessionManager.getSession().retrieveQuery("com.arsdigita.london.portal.MaxPortletInstances");
+ findMaxInstances.setParameter("portletType", type.getID());
+ int requiredRenderers = 0;
+ while (findMaxInstances.next()){
+ requiredRenderers = ((Integer)findMaxInstances.get("maxCount")).intValue();
+ }
+ s_log.debug("stateful portlet - I am going to instantiate " + requiredRenderers + " renderers");
+ List renderers = new ArrayList();
+ for (int i = 0; i < requiredRenderers; i++) {
+ StatefulPortletRenderer renderer =
+ (StatefulPortletRenderer) statefulPortlet
+ .getEmptyPortletRenderer();
+ renderers.add(renderer);
+
+ // and add it to the page
+ add(renderer);
+ s_log.debug("renderer added to page");
+ }
+
+ portletTypeCount.put(type.getResourceObjectType(), new Integer(requiredRenderers));
+ m_stateful.put(type.getResourceObjectType(), renderers);
+
+ }
+ }
+ m_portalDisplay =
+ new Portal(
+ new StatefulPersistentPortalModelBuilder(portal, m_stateful));
+
+ add(m_portalDisplay);
+
+ }
+
+ /*public void register(Page page) {
+ super.register(page);
+
+ if (m_portlet != null) {
+ page.addComponentStateParam(this, m_portlet.getStateParameter());
+ }
+ if (m_portletType != null) {
+ page.addComponentStateParam(
+ this,
+ m_portletType.getStateParameter());
+ }
+
+ page.addComponentStateParam(this, m_column.getStateParameter());
+ }
+ */
+ public void generateXML(PageState state, Element parent) {
+ // generateXML overridden to prevent generateXML being invoked
+ // on renderers that are only added to the component model here
+ // so that they are registered on the page
+ s_log.debug("start - generateXML");
+ m_portalDisplay.generateXML(state, parent);
+ s_log.debug("FINISH - generateXML");
+ }
+
+ public static Integer getCurrentPortletRendererInstances (String portletType) {
+
+
+ return (Integer) portletTypeCount
+ .get(portletType);
+ }
+
+}
Added: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java
===================================================================
--- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java 2005-02-07 22:45:34 UTC (rev 201)
@@ -0,0 +1,129 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.london.portal;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import com.arsdigita.bebop.Component;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.portal.PortalModel;
+import com.arsdigita.bebop.portal.PortalModelBuilder;
+import com.arsdigita.bebop.portal.PortletRenderer;
+import com.arsdigita.london.portal.ui.PortalSelectionModel;
+import com.arsdigita.london.portal.ui.SimplePortlet;
+import com.arsdigita.portal.Portal;
+import com.arsdigita.portal.PortletCollection;
+import com.arsdigita.util.LockableImpl;
+
+/**
+ * @author cgyg9330
+ *
+ * portal model builder that should only be applied to portal in browse mode, as it does not allow for editing.
+ * portal in browse mode should have a com.arsdigita.london.portal.ui.PersistentPortalModelBuilder.
+ *
+ * For stateless portlets, this builder creates a renderer with a reference to its portlet data object. For stateful portlets
+ * the builder retrieves one of the empty renderers registered to the page and puts the portlet data object in
+ * a requestlocal.
+ */
+public class StatefulPersistentPortalModelBuilder
+ extends LockableImpl
+ implements PortalModelBuilder {
+
+ private Logger s_log = Logger.getLogger(StatefulPersistentPortalModelBuilder.class);
+
+ /**
+ * hashmap that maps portlet types to a list of empty renderers that have been registered on the page
+ */
+ private HashMap statefulCollections;
+ private PortalSelectionModel portalModel;
+
+ public StatefulPersistentPortalModelBuilder(
+ PortalSelectionModel portal,
+ HashMap stateful) {
+ this.portalModel = portal;
+ this.statefulCollections = stateful;
+
+ }
+
+ public PortalModel buildModel(PageState state) {
+ // aim of this method is to get hold of a list of renderers for this particular portal
+ // and use them to make a PortalModel
+ s_log.debug("START - buildModel");
+ List portletRenderers = new ArrayList();
+
+ HashMap statefulIterators = new HashMap();
+
+
+ // get iterators for all the renderer lists (this means that each instance of the portlet has it's own renderer)
+ // getting iterators in the buildmodel method means that each time model is built, we start at the beginning of the list
+ Iterator it = statefulCollections.keySet().iterator();
+ while (it.hasNext()) {
+ String resourceType = (String)it.next();
+ Iterator renderersIterator = ((List)statefulCollections.get(resourceType)).iterator();
+ statefulIterators.put(resourceType, renderersIterator);
+ }
+ Portal portal = portalModel.getSelectedPortal(state);
+ PortletCollection portlets = portal.getPortlets();
+ while (portlets.next()) {
+ com.arsdigita.portal.Portlet portlet = portlets.getPortlet();
+ s_log.debug("portlet " + portlet.getPortletType().getDescription() + " " + portlet.getTitle());
+ if (portlet instanceof StatefulPortlet) {
+ StatefulPortletRenderer statefulRenderer = (StatefulPortletRenderer)((Iterator) statefulIterators.get(
+ portlet.getPortletType().getResourceObjectType())).next();
+
+ statefulRenderer.setPortlet(portlet, state);
+ portletRenderers.add(statefulRenderer);
+ s_log.debug("stateful renderer added to model");
+ } else {
+ PortletRenderer renderer = portlet.getPortletRenderer();
+ portletRenderers.add(renderer);
+ s_log.debug("stateless renderer added to model");
+ }
+
+
+
+ }
+ s_log.debug("FINISH - buildModel " + portal.getTitle());
+ return new StatefulPersistentPortalModel(
+ portletRenderers.iterator(),
+ portal.getTitle());
+
+ }
+ private class StatefulPersistentPortalModel implements PortalModel {
+
+ private Iterator portlets;
+ private String title;
+
+ public StatefulPersistentPortalModel(Iterator portlets, String title) {
+ this.portlets = portlets;
+ this.title = title;
+ }
+
+ public Iterator getPortletRenderers() {
+ return portlets;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+ }
+}
Added: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortlet.java
===================================================================
--- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortlet.java 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortlet.java 2005-02-07 22:45:34 UTC (rev 201)
@@ -0,0 +1,58 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.london.portal;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.portal.AbstractPortletRenderer;
+import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.persistence.DataObject;
+import com.arsdigita.portal.Portlet;
+import com.arsdigita.xml.Element;
+
+/**
+ * @author cgyg9330
+ *
+ * In order to register stateful components with the page, this class provides a method declaration
+ * for retreiving a portletrenderer that is not tied to any particular portlet. This is neccessary
+ * because components need to be added to the page before the PortalModelBuilder retrieves the portlets
+ * for a specific portal.
+ */
+public abstract class StatefulPortlet extends Portlet {
+
+ protected StatefulPortlet(DataObject dataObject) {
+ super(dataObject);
+ }
+
+ public abstract StatefulPortletRenderer getEmptyPortletRenderer();
+
+ /**
+ *
+ * stateful portlets cannot be displayed when the portal is in customise mode, as
+ * the portletrenderer is contained within a SimplePortlet which is not stateful
+ *
+ */
+ protected final AbstractPortletRenderer doGetPortletRenderer() {
+ return new AbstractPortletRenderer() {
+ protected void generateBodyXML(PageState state, Element document) {
+ document.newChildElement(
+ "portlet:stateful-portlet-in-edit",
+ PortalConstants.PORTLET_XML_NS);
+ }
+ };
+
+ }
+}
Added: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortletRenderer.java
===================================================================
--- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortletRenderer.java 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPortletRenderer.java 2005-02-07 22:45:34 UTC (rev 201)
@@ -0,0 +1,56 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.london.portal;
+
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.RequestLocal;
+import com.arsdigita.bebop.portal.AbstractPortletRenderer;
+import com.arsdigita.portal.Portlet;
+
+/**
+ * @author chris gilbert
+ *
+ * Renderer that stores reference to portlet data object in a request local.
+ * When the page is built, enough StatefulPortletRenderers are added to the page as might
+ * be needed by any one portal. Hence all portals share the same stateful portlets and so
+ * portlet data object cannot be stored as an instane variable.
+ *
+ * StatefulPortletModelBuilder sets value of requestlocal when the portlet model is built.
+ */
+public abstract class StatefulPortletRenderer extends AbstractPortletRenderer {
+
+ /**
+ * holds the portlet data object for a particular request
+ */
+ protected RequestLocal portlet = new RequestLocal();
+
+
+ public void setPortlet(Portlet portlet, PageState state) {
+ setTitle(portlet.getTitle());
+ setCellNumber(portlet.getCellNumber());
+ setSortKey(portlet.getSortKey());
+ setProfile(portlet.getProfile());
+ this.portlet.set(state, portlet);
+ }
+
+
+
+
+
+
+}
Modified: ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PersistentPortal.java
===================================================================
--- ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PersistentPortal.java 2005-02-04 23:24:20 UTC (rev 200)
+++ ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PersistentPortal.java 2005-02-07 22:45:34 UTC (rev 201)
@@ -15,6 +15,11 @@
package com.arsdigita.london.portal.ui;
+import com.arsdigita.london.portal.StatefulPersistentPortal;
+import com.arsdigita.london.portal.StatefulPortlet;
+import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.london.portal.WorkspacePage;
+
import com.arsdigita.bebop.ParameterSingleSelectionModel;
import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.FormProcessException;
@@ -23,25 +28,20 @@
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.RequestLocal;
-
import com.arsdigita.bebop.event.ChangeListener;
import com.arsdigita.bebop.event.ChangeEvent;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
-
+import com.arsdigita.bebop.jsp.DefinePage;
import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.BooleanParameter;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
-
import com.arsdigita.bebop.portal.PortletRenderer;
import com.arsdigita.bebop.portal.PortalModel;
import com.arsdigita.bebop.portal.PortalModelBuilder;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
-
import com.arsdigita.portal.PortletType;
import com.arsdigita.portal.Portlet;
import com.arsdigita.portal.PortletCollection;
@@ -53,16 +53,17 @@
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.kernel.ui.ResourceConfigComponent;
-import com.arsdigita.web.ApplicationType;
-
import com.arsdigita.dispatcher.AccessDeniedException;
+import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.domain.DataObjectNotFoundException;
-
+import com.arsdigita.persistence.DataQuery;
+import com.arsdigita.persistence.SessionManager;
import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException;
+import com.arsdigita.web.ApplicationType;
+import com.arsdigita.xml.Element;
import com.arsdigita.london.util.ui.parameters.DomainObjectParameter;
-import com.arsdigita.xml.Element;
import java.math.BigDecimal;
import java.lang.RuntimeException;
@@ -266,6 +267,45 @@
column.intValue());
portal.save();
}
+ // added cg - mark page as dirty if max existing
+ // stateful portlet count is exceeded so page is
+ // rebuilt with correct number of renderers
+ if (resource instanceof StatefulPortlet) {
+ s_log.debug("Stateful portlet added");
+ // check if the maximum number of stateful
+ // portlets has increased
+ PortletType portletType =
+ ((Portlet) resource).getPortletType();
+ DataQuery findMaxInstances =
+ SessionManager.getSession().retrieveQuery(
+ "com.arsdigita.london.portal.portal.MaxPortletInstances");
+ findMaxInstances.setParameter(
+ "portletType",
+ portletType.getID());
+ int maxCount = 0;
+ while (findMaxInstances.next()) {
+ maxCount =
+ ((Integer) findMaxInstances
+ .get("maxCount"))
+ .intValue();
+ }
+ String key = portletType.getResourceObjectType();
+
+ Integer previousMaxValue = StatefulPersistentPortal.getCurrentPortletRendererInstances(key);
+ int previousMax = previousMaxValue == null ? 0 : previousMaxValue.intValue();
+
+ s_log.debug(
+ portletType
+ + ": previous count = "
+ + previousMax
+ + " | new max = "
+ + maxCount);
+ if (maxCount > previousMax) {
+
+ DefinePage.setPageAsDirty(DispatcherHelper.getCurrentResourcePath(
+ state.getRequest()));
+ }
+ }
m_portletType.clearSelection(e.getPageState());
state.setValue(m_parentApp, null);
m_parentResource.set(state, null);
|
|
From: <ap...@re...> - 2005-02-04 23:24:50
|
Author: apevec Date: 2005-02-05 00:24:20 +0100 (Sat, 05 Feb 2005) New Revision: 200 Modified: tools/trunk/tools/build.sh tools/trunk/tools/make-zip.sh Log: merge changes from byline tip (r35) Modified: tools/trunk/tools/build.sh =================================================================== --- tools/trunk/tools/build.sh 2005-02-04 23:10:33 UTC (rev 199) +++ tools/trunk/tools/build.sh 2005-02-04 23:24:20 UTC (rev 200) @@ -1,35 +1,28 @@ #!/bin/sh - -# Exit immediately if command fails set -e +set -v -# Print command executed to stdout -#set -v - -make maintainer-clean || : - # Intialise the build environment aclocal autoconf automake -a -# Do a VPATH build so we don't mess up the source dir -#builddir="obj" -#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 -ID=`id -u` -if [ $ID = 0 ]; then - ./configure --prefix=/usr/local -else - ./configure --prefix=$HOME/usr +if [ -n "$1" ]; then + PREFIX=$1 fi +if [ -z "$PREFIX"]; then + ID=`id -u` + if [ $ID = 0 ]; then + PREFIX= + else + PREFIX=$HOME + fi +fi + +./configure --prefix=$PREFIX/usr --sysconfdir=$PREFIX/etc --localstatedir=$PREFIX/var make +make install # End of file + Modified: tools/trunk/tools/make-zip.sh =================================================================== --- tools/trunk/tools/make-zip.sh 2005-02-04 23:10:33 UTC (rev 199) +++ tools/trunk/tools/make-zip.sh 2005-02-04 23:24:20 UTC (rev 200) @@ -136,12 +136,14 @@ zip -r "$FILENAME" * ) -mv "$BUILD_HOME/$FILENAME" . if [ "x$X_CCM_DIST_ZIP_DIR" != "x" ]; then - cp "$FILENAME" "$X_CCM_DIST_ZIP_DIR" + mkdir -p "$X_CCM_DIST_ZIP_DIR" + mv "$BUILD_HOME/$FILENAME" "$X_CCM_DIST_ZIP_DIR" + echo "Wrote $X_CCM_DIST_ZIP_DIR/$FILENAME" +else + mv "$BUILD_HOME/$FILENAME" . + echo "Wrote $FILENAME" fi rm -rf "$BUILD_HOME" - -echo "Wrote $FILENAME" |
|
From: <ap...@re...> - 2005-02-04 23:11:06
|
Author: apevec
Date: 2005-02-05 00:10:33 +0100 (Sat, 05 Feb 2005)
New Revision: 199
Modified:
tools/trunk/tools/make-zip.sh
Log:
fix zip creation completely, previous unfinished submission was accidental
Modified: tools/trunk/tools/make-zip.sh
===================================================================
--- tools/trunk/tools/make-zip.sh 2005-02-04 22:35:46 UTC (rev 198)
+++ tools/trunk/tools/make-zip.sh 2005-02-04 23:10:33 UTC (rev 199)
@@ -79,7 +79,8 @@
rm -rf "$BUILD_HOME"
-mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server"
+mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/resin/bin"
+mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/resin/conf"
find server/resin/bin -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
find server/resin/conf -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
@@ -111,7 +112,8 @@
rm -rf "$BUILD_HOME"
-mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
+mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/tomcat/bin"
+mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/tomcat/conf"
find server/tomcat/bin -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
find server/tomcat/conf -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
|
|
From: <ap...@re...> - 2005-02-04 22:36:23
|
Author: apevec
Date: 2005-02-04 23:35:46 +0100 (Fri, 04 Feb 2005)
New Revision: 198
Removed:
tools/trunk/rpms/BUILD/
tools/trunk/rpms/Makefile
tools/trunk/rpms/RPMS/
tools/trunk/rpms/SOURCES/
tools/trunk/rpms/SPECS/
tools/trunk/rpms/SRPMS/
tools/trunk/rpms/download.sh
tools/trunk/rpms/httpunit/BUILD/
tools/trunk/rpms/httpunit/RPMS/
tools/trunk/rpms/httpunit/SRPMS/
tools/trunk/rpms/junit/BUILD/
tools/trunk/rpms/junit/RPMS/
tools/trunk/rpms/junit/SRPMS/
tools/trunk/rpms/junitperf/BUILD/
tools/trunk/rpms/junitperf/RPMS/
tools/trunk/rpms/junitperf/SRPMS/
tools/trunk/rpms/perl/
tools/trunk/rpms/rollingbuild.sh
tools/trunk/rpms/servlet/BUILD/
tools/trunk/rpms/servlet/RPMS/
tools/trunk/rpms/servlet/SRPMS/
tools/trunk/rpms/servlet22/BUILD/
tools/trunk/rpms/servlet22/RPMS/
tools/trunk/rpms/servlet22/SRPMS/
tools/trunk/scripts/bin/.extract-version.pl.test
tools/trunk/scripts/bin/.filter-manifest.pl.test
tools/trunk/scripts/bin/.gen-prototype.pl.test
tools/trunk/scripts/bin/.interpolate.pl.test
tools/trunk/tools/etc/ccm-tools-resin.cmd
tools/trunk/tools/etc/ccm-tools-resin.sh
tools/trunk/tools/etc/ccm-tools-tomcat.cmd
tools/trunk/tools/etc/ccm-tools-tomcat.sh
tools/trunk/tools/etc/ccm-tools.cmd
tools/trunk/tools/etc/ccm-tools.sh
tools/trunk/tools/pm_to_blib
Modified:
tools/trunk/bundle/make-zip.sh
tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in
tools/trunk/tools/README
tools/trunk/tools/make-zip.sh
Log:
cleanup unneeded files
Modified: tools/trunk/bundle/make-zip.sh
===================================================================
--- tools/trunk/bundle/make-zip.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/bundle/make-zip.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -22,7 +22,7 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/commands"
-find bin/ -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
+find bin/ -maxdepth 1 -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
(
cd "$BUILD_HOME";
Deleted: tools/trunk/rpms/Makefile
===================================================================
--- tools/trunk/rpms/Makefile 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/rpms/Makefile 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,33 +0,0 @@
-
-SPECS = $(wildcard SPECS/*.spec)
-SOURCES = $(wildcard SOURCES/*.tar.gz)
-
-all: rpms
-
-largefiles: j2sdk
-
-j2sdk:
- ./download.sh j2sdk-1_3_1_06-linux-i586.bin \
- bc20d8ee73e364b9818b371955446991 \
- ftp://wandsworth.london.redhat.com/java \
- SOURCES
- ./download.sh j2sdk-1_4_1_01-linux-i586.bin \
- 107f0a7990d1f12713fe6fe968132989 \
- ftp://wandsworth.london.redhat.com/java \
- SOURCES
-
-rpms:
- mkdir -p BUILD SRPMS RPMS
- mkdir -p RPMS/i386 RPMS/i486 RPMS/i586 RPMS/i686 RPMS/noarch
- set -x; set -e; \
- HERE=`pwd`; \
- if rpm -q openssl | grep 0.9.6; then OPENSSL_VERSION="ok"; fi; \
- for i in $(SPECS) ; do \
- if ( [ $$i != "SPECS/resin.spec" ] && [ $$i != "SPECS/mod_gzip.spec" ] ) || \
- ( [ $$i = "SPECS/resin.spec" ] && [ -n "$$OPENSSL_VERSION" ] ) || \
- ( [ $$i = "SPECS/mod_gzip.spec" ] && rpm -q apache-devel ); then \
- rpmbuild --nodeps --define "_topdir $$HERE" -ba --clean $$i; \
- fi; \
- done
-
-.PHONY: largefiles j2sdk rpms
Deleted: tools/trunk/rpms/download.sh
===================================================================
--- tools/trunk/rpms/download.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/rpms/download.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-file=$1
-md5sum=$2
-sourcedir=$3
-destdir=$4
-
-function get
-{
- rm -f $destdir/$file
- wget -O $destdir/$file $sourcedir/$file
-}
-
-# Convoluted logic in the following is required in order to avoid
-# an implementation problem with the shell / '[' command.
-if [ ! -f $destdir/$file ]; then
- get
-elif [ `md5sum $destdir/$file | awk '{print $1}'` != "$md5sum" ]; then
- get
-fi
Deleted: tools/trunk/rpms/rollingbuild.sh
===================================================================
--- tools/trunk/rpms/rollingbuild.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/rpms/rollingbuild.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-FILES=""
-FILES="$FILES Compress-Zlib-1.16"
-FILES="$FILES Archive-Zip-1.05"
-FILES="$FILES Authen-PAM-0.13"
-FILES="$FILES Authen-SASL-2.02"
-FILES="$FILES BSD-Resource-1.15"
-FILES="$FILES Convert-ASN1-0.16"
-FILES="$FILES Net_SSLeay.pm-1.25"
-FILES="$FILES IO-Socket-SSL-0.95"
-FILES="$FILES IO-stringy-2.108"
-FILES="$FILES File-Sync-0.09"
-FILES="$FILES perl-ldap-0.26"
-FILES="$FILES Net-FTPServer-1.111"
-FILES="$FILES Text-Document-0.8.36"
-
-if [ -d build ]; then
- rm -rf build
-fi
-
-mkdir build
-cd build
-
-export AUTO_BUILD_ROOT=/var/builder/build-root
-export PERL5LIB=$AUTO_BUILD_ROOT/usr/lib/perl5/site_perl
-
-for i in $FILES
-do
- tar zxvf ../SOURCES/$i.tar.gz
- (
- cd $i
- perl Makefile.PL
- make
- # No point since building RPMs will run make test later
- #make test
- PERL_VERSION=`perl -e '$version = sprintf "%vd", $^V; $version =~ s/\.[^\.]+$//; print "$version\n"'`
- if [ "$PERL_VERSION" == "5.8" ]; then
- export PERL_INSTALL_ROOT=$AUTO_BUILD_ROOT
- fi
- make install PREFIX=$AUTO_BUILD_ROOT/usr
- )
-done
-
-cd ..
-
-exec make all
Deleted: tools/trunk/scripts/bin/.extract-version.pl.test
===================================================================
Deleted: tools/trunk/scripts/bin/.filter-manifest.pl.test
===================================================================
Deleted: tools/trunk/scripts/bin/.gen-prototype.pl.test
===================================================================
Deleted: tools/trunk/scripts/bin/.interpolate.pl.test
===================================================================
Modified: tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in
===================================================================
--- tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in 2005-02-04 22:35:46 UTC (rev 198)
@@ -4,10 +4,11 @@
*\\semantic.cache
*\\afiedt.buf
*\\.xvpics\\*
+*\\.svn\\*
*\\build\\*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\build\\*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\rollingbuild\\*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\enterprise.init*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\config.vars*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\build.xml
-*\\::PACKAGE::-::VERSION::-::RELEASE::\\MANIFEST.SKIP
\ No newline at end of file
+*\\::PACKAGE::-::VERSION::-::RELEASE::\\MANIFEST.SKIP
Modified: tools/trunk/tools/README
===================================================================
--- tools/trunk/tools/README 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/README 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,7 +1,7 @@
- CCM Devel README
+ CCM Tools README
=================
-This package provides an integrated development environment
-for CCM applications
+This package provides base CCM tools
+to be used in deployment and development environments.
-- End of file
Deleted: tools/trunk/tools/etc/ccm-tools-resin.cmd
===================================================================
--- tools/trunk/tools/etc/ccm-tools-resin.cmd 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-resin.cmd 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,12 +0,0 @@
-if "%CCM_ZIP_ROOT%" == "" (
- set CCM_ZIP_ROOT=C:\ccm
-)
-
-set prefix=%CCM_ZIP_ROOT%\usr
-
-set CCM_SERVLET_RESIN_START=%prefix%\share\ccm-tools\server\resin\bin\run-resin start
-set CCM_SERVLET_RESIN_STOP=%prefix%\share\ccm-tools\server\resin\bin\run-resin stop
-set CCM_SERVLET_RESIN_CONF=%prefix%\share\ccm-tools\server\resin\bin\resin-conf-gen
-
-set prefix=
-
Deleted: tools/trunk/tools/etc/ccm-tools-resin.sh
===================================================================
--- tools/trunk/tools/etc/ccm-tools-resin.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-resin.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,9 +0,0 @@
-prefix=
-
-CCM_SERVLET_RESIN_START="${prefix}/share/ccm-tools/server/resin/bin/run-resin start"
-CCM_SERVLET_RESIN_STOP="${prefix}/share/ccm-tools/server/resin/bin/run-resin stop"
-CCM_SERVLET_RESIN_CONF="${prefix}/share/ccm-tools/server/resin/bin/resin-conf-gen"
-
-export CCM_SERVLET_RESIN_START
-export CCM_SERVLET_RESIN_STOP
-export CCM_SERVLET_RESIN_CONF
Deleted: tools/trunk/tools/etc/ccm-tools-tomcat.cmd
===================================================================
--- tools/trunk/tools/etc/ccm-tools-tomcat.cmd 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-tomcat.cmd 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,13 +0,0 @@
-if "%CCM_ZIP_ROOT%" == "" (
- set CCM_ZIP_ROOT=C:\ccm
-)
-
-set prefix=%CCM_ZIP_ROOT%\usr
-
-set CCM_SERVLET_TOMCAT_START=%prefix%\share\ccm-tools\server\tomcat\bin\run-tomcat start
-set CCM_SERVLET_TOMCAT_STOP=%prefix%\share\ccm-tools\server\tomcat\bin\run-tomcat stop
-set CCM_SERVLET_TOMCAT_CONF=%prefix%\share\ccm-tools\server\tomcat\bin\tomcat-conf-gen
-set CCM_SERVLET_TOMCAT_WINSERVICE=%prefix%\share\ccm-tools\server\tomcat\bin\run-tomcat reinstall
-
-set prefix=
-
Deleted: tools/trunk/tools/etc/ccm-tools-tomcat.sh
===================================================================
--- tools/trunk/tools/etc/ccm-tools-tomcat.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-tomcat.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,9 +0,0 @@
-prefix=
-
-CCM_SERVLET_TOMCAT_START="${prefix}/share/ccm-tools/server/tomcat/bin/run-tomcat start"
-CCM_SERVLET_TOMCAT_STOP="${prefix}/share/ccm-tools/server/tomcat/bin/run-tomcat stop"
-CCM_SERVLET_TOMCAT_CONF="${prefix}/share/ccm-tools/server/tomcat/bin/tomcat-conf-gen"
-
-export CCM_SERVLET_TOMCAT_START
-export CCM_SERVLET_TOMCAT_STOP
-export CCM_SERVLET_TOMCAT_CONF
Deleted: tools/trunk/tools/etc/ccm-tools.cmd
===================================================================
--- tools/trunk/tools/etc/ccm-tools.cmd 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools.cmd 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,12 +0,0 @@
-if "%CCM_ZIP_ROOT%" == "" (
- set CCM_ZIP_ROOT=C:\ccm
-)
-
-set prefix=%CCM_ZIP_ROOT%\usr
-
-set CCM_HOME=%prefix%\share\ccm
-set CCM_TOOLS_HOME=%prefix%\share\ccm-tools
-
-
-set prefix=
-
Deleted: tools/trunk/tools/etc/ccm-tools.sh
===================================================================
--- tools/trunk/tools/etc/ccm-tools.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,10 +0,0 @@
-prefix=
-
-CCM_HOME=${prefix}/share/ccm
-CCM_TOOLS_HOME=${prefix}/share/ccm-tools
-
-export CCM_HOME
-export CCM_TOOLS_HOME
-
-
-
Modified: tools/trunk/tools/make-zip.sh
===================================================================
--- tools/trunk/tools/make-zip.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/make-zip.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -22,7 +22,7 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/bin"
-find bin/ -type f -name "ccm*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/bin/" \;
+find bin/ -maxdepth 1 -type f -name "ccm*" -not -name "*~" -exec cp {} "$BUILD_DIR/bin/" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/bin"
cp bin/javaconfig "$BUILD_DIR/usr/share/ccm-tools/bin/"
@@ -41,7 +41,7 @@
mkdir -p "$BUILD_DIR/usr/share/ccm/webapps/ROOT/packages/content-section/templates"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/commands"
-find commands/ -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
+find commands/ -maxdepth 1 -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/lib/CCM"
cp lib/CCM/*.pm "$BUILD_DIR/usr/share/ccm-tools/lib/CCM"
@@ -80,8 +80,8 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server"
-cp -rp server/resin "$BUILD_DIR/usr/share/ccm-tools/server"
-find "$BUILD_DIR/usr/share/ccm-tools/server" -type f -a \( -name 'Makefile*' -o -name '*~' \) -exec rm -f {} \;
+find server/resin/bin -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
+find server/resin/conf -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
cp lib/CCM/Server/Resin.pm "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
@@ -112,10 +112,8 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
-cp -rp server/tomcat/bin "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
-cp -rp server/tomcat/conf "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
-find "$BUILD_DIR/usr/share/ccm-tools/server" -type f -a \( -name 'Makefile*' -o -name '*~' \) -exec rm -f {} \;
-find "$BUILD_DIR/usr/share/ccm-tools/server" -type d -a \( -name 'build' \) -exec rm -rf {} \;
+find server/tomcat/bin -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
+find server/tomcat/conf -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
cp lib/CCM/Server/Tomcat.pm "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
Deleted: tools/trunk/tools/pm_to_blib
===================================================================
|
|
From: <ap...@re...> - 2005-02-04 12:08:08
|
Author: apevec
Date: 2005-02-04 13:07:37 +0100 (Fri, 04 Feb 2005)
New Revision: 197
Modified:
tools/trunk/tools/commands/mkservice
Log:
only root can run ccm mkservice
Modified: tools/trunk/tools/commands/mkservice
===================================================================
--- tools/trunk/tools/commands/mkservice 2005-02-03 22:51:30 UTC (rev 196)
+++ tools/trunk/tools/commands/mkservice 2005-02-04 12:07:37 UTC (rev 197)
@@ -58,6 +58,9 @@
if ($OS eq 'MSWin32') {
CCM::Util::error("$OS not supported");
}
+if ($> != 0) {
+ CCM::Util::error("you must be root to run this");
+}
$CCM_HOME = File::Spec->rel2abs($CCM_HOME);
# global list of classpaths maintained by %post in ccm RPMs
|
18 messages has been excluded from this view by a project administrator.
