Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ss...@vh...> - 2005-06-28 14:42:43
|
Author: sshinde
Date: 2005-06-28 16:36:35 +0200 (Tue, 28 Jun 2005)
New Revision: 616
Modified:
releases/1.0.2/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl
Log:
Merge the XSL changes from r545 to releases branch.
It's used for URL encoding the links inserted from related
links tab in authoring UI
Modified: releases/1.0.2/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl
===================================================================
--- releases/1.0.2/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-06-28 14:32:25 UTC (rev 615)
+++ releases/1.0.2/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-06-28 14:36:35 UTC (rev 616)
@@ -263,6 +263,56 @@
</xsl:if>
</xsl:template>
+<!-- URL Encoding Template Begin -->
+<!-- Taken on as is basis.Written by Mike J. Brown, mi...@sk....
+ No license; use freely, but credit me if reproducing in print.
+ Characters we'll support.
+ We could add control chars 0-31 and 127-159, but we won't.
+-->
+ <xsl:variable name="ascii"> !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~</xsl:variable>
+ <xsl:variable name="latin1"> ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ</xsl:variable>
+
+ <!-- Characters that usually don't need to be escaped -->
+ <xsl:variable name="safe">!'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~</xsl:variable>
+
+ <xsl:variable name="hex" >0123456789ABCDEF</xsl:variable>
+ <xsl:template name="url-encode">
+ <xsl:param name="str"/>
+ <xsl:if test="$str">
+ <xsl:variable name="first-char" select="substring($str,1,1)"/>
+ <xsl:choose>
+ <xsl:when test="contains($safe,$first-char)">
+ <xsl:value-of select="$first-char"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="codepoint">
+ <xsl:choose>
+ <xsl:when test="contains($ascii,$first-char)">
+ <xsl:value-of select="string-length(substring-before($ascii,$first-char)) + 32"/>
+ </xsl:when>
+ <xsl:when test="contains($latin1,$first-char)">
+ <xsl:value-of select="string-length(substring-before($latin1,$first-char)) + 160"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="no">Warning: string contains a character that is out of range! Substituting "?".</xsl:message>
+ <xsl:text>63</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="hex-digit1" select="substring($hex,floor($codepoint div 16) + 1,1)"/>
+ <xsl:variable name="hex-digit2" select="substring($hex,$codepoint mod 16 + 1,1)"/>
+ <xsl:value-of select="concat('%',$hex-digit1,$hex-digit2)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="string-length($str) > 1">
+ <xsl:call-template name="url-encode">
+ <xsl:with-param name="str" select="substring($str,2)"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+<!-- URL Encoding Template End -->
+
<xsl:template name="associatedLinks">
<xsl:if test="cms:contentPanel/cms:item/links">
<div class="attachment">
@@ -275,7 +325,13 @@
<xsl:attribute name="href">
<xsl:choose>
<xsl:when test="targetType='internalLink'">
- <xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="targetItem/@oid"/>
+ <xsl:text>/redirect/?oid=</xsl:text>
+ <xsl:call-template name="url-encode">
+ <xsl:with-param name="str">
+ <xsl:value-of select="targetItem/@oid"/>
+ </xsl:with-param>
+ </xsl:call-template>
+<!-- <xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="targetItem/@oid"/> -->
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="targetURI"/>
@@ -306,12 +362,6 @@
</xsl:template>
-
-
-
-
-
-
<xsl:template name="metaData">
<meta name="eGMS.accessibility" scheme="WCAG" content="Double-A" />
<meta name="DCTERMS.audience" content="" scheme="LGAL" href="http://www.esd.org.uk/standards/lgal/" />
|
|
From: <ss...@vh...> - 2005-06-28 14:38:43
|
Author: sshinde
Date: 2005-06-28 16:32:25 +0200 (Tue, 28 Jun 2005)
New Revision: 615
Modified:
releases/1.0.2/ccm-cms/web/assets/htmlarea/popups/insert_link.html
Log:
Merging the r 527 from trunk ccm-cms for coventry.
Modified: releases/1.0.2/ccm-cms/web/assets/htmlarea/popups/insert_link.html
===================================================================
--- releases/1.0.2/ccm-cms/web/assets/htmlarea/popups/insert_link.html 2005-06-28 14:30:50 UTC (rev 614)
+++ releases/1.0.2/ccm-cms/web/assets/htmlarea/popups/insert_link.html 2005-06-28 14:32:25 UTC (rev 615)
@@ -30,7 +30,7 @@
for (var i in fields) {
var id = fields[i];
var el = document.getElementById(id);
- param[id] = el.value;
+ param[id] = encodeURI(el.value);
}
__dlg_close(param);
return false;
|
|
From: <ss...@vh...> - 2005-06-28 14:37:06
|
Author: sshinde
Date: 2005-06-28 16:30:50 +0200 (Tue, 28 Jun 2005)
New Revision: 614
Modified:
ccm-core/trunk/sql/ccm-core/fixes/formbuilder/delete-bogus-form-widgets.sql
Log:
Fix the problem with core 6.1.0 - 6.1.1 upgrade.
forms_dd_select was referencing bebop_components and was
failing with constraint violations when trying to cleanup the bogus
entries from bebop_components table.
Modified: ccm-core/trunk/sql/ccm-core/fixes/formbuilder/delete-bogus-form-widgets.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/fixes/formbuilder/delete-bogus-form-widgets.sql 2005-06-27 17:56:17 UTC (rev 613)
+++ ccm-core/trunk/sql/ccm-core/fixes/formbuilder/delete-bogus-form-widgets.sql 2005-06-28 14:30:50 UTC (rev 614)
@@ -12,6 +12,11 @@
where h2.component_id = bebop_component_hierarchy.container_id
);
+delete from forms_dd_select
+ where not exists( select 1 from bebop_component_hierarchy h
+ where h.component_id = forms_dd_select.widget_id
+ or h.container_id = forms_dd_select.widget_id);
+
delete from bebop_widgets
where not exists( select 1 from bebop_component_hierarchy h
where h.component_id = bebop_widgets.widget_id
|
|
From: <ssk...@vh...> - 2005-06-27 18:02:42
|
Author: sskracic
Date: 2005-06-27 19:56:17 +0200 (Mon, 27 Jun 2005)
New Revision: 613
Added:
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/1.0.2-1.0.3/
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/1.0.2-1.0.3/add-mising-terms.sql
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/1.0.2-1.0.3/
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/1.0.2-1.0.3/add-mising-terms.sql
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.2-1.0.3.sql
ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.2-1.0.3.sql
Modified:
ccm-ldn-terms/trunk/application.xml
ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade
Log:
Added the upgrade scripts which will create associated term entries for
all categories that have been added through the 'Categories' tab in the
content section admin UI.
Modified: ccm-ldn-terms/trunk/application.xml
===================================================================
--- ccm-ldn-terms/trunk/application.xml 2005-06-24 16:24:07 UTC (rev 612)
+++ ccm-ldn-terms/trunk/application.xml 2005-06-27 17:56:17 UTC (rev 613)
@@ -3,7 +3,7 @@
name="ccm-ldn-terms"
prettyName="Terms"
version="1.0.3"
- release="1">
+ release="2">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.2"/>
<ccm:requires name="ccm-cms" version="6.1.2"/>
Added: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/1.0.2-1.0.3/add-mising-terms.sql
===================================================================
--- ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/1.0.2-1.0.3/add-mising-terms.sql 2005-06-24 16:24:07 UTC (rev 612)
+++ ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/1.0.2-1.0.3/add-mising-terms.sql 2005-06-27 17:56:17 UTC (rev 613)
@@ -0,0 +1,45 @@
+
+insert into acs_objects (object_id, object_type, default_domain_class, display_name)
+ select
+ acs_object_id_seq.nextval,
+ 'com.arsdigita.london.terms.Term',
+ 'com.arsdigita.london.terms.Term',
+ 'missing term for category ID: ' || cats.category_id
+ from
+ cat_categories cats, trm_domains doms
+ where cats.default_ancestors like doms.model_category_id || '/_%'
+ and not exists (select 1 from trm_terms trm
+ where trm.model_category_id = cats.category_id) ;
+
+insert into trm_terms (
+ term_id,
+ domain,
+ unique_id,
+ is_atoz,
+ model_category_id
+) select
+ ao.object_id,
+ dom.key,
+ ao.object_id,
+ '0',
+ cat.category_id
+ from
+ acs_objects ao,
+ cat_categories cat,
+ trm_domains dom
+ where
+ cat.default_ancestors like dom.model_category_id || '/_%'
+ and ao.object_type = 'com.arsdigita.london.terms.Term'
+ and ao.display_name = 'missing term for category ID: ' || cat.category_id
+ and not exists (select 1 from trm_terms trm
+ where trm.model_category_id = cat.category_id) ;
+
+update acs_objects set
+ display_name = 'com.arsdigita.london.terms.Term ' || object_id
+ where
+ object_type = 'com.arsdigita.london.terms.Term'
+ and display_name like 'missing term for category ID:%';
+
+commit;
+
+
Property changes on: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/oracle-se/upgrade/1.0.2-1.0.3/add-mising-terms.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Added: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/1.0.2-1.0.3/add-mising-terms.sql
===================================================================
--- ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/1.0.2-1.0.3/add-mising-terms.sql 2005-06-24 16:24:07 UTC (rev 612)
+++ ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/1.0.2-1.0.3/add-mising-terms.sql 2005-06-27 17:56:17 UTC (rev 613)
@@ -0,0 +1,47 @@
+
+begin;
+
+insert into acs_objects (object_id, object_type, default_domain_class, display_name)
+ select
+ nextval('acs_object_id_seq'),
+ 'com.arsdigita.london.terms.Term',
+ 'com.arsdigita.london.terms.Term',
+ 'missing term for category ID: ' || cats.category_id
+ from
+ cat_categories cats, trm_domains doms
+ where cats.default_ancestors like doms.model_category_id || '/_%'
+ and not exists (select 1 from trm_terms trm
+ where trm.model_category_id = cats.category_id) ;
+
+insert into trm_terms (
+ term_id,
+ domain,
+ unique_id,
+ is_atoz,
+ model_category_id
+) select
+ ao.object_id,
+ dom.key,
+ ao.object_id,
+ 'f',
+ cat.category_id
+ from
+ acs_objects ao,
+ cat_categories cat,
+ trm_domains dom
+ where
+ cat.default_ancestors like dom.model_category_id || '/_%'
+ and ao.object_type = 'com.arsdigita.london.terms.Term'
+ and ao.display_name = 'missing term for category ID: ' || cat.category_id
+ and not exists (select 1 from trm_terms trm
+ where trm.model_category_id = cat.category_id) ;
+
+update acs_objects set
+ display_name = 'com.arsdigita.london.terms.Term ' || object_id
+ where
+ object_type = 'com.arsdigita.london.terms.Term'
+ and display_name like 'missing term for category ID:%';
+
+commit;
+
+
Property changes on: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/postgres/upgrade/1.0.2-1.0.3/add-mising-terms.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Added: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.2-1.0.3.sql
===================================================================
--- ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.2-1.0.3.sql 2005-06-24 16:24:07 UTC (rev 612)
+++ ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.2-1.0.3.sql 2005-06-27 17:56:17 UTC (rev 613)
@@ -0,0 +1 @@
+@@ ../oracle-se/upgrade/1.0.2-1.0.3/add-mising-terms.sql
Property changes on: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.2-1.0.3.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Added: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.2-1.0.3.sql
===================================================================
--- ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.2-1.0.3.sql 2005-06-24 16:24:07 UTC (rev 612)
+++ ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.2-1.0.3.sql 2005-06-27 17:56:17 UTC (rev 613)
@@ -0,0 +1 @@
+\i ../postgres/upgrade/1.0.2-1.0.3/add-mising-terms.sql
Property changes on: ccm-ldn-terms/trunk/sql/ccm-ldn-terms/upgrade/postgres-1.0.2-1.0.3.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Modified: ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade
===================================================================
--- ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade 2005-06-24 16:24:07 UTC (rev 612)
+++ ccm-ldn-terms/trunk/src/ccm-ldn-terms.upgrade 2005-06-27 17:56:17 UTC (rev 613)
@@ -6,4 +6,7 @@
<version from="1.0.1" to="1.0.2">
<script sql="ccm-ldn-terms/upgrade/::database::-1.0.1-1.0.2.sql"/>
</version>
+ <version from="1.0.2" to="1.0.3">
+ <script sql="ccm-ldn-terms/upgrade/::database::-1.0.2-1.0.3.sql"/>
+ </version>
</upgrade>
|
|
From: <ssk...@vh...> - 2005-06-24 16:30:16
|
Author: sskracic Date: 2005-06-24 18:24:07 +0200 (Fri, 24 Jun 2005) New Revision: 612 Modified: users/sskracic/bin/make-build-release-area.sh Log: Use tools from trunk all the time. Modified: users/sskracic/bin/make-build-release-area.sh =================================================================== --- users/sskracic/bin/make-build-release-area.sh 2005-06-24 15:09:14 UTC (rev 611) +++ users/sskracic/bin/make-build-release-area.sh 2005-06-24 16:24:07 UTC (rev 612) @@ -19,6 +19,6 @@ if [ ! -L tools ] then - ln -s ~/svn/releases/$RELEASE/tools tools + ln -s ~/svn/tools/trunk tools fi |
|
From: <ss...@vh...> - 2005-06-24 15:15:19
|
Author: sshinde
Date: 2005-06-24 17:09:14 +0200 (Fri, 24 Jun 2005)
New Revision: 611
Modified:
contrib/ccm-ldn-isc/trunk/application.xml
Log:
Fix dependencies for building on release 1.0.2
Modified: contrib/ccm-ldn-isc/trunk/application.xml
===================================================================
--- contrib/ccm-ldn-isc/trunk/application.xml 2005-06-24 14:02:23 UTC (rev 610)
+++ contrib/ccm-ldn-isc/trunk/application.xml 2005-06-24 15:09:14 UTC (rev 611)
@@ -2,15 +2,22 @@
<ccm:application name="ccm-ldn-isc"
prettyName="Inter Server Communication"
- version="0.9.0"
+ version="0.9.1"
release="1"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.0"/>
- <ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
+ <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
</ccm:dependencies>
+ <ccm:directories>
+ <ccm:directory name="pdl"/>
+ <ccm:directory name="sql"/>
+ <ccm:directory name="src"/>
+ <ccm:directory name="web"/>
+ </ccm:directories>
+
<ccm:contacts>
<ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
<ccm:contact uri="mailto:rh...@re..." type="support"/>
|
|
From: <ssk...@vh...> - 2005-06-24 14:08:29
|
Author: sskracic
Date: 2005-06-24 16:02:23 +0200 (Fri, 24 Jun 2005)
New Revision: 610
Modified:
tools/trunk/misc/build-all.sh
tools/trunk/scripts/pkg/dist/rpm.spec.in
Log:
Use -j option for build-all.sh to skip creation of Javadoc
(ccm-app-doc.rpm) RPMs.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2005-06-24 07:19:03 UTC (rev 609)
+++ tools/trunk/misc/build-all.sh 2005-06-24 14:02:23 UTC (rev 610)
@@ -12,6 +12,7 @@
PACKAGE_ARG=0
BUILD_ARG=0
DOCS_ARG=0
+NO_JAVADOC_ARG=0
export AUTO_BUILD_ROOT=/var/tmp/$USER-auto-build-root
rm -rf $AUTO_BUILD_ROOT && mkdir $AUTO_BUILD_ROOT;
@@ -25,6 +26,7 @@
-p Run packaging step
-b Run application build step
-d Run documentation build step
+ -j Don't build javadoc (app-doc.rpm)
-r [name] Restart application build from app [name]
EOF
exit 1
@@ -221,12 +223,13 @@
export SVN_REVISION
}
-while getopts r:qpdbv opt; do
+while getopts r:qpdbvj opt; do
case $opt in
r) RESTART_FROM=$OPTARG;;
p) PACKAGE_ARG=1;;
d) DOCS_ARG=1;;
b) BUILD_ARG=1;;
+ j) export CCM_BUILD_NO_DOCS=1;;
q) export CCM_DIST_NOZIPS=1;;
v) set -v;;
[?]) display_usage
@@ -255,6 +258,7 @@
echo "Building apps: $DO_BUILD"
echo "Building docs: $DO_DOCS"
echo "Building ISOs: $DO_PACKAGE"
+echo "Skipping Javadoc RPMs: ${CCM_BUILD_NO_DOCS:-0}"
shift $(($OPTIND-1))
Modified: tools/trunk/scripts/pkg/dist/rpm.spec.in
===================================================================
--- tools/trunk/scripts/pkg/dist/rpm.spec.in 2005-06-24 07:19:03 UTC (rev 609)
+++ tools/trunk/scripts/pkg/dist/rpm.spec.in 2005-06-24 14:02:23 UTC (rev 610)
@@ -1,3 +1,6 @@
+
+%define builddoc() %(if env | grep -q CCM_BUILD_NO_DOCS ; then echo 0; else echo 1; fi)
+
Summary: ::CCM_PACKAGE:: provides an application based on the Red Hat Web Application Framework.
Name: ::CCM_PACKAGE::
Version: ::CCM_PKGVERSION::
@@ -26,15 +29,17 @@
%define ccmclasspathfile ccm/ccm.classpath
%define ccmwebappfile ccm/ccm.webapps
+%description
+::CCM_PACKAGE:: provides an application based on the Red Hat Web Application Framework.
+
+%if %builddoc
%package doc
Summary: ::CCM_PACKAGE:: API documentation
Group: Applications/Internet/CCM
-%description
-::CCM_PACKAGE:: provides an application based on the Red Hat Web Application Framework.
-
%description doc
::CCM_PACKAGE:: documentation. Provides the JavaDoc API documentation.
+%endif
%prep
%setup -q -n %{name}-%{appversion}
@@ -86,7 +91,9 @@
if [ -d %{_builddir}/%{name}-%{appversion}/%{appname}/src ]; then
$ANT deploy-jar-classes-%{appname}
+%if %builddoc
$ANT deploy-javadoc-%{appname}
+%endif
fi
if [ -n "$AUTO_BUILD_ROOT" ]; then
@@ -213,6 +220,8 @@
%doc %{appname}/doc/*
%endif
+%if %builddoc
%files doc
%defattr(-,root,root)
/var/www/html/%{name}-%{version}
+%endif
|
|
From: <ssk...@vh...> - 2005-06-24 07:25:09
|
Author: sskracic
Date: 2005-06-24 09:19:03 +0200 (Fri, 24 Jun 2005)
New Revision: 609
Added:
tools/trunk/devel/etc/envvars.in
Modified:
tools/trunk/devel/bin/ccm-devel-create.pl
tools/trunk/devel/configure.in
tools/trunk/devel/etc/Makefile.am
Log:
ccm-devel-create.pl will now also write 'envvars'
file to cdweb/conf.
Modified: tools/trunk/devel/bin/ccm-devel-create.pl
===================================================================
--- tools/trunk/devel/bin/ccm-devel-create.pl 2005-06-23 15:50:05 UTC (rev 608)
+++ tools/trunk/devel/bin/ccm-devel-create.pl 2005-06-24 07:19:03 UTC (rev 609)
@@ -65,6 +65,7 @@
my $tomcatconf5x = File::Spec->catfile($etcdir,'ccm-devel','server.xml.in');
my $tomcatconf = File::Spec->catfile($ccmtoolshome,'server','tomcat','conf','server-devel.xml.in');
my $nocvsroot = File::Spec->catdir($ccmrootdir,'temp','no-cvsroot');
+my $envvars = File::Spec->catfile($etcdir,'ccm-devel','envvars.in');
my $ccmdevelhome = defined $ENV{'CCM_DEVEL_HOME'} ? $ENV{'CCM_DEVEL_HOME'} :
defined $ENV{'CCM_CONFIG_HOME'} ? $ENV{'CCM_CONFIG_HOME'} :
@@ -353,6 +354,7 @@
mkdir 'webapps', 0777;
mkdir 'logs', 0777;
mkdir 'conf', 0777;
+ &do_interp($envvars, File::Spec->catfile($webdir,$user,$project,'conf','envvars'));
mkdir 'tmp', 0777;
mkdir 'data', 0777;
my $interp_count = 0;
Modified: tools/trunk/devel/configure.in
===================================================================
--- tools/trunk/devel/configure.in 2005-06-23 15:50:05 UTC (rev 608)
+++ tools/trunk/devel/configure.in 2005-06-24 07:19:03 UTC (rev 609)
@@ -3,7 +3,7 @@
AC_INIT(ccm-devel.spec.in)
-VERSION=2.2.0
+VERSION=2.2.1
RELEASE=1
AM_INIT_AUTOMAKE(ccm-devel, $VERSION)
Modified: tools/trunk/devel/etc/Makefile.am
===================================================================
--- tools/trunk/devel/etc/Makefile.am 2005-06-23 15:50:05 UTC (rev 608)
+++ tools/trunk/devel/etc/Makefile.am 2005-06-24 07:19:03 UTC (rev 609)
@@ -5,7 +5,7 @@
SUBDIRS = bin project
etcdir = $(sysconfdir)/$(PACKAGE)
-etc_DATA = resin.conf.in server.xml.in
+etc_DATA = resin.conf.in server.xml.in envvars.in
etc_SCRIPTS = project*.sh project*.pl
profiledir = $(sysconfdir)/profile.d
Added: tools/trunk/devel/etc/envvars.in
===================================================================
--- tools/trunk/devel/etc/envvars.in 2005-06-23 15:50:05 UTC (rev 608)
+++ tools/trunk/devel/etc/envvars.in 2005-06-24 07:19:03 UTC (rev 609)
@@ -0,0 +1,37 @@
+## Environment variables to be set at ccm invocation
+
+## Jave Runtime Environment parameters
+# JAVA_OPTS=-Xms512m -Xmx512m
+
+## Document Builder
+# Xerces
+DOCUMENT_BUILDER_FACTORY="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"
+
+# Resin
+# DOCUMENT_BUILDER_FACTORY="com.caucho.xml.parsers.XmlDocumentBuilderFactory"
+##
+
+## Sax Parser
+# Xerces
+SAX_PARSER_FACTORY="org.apache.xerces.jaxp.SAXParserFactoryImpl"
+
+# Resin
+# SAX_PARSER_FACTORY="com.caucho.xml.parsers.XmlSAXParserFactory"
+##
+
+## XSL Transformer
+# Saxon
+JAVA_TRANSFORMER_FACTORY="com.icl.saxon.TransformerFactoryImpl"
+
+# Resin
+# JAVA_TRANSFORMER_FACTORY="com.caucho.xsl.Xsl"
+
+# jd.xslt
+# JAVA_TRANSFORMER_FACTORY="jd.xml.xslt.trax.TransformerFactoryImpl"
+
+# XSLTC
+# JAVA_TRANSFORMER_FACTORY="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"
+
+# Xalan
+# JAVA_TRANSFORMER_FACTORY="org.apache.xalan.processor.TransformerFactoryImpl"
+##
Property changes on: tools/trunk/devel/etc/envvars.in
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
|
|
From: <ssk...@vh...> - 2005-06-23 15:56:09
|
Author: sskracic
Date: 2005-06-23 17:50:05 +0200 (Thu, 23 Jun 2005)
New Revision: 608
Modified:
ccm-core/trunk/src/com/arsdigita/globalization/ChainedResourceBundle.java
ccm-core/trunk/src/com/arsdigita/search/lucene/ContentSectionFilter.java
ccm-core/trunk/src/com/arsdigita/search/lucene/ObjectTypeFilter.java
ccm-core/trunk/src/com/arsdigita/search/lucene/PartyFilter.java
ccm-core/trunk/src/com/arsdigita/search/lucene/TypeSpecificFilter.java
ccm-core/trunk/src/com/arsdigita/util/ServletUtils.java
Log:
Making code JDK 1.5 compliant, ie. don't use 'enum' as
an identifier, since it's reserved keyword now.
Modified: ccm-core/trunk/src/com/arsdigita/globalization/ChainedResourceBundle.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/globalization/ChainedResourceBundle.java 2005-06-23 14:38:54 UTC (rev 607)
+++ ccm-core/trunk/src/com/arsdigita/globalization/ChainedResourceBundle.java 2005-06-23 15:50:05 UTC (rev 608)
@@ -75,9 +75,9 @@
*/
public void addBundle(ChainableResourceBundle bundle) {
m_bundles.add(bundle);
- Enumeration enum = bundle.getKeys();
- while (enum.hasMoreElements()) {
- m_keys.add(enum.nextElement());
+ Enumeration enu = bundle.getKeys();
+ while (enu.hasMoreElements()) {
+ m_keys.add(enu.nextElement());
}
}
Modified: ccm-core/trunk/src/com/arsdigita/search/lucene/ContentSectionFilter.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/search/lucene/ContentSectionFilter.java 2005-06-23 14:38:54 UTC (rev 607)
+++ ccm-core/trunk/src/com/arsdigita/search/lucene/ContentSectionFilter.java 2005-06-23 15:50:05 UTC (rev 608)
@@ -55,10 +55,10 @@
**/
final public BitSet bits(IndexReader reader) throws IOException {
BitSet bits = new BitSet(reader.maxDoc());
- TermDocs enum = reader.termDocs(new Term(Document.CONTENT_SECTION, m_contentSection));
+ TermDocs enu = reader.termDocs(new Term(Document.CONTENT_SECTION, m_contentSection));
- while (enum.next()) {
- bits.set(enum.doc());
+ while (enu.next()) {
+ bits.set(enu.doc());
}
return bits;
Modified: ccm-core/trunk/src/com/arsdigita/search/lucene/ObjectTypeFilter.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/search/lucene/ObjectTypeFilter.java 2005-06-23 14:38:54 UTC (rev 607)
+++ ccm-core/trunk/src/com/arsdigita/search/lucene/ObjectTypeFilter.java 2005-06-23 15:50:05 UTC (rev 608)
@@ -55,10 +55,10 @@
**/
final public BitSet bits(IndexReader reader) throws IOException {
BitSet bits = new BitSet(reader.maxDoc());
- TermDocs enum = reader.termDocs(new Term(Document.TYPE, m_objectType));
+ TermDocs enu = reader.termDocs(new Term(Document.TYPE, m_objectType));
- while (enum.next()) {
- bits.set(enum.doc());
+ while (enu.next()) {
+ bits.set(enu.doc());
}
return bits;
Modified: ccm-core/trunk/src/com/arsdigita/search/lucene/PartyFilter.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/search/lucene/PartyFilter.java 2005-06-23 14:38:54 UTC (rev 607)
+++ ccm-core/trunk/src/com/arsdigita/search/lucene/PartyFilter.java 2005-06-23 15:50:05 UTC (rev 608)
@@ -71,10 +71,10 @@
**/
final public BitSet bits(IndexReader reader) throws IOException {
BitSet bits = new BitSet(reader.maxDoc());
- TermDocs enum = reader.termDocs(new Term(m_partyType, m_partyID.toString()));
+ TermDocs enu = reader.termDocs(new Term(m_partyType, m_partyID.toString()));
- while (enum.next()) {
- bits.set(enum.doc());
+ while (enu.next()) {
+ bits.set(enu.doc());
}
return bits;
Modified: ccm-core/trunk/src/com/arsdigita/search/lucene/TypeSpecificFilter.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/search/lucene/TypeSpecificFilter.java 2005-06-23 14:38:54 UTC (rev 607)
+++ ccm-core/trunk/src/com/arsdigita/search/lucene/TypeSpecificFilter.java 2005-06-23 15:50:05 UTC (rev 608)
@@ -62,11 +62,11 @@
**/
public final BitSet bits(IndexReader reader) throws IOException {
BitSet bits = new BitSet(reader.maxDoc());
- TermDocs enum = reader.termDocs(new Term(Document.TYPE_SPECIFIC_INFO,
+ TermDocs enu = reader.termDocs(new Term(Document.TYPE_SPECIFIC_INFO,
m_typeSpecificInfo));
- while (enum.next()) {
- bits.set(enum.doc());
+ while (enu.next()) {
+ bits.set(enu.doc());
}
return bits;
Modified: ccm-core/trunk/src/com/arsdigita/util/ServletUtils.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/util/ServletUtils.java 2005-06-23 14:38:54 UTC (rev 607)
+++ ccm-core/trunk/src/com/arsdigita/util/ServletUtils.java 2005-06-23 15:50:05 UTC (rev 608)
@@ -56,9 +56,9 @@
varArray = StringUtils.split(vars, ' ');
} else {
List varList = new ArrayList();
- Enumeration enum = req.getParameterNames();
- while (enum.hasMoreElements()) {
- varList.add(enum.nextElement());
+ Enumeration enu = req.getParameterNames();
+ while (enu.hasMoreElements()) {
+ varList.add(enu.nextElement());
}
varArray = new String[varList.size()];
varList.toArray(varArray);
|
|
From: <ssk...@vh...> - 2005-06-23 14:45:32
|
Author: sskracic Date: 2005-06-23 16:38:54 +0200 (Thu, 23 Jun 2005) New Revision: 607 Added: ccm-core/trunk/etc/lib/javacc.jar Removed: ccm-core/trunk/etc/lib/JavaCC.zip Modified: ccm-core/trunk/etc/java-libs.txt Log: Updating JavaCC to 3.2, which happens to be open-source under BSD license. Modified: ccm-core/trunk/etc/java-libs.txt =================================================================== --- ccm-core/trunk/etc/java-libs.txt 2005-06-23 14:37:50 UTC (rev 606) +++ ccm-core/trunk/etc/java-libs.txt 2005-06-23 14:38:54 UTC (rev 607) @@ -16,7 +16,7 @@ iDoclet.jar 1.0 GPL http://www.gnu.org/copyleft/gpl.html jaas.jar 1.0 SUN http://java.sun.com/products/jaas/index-10.html jakarta-oro-2.0.7.jar 2.0.7 APACHE http://www.apache.org/LICENSE.txt -JavaCC.zip 1.2 SUN http://www.experimentalstuff.com/Technologies/JavaCC/ +javacc.jar 3.2 BSD https://javacc.dev.java.net/ jaxp.jar 1.1 SUN http://java.sun.com/xml/download.html jce.jar 1.2.1 SUN http://java.sun.com/products/jce/jce121_license.txt US_export_policy.jar Deleted: ccm-core/trunk/etc/lib/JavaCC.zip Added: ccm-core/trunk/etc/lib/javacc.jar =================================================================== (Binary files differ) Property changes on: ccm-core/trunk/etc/lib/javacc.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <ssk...@vh...> - 2005-06-23 14:43:54
|
Author: sskracic
Date: 2005-06-23 16:37:50 +0200 (Thu, 23 Jun 2005)
New Revision: 606
Removed:
tools/trunk/devel/lib/ant-contrib-0.6.jar
tools/trunk/devel/lib/ant.jar
tools/trunk/devel/lib/optional.jar
Modified:
tools/trunk/devel/ccm-devel.spec.in
tools/trunk/devel/configure.in
tools/trunk/devel/xsl/build-template.xsl
tools/trunk/misc/build-all.sh
Log:
No more distributing ant*.jar files as part of ccm-devel
distribution. Instead, dependenices for ant, ant-contrib
and ant-nodeps set for ccm-devel. The build system has been
updated to deal with the changes.
Modified: tools/trunk/devel/ccm-devel.spec.in
===================================================================
--- tools/trunk/devel/ccm-devel.spec.in 2005-06-22 15:51:18 UTC (rev 605)
+++ tools/trunk/devel/ccm-devel.spec.in 2005-06-23 14:37:50 UTC (rev 606)
@@ -9,6 +9,9 @@
Group: Applications/Internet/CCM
BuildRoot: /var/tmp/%{name}-%{version}-root
Requires: ccm-tools
+Requires: ant >= 1.6.2
+Requires: ant-nodeps >= 1.6.2
+Requires: ant-contrib >= 0.6
Requires: /usr/bin/perl
Obsoletes: ccm-config
Provides: ccm-config 1.1.0
@@ -80,7 +83,6 @@
JAVA_DIR=`echo /usr/share/%{name}/lib | sed -e "s,/usr,$USR_DIR,"`
cd $JAVA_DIR
-ln -sf ant-contrib-0.6.jar ant-contrib.jar
ln -sf jakarta-oro-2.0.4.jar jakarta-oro.jar
%post cvs
@@ -129,6 +131,9 @@
/etc/%{name}/project.d/%{name}-perforce.sh
%changelog
+* Thu Jun 23 2005 Sebastian Skracic <ssk...@re...>
+- Removed ant*.jar from the package
+
* Thu Nov 13 2003 Daniel Berrange <ber...@re...>
- Completed support for relocatable installation
Modified: tools/trunk/devel/configure.in
===================================================================
--- tools/trunk/devel/configure.in 2005-06-22 15:51:18 UTC (rev 605)
+++ tools/trunk/devel/configure.in 2005-06-23 14:37:50 UTC (rev 606)
@@ -3,7 +3,7 @@
AC_INIT(ccm-devel.spec.in)
-VERSION=2.1.2
+VERSION=2.2.0
RELEASE=1
AM_INIT_AUTOMAKE(ccm-devel, $VERSION)
Deleted: tools/trunk/devel/lib/ant-contrib-0.6.jar
Deleted: tools/trunk/devel/lib/ant.jar
Deleted: tools/trunk/devel/lib/optional.jar
Modified: tools/trunk/devel/xsl/build-template.xsl
===================================================================
--- tools/trunk/devel/xsl/build-template.xsl 2005-06-22 15:51:18 UTC (rev 605)
+++ tools/trunk/devel/xsl/build-template.xsl 2005-06-23 14:37:50 UTC (rev 606)
@@ -139,7 +139,7 @@
</path>
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
- <pathelement location="${{ccm.config.dir}}/lib/ant-contrib.jar"/>
+ <pathelement location="${{shared.lib.dist.dir}}/ant-contrib.jar"/>
</classpath>
</taskdef>
<taskdef name="jdoenhance" classname="com.redhat.ccm.tools.ant.taskdefs.JDOEnhance">
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2005-06-22 15:51:18 UTC (rev 605)
+++ tools/trunk/misc/build-all.sh 2005-06-23 14:37:50 UTC (rev 606)
@@ -418,7 +418,9 @@
Provides: perl(Carp)
Provides: perl(lib)
Provides: perl
-Provides: ant = 0:1.5.0
+Provides: ant = 0:1.6.2
+Provides: ant-nodeps = 0:1.6.2
+Provides: ant-contrib = 0:0.6
%description
@@ -495,12 +497,32 @@
fi
-
if [ $DO_BUILD = 1 ]; then
. $VIRTUAL_ROOT/etc/profile.d/ccm-tools.sh
. $VIRTUAL_ROOT/etc/profile.d/ccm-devel.sh
. $VIRTUAL_ROOT/etc/profile.d/ccm-scripts.sh
+# This is somewhat lame-ish way, but we really need
+# ant-contrib package installed.
+# The build system needs ant-contrib.jar (<if> task).
+# It is no longer present in the ccm-devel, so the appropriate
+# RPM must be installed beforehand.
+
+if rpm -q ant-contrib | grep 'not installed'
+then
+ echo "Please install ant-contrib RPM, the build system depends on it."
+ exit 1
+else
+ for file in $(rpm -ql ant-contrib)
+ do
+ relfile=${file#/usr}
+ dir=$VIRTUAL_ROOT${relfile%/*}
+ mkdir -p $dir
+ cp -f $file $dir
+ done
+fi
+
+
export CCM_RPM_DIR=$HOMETOPDIR
export CCM_RPMBUILD_FLAGS="$RPM_ARGS"
export CLASSPATH="$CLASSPATH:$CCM_SHARED_LIB_DIST_DIR/servlet.jar"
|
|
From: <mb...@vh...> - 2005-06-22 15:57:12
|
Author: mbooth
Date: 2005-06-22 17:51:18 +0200 (Wed, 22 Jun 2005)
New Revision: 605
Modified:
ccm-core/trunk/src/com/arsdigita/caching/DynamicList.java
Log:
Log the ID of the cache that's full
Modified: ccm-core/trunk/src/com/arsdigita/caching/DynamicList.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/caching/DynamicList.java 2005-06-22 15:11:19 UTC (rev 604)
+++ ccm-core/trunk/src/com/arsdigita/caching/DynamicList.java 2005-06-22 15:51:18 UTC (rev 605)
@@ -87,7 +87,7 @@
// make sure cache is not overfilled
if (m_count >= m_maxSize) {
- s_log.warn("Cache full. current size: " +
+ s_log.warn("Cache " + m_cacheID + " is full. current size: " +
m_count +
"; max size: " +
m_maxSize);
|
|
From: <mb...@vh...> - 2005-06-22 15:17:22
|
Author: mbooth
Date: 2005-06-22 17:11:19 +0200 (Wed, 22 Jun 2005)
New Revision: 604
Modified:
ccm-ldn-navigation/trunk/application.xml
Log:
Use ge relations for dependencies in nav app
Modified: ccm-ldn-navigation/trunk/application.xml
===================================================================
--- ccm-ldn-navigation/trunk/application.xml 2005-06-22 14:25:10 UTC (rev 603)
+++ ccm-ldn-navigation/trunk/application.xml 2005-06-22 15:11:19 UTC (rev 604)
@@ -6,10 +6,10 @@
release="1"
webapp="ROOT">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.1.2"/>
- <ccm:requires name="ccm-cms" version="6.1.2"/>
- <ccm:requires name="ccm-ldn-util" version="1.4.2"/>
- <ccm:requires name="ccm-ldn-terms" version="1.0.3"/>
+ <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
+ <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/>
+ <ccm:requires name="ccm-ldn-util" version="1.4.1" relation="ge"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.2" relation="ge"/>
</ccm:dependencies>
<ccm:contacts>
<ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
|
|
From: <mb...@vh...> - 2005-06-22 14:31:27
|
Author: mbooth Date: 2005-06-22 16:25:10 +0200 (Wed, 22 Jun 2005) New Revision: 603 Modified: releases/1.0.2/ccm-ldn-aplaws/bundles/camden/ releases/1.0.2/ccm-ldn-aplaws/bundles/complete/ releases/1.0.2/ccm-ldn-aplaws/bundles/demo/ releases/1.0.2/ccm-ldn-aplaws/bundles/devel/ releases/1.0.2/ccm-ldn-aplaws/bundles/standard/ tools/trunk/bundle/ Log: svn:ignore configure.in.tmp in some more places Property changes on: releases/1.0.2/ccm-ldn-aplaws/bundles/camden ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: releases/1.0.2/ccm-ldn-aplaws/bundles/complete ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: releases/1.0.2/ccm-ldn-aplaws/bundles/demo ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: releases/1.0.2/ccm-ldn-aplaws/bundles/devel ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: releases/1.0.2/ccm-ldn-aplaws/bundles/standard ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: tools/trunk/bundle ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status ccm-tools-bundle.spec ccm-tools-bundle-*.zip autom4te.cache ccm-tools-bundle-*.tar.gz INSTALL COPYING missing aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status ccm-tools-bundle.spec ccm-tools-bundle-*.zip autom4te.cache ccm-tools-bundle-*.tar.gz INSTALL COPYING missing aclocal.m4 Makefile install-sh |
|
From: <mb...@vh...> - 2005-06-22 11:44:27
|
Author: mbooth Date: 2005-06-22 13:38:08 +0200 (Wed, 22 Jun 2005) New Revision: 602 Modified: ccm-ldn-aplaws/trunk/bundles/camden/ ccm-ldn-aplaws/trunk/bundles/complete/ ccm-ldn-aplaws/trunk/bundles/demo/ ccm-ldn-aplaws/trunk/bundles/devel/ ccm-ldn-aplaws/trunk/bundles/standard/ Log: Ignore configure.in.tmp Property changes on: ccm-ldn-aplaws/trunk/bundles/camden ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: ccm-ldn-aplaws/trunk/bundles/complete ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: ccm-ldn-aplaws/trunk/bundles/demo ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: ccm-ldn-aplaws/trunk/bundles/devel ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh Property changes on: ccm-ldn-aplaws/trunk/bundles/standard ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh |
|
From: <ssk...@ap...> - 2005-06-16 13:31:59
|
Author: sskracic
Date: 2005-06-16 15:25:55 +0200 (Thu, 16 Jun 2005)
New Revision: 581
Modified:
releases/1.0.2/ccm-cms/application.xml
releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java
Log:
Integrated r559 from trunk (don't set 'Content-Disposition' HTTP
header for inline assets).
Modified: releases/1.0.2/ccm-cms/application.xml
===================================================================
--- releases/1.0.2/ccm-cms/application.xml 2005-06-16 12:51:16 UTC (rev 580)
+++ releases/1.0.2/ccm-cms/application.xml 2005-06-16 13:25:55 UTC (rev 581)
@@ -3,7 +3,7 @@
name="ccm-cms"
prettyName="Red Hat CCM Content Management System"
version="6.1.1"
- release="5"
+ release="6"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
Modified: releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
===================================================================
--- releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java 2005-06-16 12:51:16 UTC (rev 580)
+++ releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java 2005-06-16 13:25:55 UTC (rev 581)
@@ -69,7 +69,7 @@
* client. See section 19.5.1 of RFC2616 for interpretation of
* Content-Disposition in HTTP.
*/
- private void setFilenameHeader(HttpServletResponse response,
+ protected void setFilenameHeader(HttpServletResponse response,
BinaryAsset asset) {
String filename = asset.getName();
if (filename == null) { filename = s_defaultName; }
Modified: releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java
===================================================================
--- releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java 2005-06-16 12:51:16 UTC (rev 580)
+++ releases/1.0.2/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java 2005-06-16 13:25:55 UTC (rev 581)
@@ -18,9 +18,13 @@
*/
package com.arsdigita.cms.dispatcher;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.log4j.Logger;
+import com.arsdigita.cms.BinaryAsset;
+
/**
* A resource handler which streams out a blob from the database.
*
@@ -38,4 +42,9 @@
public StreamAsset() {
super(false);
}
+
+ // do not set Content-Disposition for asset streaming
+ protected void setFilenameHeader(HttpServletResponse response,
+ BinaryAsset asset) {
+ }
}
|
|
From: <fa...@ap...> - 2005-06-16 12:57:19
|
Author: fabrice
Date: 2005-06-16 14:51:16 +0200 (Thu, 16 Jun 2005)
New Revision: 580
Modified:
ccm-ldn-search/trunk/src/com/arsdigita/london/search/Initializer.java
ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchConfig.java
ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpideredContent.java
ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java
ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java
Log:
Option to restrict the simple search
Modified: ccm-ldn-search/trunk/src/com/arsdigita/london/search/Initializer.java
===================================================================
--- ccm-ldn-search/trunk/src/com/arsdigita/london/search/Initializer.java 2005-06-16 11:55:02 UTC (rev 579)
+++ ccm-ldn-search/trunk/src/com/arsdigita/london/search/Initializer.java 2005-06-16 12:51:16 UTC (rev 580)
@@ -15,64 +15,81 @@
* 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.search;
-
-import com.arsdigita.db.DbHelper;
-import com.arsdigita.persistence.pdl.ManifestSource;
-import com.arsdigita.runtime.PDLInitializer;
-import com.arsdigita.runtime.CompoundInitializer;
-import com.arsdigita.persistence.pdl.NameFilter;
-import com.arsdigita.runtime.RuntimeConfig;
-import com.arsdigita.runtime.DomainInitEvent;
-import com.arsdigita.search.FilterType;
-import com.arsdigita.search.QueryEngineRegistry;
-import com.arsdigita.london.search.RemoteQueryEngine;
-import com.arsdigita.london.search.HostFilterType;
-
-/**
- * The Search initializer.
- *
- * @author Justin Ross <jr...@re...>
- * @version $Id$
- */
-public class Initializer extends CompoundInitializer {
- public final static String versionId =
- "$Id$" +
- "$Author$" +
- "$DateTime: 2004/03/17 08:01:22 $";
-
- public Initializer() {
- final String url = RuntimeConfig.getConfig().getJDBCURL();
- final int database = DbHelper.getDatabaseFromURL(url);
-
- add(new PDLInitializer
- (new ManifestSource
- ("ccm-ldn-search.pdl.mf",
- new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
- }
-
-
- /**
- * Initializes domain-coupling machinery, usually consisting of
- * registering object instantiators and observers.
- *
- * This starts up the search threads according to the values in the
- * properties file
- */
- public void init(DomainInitEvent e) {
- super.init(e);
-
- SearchGroup.setSearchTimeout
- (Search.getConfig().getSearchTimeout().intValue());
-
- registerRemoteSearch();
- }
-
- private void registerRemoteSearch() {
- QueryEngineRegistry.registerEngine
- ("remote", new FilterType[] {
- new HostFilterType()
- }, new RemoteQueryEngine());
- }
-}
+
+package com.arsdigita.london.search;
+
+import com.arsdigita.cms.search.ContentTypeFilterType;
+import com.arsdigita.cms.search.VersionFilterType;
+import com.arsdigita.cms.search.LuceneQueryEngine;
+import com.arsdigita.db.DbHelper;
+import com.arsdigita.persistence.pdl.ManifestSource;
+import com.arsdigita.runtime.PDLInitializer;
+import com.arsdigita.runtime.CompoundInitializer;
+import com.arsdigita.persistence.pdl.NameFilter;
+import com.arsdigita.runtime.RuntimeConfig;
+import com.arsdigita.runtime.DomainInitEvent;
+import com.arsdigita.search.IndexerType;
+import com.arsdigita.search.FilterType;
+import com.arsdigita.search.QueryEngineRegistry;
+import com.arsdigita.search.filters.CategoryFilterType;
+import com.arsdigita.search.filters.ObjectTypeFilterType;
+import com.arsdigita.london.search.RemoteQueryEngine;
+import com.arsdigita.london.search.HostFilterType;
+
+/**
+ * The Search initializer.
+ *
+ * @author Justin Ross <jr...@re...>
+ * @version $Id$
+ */
+public class Initializer extends CompoundInitializer {
+ public final static String versionId =
+ "$Id$" +
+ "$Author$" +
+ "$DateTime: $";
+
+ public Initializer() {
+ final String url = RuntimeConfig.getConfig().getJDBCURL();
+ final int database = DbHelper.getDatabaseFromURL(url);
+
+ add(new PDLInitializer
+ (new ManifestSource
+ ("ccm-ldn-search.pdl.mf",
+ new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
+ }
+
+
+ /**
+ * Initializes domain-coupling machinery, usually consisting of
+ * registering object instantiators and observers.
+ *
+ * This starts up the search threads according to the values in the
+ * properties file
+ */
+ public void init(DomainInitEvent e) {
+ super.init(e);
+
+ SearchGroup.setSearchTimeout
+ (Search.getConfig().getSearchTimeout().intValue());
+
+ registerLimitedSimpleSearch();
+ registerRemoteSearch();
+ }
+
+ private void registerRemoteSearch() {
+ QueryEngineRegistry.registerEngine
+ ("remote", new FilterType[] {
+ new HostFilterType()
+ }, new RemoteQueryEngine());
+ }
+
+ private void registerLimitedSimpleSearch() {
+ QueryEngineRegistry.registerEngine
+ (IndexerType.LUCENE,
+ new FilterType[] {
+ new VersionFilterType(),
+ new ObjectTypeFilterType()
+ },
+ new LuceneQueryEngine());
+ }
+}
Modified: ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchConfig.java
===================================================================
--- ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchConfig.java 2005-06-16 11:55:02 UTC (rev 579)
+++ ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchConfig.java 2005-06-16 12:51:16 UTC (rev 580)
@@ -22,6 +22,10 @@
import com.arsdigita.util.parameter.BooleanParameter;
import com.arsdigita.util.parameter.Parameter;
import com.arsdigita.util.parameter.IntegerParameter;
+import com.arsdigita.util.parameter.StringParameter;
+
+import java.util.StringTokenizer;
+
import org.apache.log4j.Logger;
@@ -32,7 +36,7 @@
public static final String versionId =
"$Id$" +
"$Author$" +
- "$DateTime: 2004/02/26 15:43:31 $";
+ "$DateTime: $";
private static final Logger s_log = Logger.getLogger(SearchConfig.class);
@@ -40,6 +44,9 @@
private final Parameter m_searchTimeout;
private final Parameter m_showSponsoredLinks;
+ private final Parameter m_simpleRestrictTo;
+ private String[] simpleRestrictToArray;
+
public SearchConfig() {
m_numThreads = new IntegerParameter
("com.arsdigita.london.search.num_threads",
@@ -50,10 +57,14 @@
m_showSponsoredLinks = new BooleanParameter
("com.arsdigita.london.search.show_sponsored_links",
Parameter.REQUIRED, Boolean.FALSE);
+ m_simpleRestrictTo = new StringParameter
+ ("com.arsdigita.london.search.simple_restrict_to",
+ Parameter.OPTIONAL, "");
register(m_numThreads);
register(m_searchTimeout);
register(m_showSponsoredLinks);
+ register(m_simpleRestrictTo);
loadInfo();
}
@@ -70,4 +81,28 @@
public final Boolean getShowSponsoredLinks() {
return (Boolean) get(m_showSponsoredLinks);
}
+
+ public final String getSimpleRestrictTo() {
+ return (String) get(m_simpleRestrictTo);
+ }
+
+ public final String[] getSimpleRestrictToArray() {
+ if (simpleRestrictToArray == null) {
+ loadSimpleRestrictToArray();
+ }
+ return simpleRestrictToArray;
+ }
+
+ protected void loadSimpleRestrictToArray() {
+ s_log.info("Restricting to "+getSimpleRestrictTo());
+ StringTokenizer st = new StringTokenizer(getSimpleRestrictTo(), ",");
+ simpleRestrictToArray = new String[st.countTokens()];
+ s_log.info("Parsing "+st.countTokens()+" content types.");
+ int index = 0;
+ while (st.hasMoreTokens()) {
+ simpleRestrictToArray[index] = st.nextToken().trim();
+ s_log.info("Restricting to : "+simpleRestrictToArray[index]);
+ index++;
+ }
+ }
}
Modified: ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpideredContent.java
===================================================================
--- ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpideredContent.java 2005-06-16 11:55:02 UTC (rev 579)
+++ ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpideredContent.java 2005-06-16 12:51:16 UTC (rev 580)
@@ -36,8 +36,8 @@
public static final String MIME_TYPE = "mimeType";
public static final String CONTENT_SIZE = "content_size";
public static final String STATUS = "status";
+ public static final String CONTENT_SECTION = "content_section";
-
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.london.search.spider.SpideredContent";
Modified: ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java
===================================================================
--- ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java 2005-06-16 11:55:02 UTC (rev 579)
+++ ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java 2005-06-16 12:51:16 UTC (rev 580)
@@ -18,6 +18,13 @@
package com.arsdigita.london.search.ui;
+import com.arsdigita.bebop.parameters.StringParameter;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.Form;
+import com.arsdigita.bebop.FormModel;
+import com.arsdigita.bebop.FormData;
+import com.arsdigita.bebop.parameters.ParameterData;
+
import com.arsdigita.search.ui.BaseQueryComponent;
import com.arsdigita.search.ui.filters.PermissionFilterComponent;
import com.arsdigita.search.ui.filters.SimpleCategoryFilterWidget;
@@ -29,9 +36,27 @@
import com.arsdigita.cms.ui.search.ContentTypeFilterWidget;
import com.arsdigita.cms.SecurityManager;
+import com.arsdigita.search.FilterSpecification;
+import com.arsdigita.search.filters.ContentSectionFilterSpecification;
+import org.apache.log4j.Logger;
+import org.apache.lucene.search.Filter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
public class AdvancedQueryComponent extends BaseQueryComponent {
+ private static final Logger s_log = Logger.getLogger(SimpleQueryComponent.class);
+ private StringParameter m_hiddenAllowedContentSectionsList = new StringParameter("restrictToContentSections");
+ private String m_paramValue;
+ private String[] contentSectionTitles;
+ private boolean is_restricted;
+ private Form m_form;
+
public AdvancedQueryComponent(String context) {
// XXX READ instead of CMS_READ_ITEM
@@ -51,4 +76,77 @@
add(new VersionFilterComponent(context));
}
}
+
+ public void register(Form form, FormModel model) {
+ s_log.debug("Adding " + m_hiddenAllowedContentSectionsList.getName() + " to form model");
+ m_hiddenAllowedContentSectionsList.setPassIn(true);
+ model.addFormParam(m_hiddenAllowedContentSectionsList);
+ super.register(form, model);
+ m_form = form;
+ }
+
+
+ /**
+ * Gets the hidden restrictToContentSections param.
+ * The param is in the form of a comma seperated list of content section names.
+ * If present the search will only return content items from these content sections.
+ **/
+ protected String getContentSections(PageState state) {
+ FormData formData = m_form.getFormData(state);
+ if (formData != null) {
+ ParameterData contentSectionListParam = formData.getParameter(m_hiddenAllowedContentSectionsList.getName());
+ String paramValue = (String)contentSectionListParam.getValue();
+ m_paramValue = paramValue;
+ s_log.debug("content sections list is " + paramValue);
+ is_restricted = (m_paramValue != null && !"".equals(m_paramValue));
+ return (String)contentSectionListParam.getValue();
+ }
+ return null;
+ }
+
+
+ /**
+ * Gets an array of content section titles for creation of an inclusion filter.
+ **/
+ public String[] getContentSectionsArray(PageState state) {
+ String contentSections = getContentSections(state);
+ if (contentSections == null) { return null; }
+ StringTokenizer st = new StringTokenizer(getContentSections(state), ",");
+ contentSectionTitles = new String[st.countTokens()];
+ int index = 0;
+ while (st.hasMoreTokens()) {
+ contentSectionTitles[index] = st.nextToken().trim();
+ s_log.info("Restricting to content section : "+contentSectionTitles[index]);
+ index++;
+ }
+ return contentSectionTitles;
+ }
+
+
+ /**
+ * Adds the content section filter to any existing filters.
+ **/
+ protected FilterSpecification[] getFilters(PageState state) {
+ FilterSpecification[] existingfilters = super.getFilters(state);
+ List n = new ArrayList();
+ try {
+ List filters = Arrays.asList(existingfilters); // this will throw a NullPointerException if there are no existing filters
+ n.addAll(filters);
+ } catch (NullPointerException e) {
+ // do we need to catch it if we're doing nothing with it?
+ }
+ String[] contentSections = getContentSectionsArray(state);
+ if (contentSections == null) { return existingfilters; }
+ ContentSectionFilterSpecification csfs = new ContentSectionFilterSpecification(contentSections);
+ n.add(csfs);
+ FilterSpecification[] newFilters = new FilterSpecification[n.size()];
+ Iterator i = n.iterator();
+ int c = 0;
+ while (i.hasNext()) {
+ newFilters[c] = (FilterSpecification)i.next();
+ c++;
+ }
+
+ return newFilters;
+ }
}
Modified: ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java
===================================================================
--- ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java 2005-06-16 11:55:02 UTC (rev 579)
+++ ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java 2005-06-16 12:51:16 UTC (rev 580)
@@ -64,6 +64,14 @@
Search.getConfig().isLuceneEnabled()) {
add(new VersionFilterComponent(context));
}
+
+ SearchConfig config = com.arsdigita.london.search.Search.getConfig();
+ s_log.debug("Array length : "+config.getSimpleRestrictToArray().length);
+ if (config.getSimpleRestrictToArray().length > 0) {
+ // Add unionised filter to specified item types
+ s_log.info("Restricting to specified types");
+ add(new ObjectTypeFilterComponent(config.getSimpleRestrictToArray()));
+ }
}
|
|
From: <fa...@ap...> - 2005-06-16 12:00:59
|
Author: fabrice
Date: 2005-06-16 13:55:02 +0200 (Thu, 16 Jun 2005)
New Revision: 579
Modified:
ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/oracle-se-1.0.0-2.0.0.sql
ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/postgres-1.0.0-2.0.0.sql
Log:
proper upgrade script
Modified: ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/oracle-se-1.0.0-2.0.0.sql
===================================================================
--- ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/oracle-se-1.0.0-2.0.0.sql 2005-06-16 11:30:20 UTC (rev 578)
+++ ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/oracle-se-1.0.0-2.0.0.sql 2005-06-16 11:55:02 UTC (rev 579)
@@ -1,22 +1,34 @@
-delete from cms_article_image_map;
-drop table cms_attachable_images;
-
update acs_objects set
object_type = 'com.arsdigita.cms.ReusableImageAsset',
default_domain_class = 'com.arsdigita.cms.ReusableImageAsset'
where object_type = 'com.arsdigita.cms.contenttypes.AttachableImage';
-delete from object_container_map
-where object_id in (
- select object_id from acs_objects
- where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
+drop table cms_attachable_images;
-delete from object_context
-where object_id in (
- select object_id from acs_objects
- where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
+
+
+@@ ../ddl/postgres/table-cms_item_image_attachment-auto.sql
+alter table cms_item_image_attachment add
+ constraint cms_ite_ima_att_att_id_f_ahq60 foreign key (attachment_id)
+ references acs_objects(object_id);
+alter table cms_item_image_attachment add
+ constraint cms_ite_ima_att_ima_id_f_kz3mi foreign key (image_id)
+ references cms_images(image_id);
+alter table cms_item_image_attachment add
+ constraint cms_ite_ima_att_ite_id_f_wg1gi foreign key (item_id)
+ references cms_items(item_id);
+
+
+insert into cms_item_image_attachment
+(use_context, caption, image_id, item_id, attachment_id)
+select '', map.caption, map.image_id, map.article_id, map.map_id
+from cms_article_image_map map;
+
+delete from cms_article_image_map;
+
+
delete from cms_items
where item_id in (
select object_id from acs_objects
@@ -27,21 +39,15 @@
select object_id from acs_objects
where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
-delete from acs_objects
-where object_id in (
- select object_id from acs_objects
- where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
-
-delete from inits
+update inits
+set class_name = 'com.arsdigita.cms.ItemImageAttachmentInitializer'
where class_name = 'com.arsdigita.cms.AttachableImageInitializer';
-@@ ../ddl/postgres/table-cms_item_image_attachment-auto.sql
-alter table cms_item_image_attachment add
- constraint cms_ite_ima_att_att_id_f_ahq60 foreign key (attachment_id)
- references acs_objects(object_id);
-alter table cms_item_image_attachment add
- constraint cms_ite_ima_att_ima_id_f_kz3mi foreign key (image_id)
- references cms_images(image_id);
-alter table cms_item_image_attachment add
- constraint cms_ite_ima_att_ite_id_f_wg1gi foreign key (item_id)
- references cms_items(item_id);
+update acs_objects set
+object_type = 'com.arsdigita.cms.contenttypes.ItemImageAttachment',
+default_domain_class = 'com.arsdigita.cms.contenttypes.ItemImageAttachment'
+where object_type = 'com.arsdigita.cms.ArticleImageAssociation';
+
+update authoring_steps
+set label_key = 'com.arsdigita.cms.image_step_label', label_bundle = 'com.arsdigita.cms.ImageStepResources', description_key = 'com.arsdigita.cms.image_step_description', description_bundle = 'com.arsdigita.cms.ImageStepResources', component = 'com.arsdigita.cms.contenttypes.ui.ImageStep'
+where component = 'com.arsdigita.cms.ui.authoring.ArticleImage';
Modified: ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/postgres-1.0.0-2.0.0.sql
===================================================================
--- ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/postgres-1.0.0-2.0.0.sql 2005-06-16 11:30:20 UTC (rev 578)
+++ ccm-ldn-image-step/trunk/sql/ccm-ldn-image-step/upgrade/postgres-1.0.0-2.0.0.sql 2005-06-16 11:55:02 UTC (rev 579)
@@ -1,24 +1,34 @@
-begin;
-delete from cms_article_image_map;
-
-drop table cms_attachable_images;
-
update acs_objects set
object_type = 'com.arsdigita.cms.ReusableImageAsset',
default_domain_class = 'com.arsdigita.cms.ReusableImageAsset'
where object_type = 'com.arsdigita.cms.contenttypes.AttachableImage';
-delete from object_container_map
-where object_id in (
- select object_id from acs_objects
- where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
+drop table cms_attachable_images;
-delete from object_context
-where object_id in (
- select object_id from acs_objects
- where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
+
+
+@@ ../ddl/postgres/table-cms_item_image_attachment-auto.sql
+alter table cms_item_image_attachment add
+ constraint cms_ite_ima_att_att_id_f_ahq60 foreign key (attachment_id)
+ references acs_objects(object_id);
+alter table cms_item_image_attachment add
+ constraint cms_ite_ima_att_ima_id_f_kz3mi foreign key (image_id)
+ references cms_images(image_id);
+alter table cms_item_image_attachment add
+ constraint cms_ite_ima_att_ite_id_f_wg1gi foreign key (item_id)
+ references cms_items(item_id);
+
+
+insert into cms_item_image_attachment
+(use_context, caption, image_id, item_id, attachment_id)
+select '', map.caption, map.image_id, map.article_id, map.map_id
+from cms_article_image_map map;
+
+delete from cms_article_image_map;
+
+
delete from cms_items
where item_id in (
select object_id from acs_objects
@@ -29,23 +39,15 @@
select object_id from acs_objects
where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
-delete from acs_objects
-where object_id in (
- select object_id from acs_objects
- where object_type = 'com.arsdigita.cms.ArticleImageAssociation' );
-
-delete from inits
+update inits
+set class_name = 'com.arsdigita.cms.ItemImageAttachmentInitializer'
where class_name = 'com.arsdigita.cms.AttachableImageInitializer';
-\i ../ddl/postgres/table-cms_item_image_attachment-auto.sql
-alter table cms_item_image_attachment add
- constraint cms_ite_ima_att_att_id_f_ahq60 foreign key (attachment_id)
- references acs_objects(object_id);
-alter table cms_item_image_attachment add
- constraint cms_ite_ima_att_ima_id_f_kz3mi foreign key (image_id)
- references cms_images(image_id);
-alter table cms_item_image_attachment add
- constraint cms_ite_ima_att_ite_id_f_wg1gi foreign key (item_id)
- references cms_items(item_id);
+update acs_objects set
+object_type = 'com.arsdigita.cms.contenttypes.ItemImageAttachment',
+default_domain_class = 'com.arsdigita.cms.contenttypes.ItemImageAttachment'
+where object_type = 'com.arsdigita.cms.ArticleImageAssociation';
-commit;
+update authoring_steps
+set label_key = 'com.arsdigita.cms.image_step_label', label_bundle = 'com.arsdigita.cms.ImageStepResources', description_key = 'com.arsdigita.cms.image_step_description', description_bundle = 'com.arsdigita.cms.ImageStepResources', component = 'com.arsdigita.cms.contenttypes.ui.ImageStep'
+where component = 'com.arsdigita.cms.ui.authoring.ArticleImage';
|
|
From: <ssk...@re...> - 2005-06-01 17:02:06
|
Author: sskracic
Date: 2005-06-01 18:56:40 +0200 (Wed, 01 Jun 2005)
New Revision: 533
Modified:
ccm-forum/trunk/application.xml
ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java
Log:
Hide replies if we're in noticeboard mode.
Modified: ccm-forum/trunk/application.xml
===================================================================
--- ccm-forum/trunk/application.xml 2005-06-01 16:38:00 UTC (rev 532)
+++ ccm-forum/trunk/application.xml 2005-06-01 16:56:40 UTC (rev 533)
@@ -3,7 +3,7 @@
name="ccm-forum"
prettyName="Forum"
version="1.4.3"
- release="1">
+ release="2">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>
</ccm:dependencies>
Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java
===================================================================
--- ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java 2005-06-01 16:38:00 UTC (rev 532)
+++ ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java 2005-06-01 16:56:40 UTC (rev 533)
@@ -170,12 +170,22 @@
}
private DomainCollection getMessages(PageState state) {
- BigDecimal rootID = ForumContext.getContext(state).getMessageThread().
+
+ ForumContext context = ForumContext.getContext(state);
+ Party party = Kernel.getContext().getParty();
+ Forum forum = context.getForum();
+
+ BigDecimal rootID = context.getMessageThread().
getRootMessage().getID();
DataCollection messages = SessionManager.getSession().retrieve
(Post.BASE_DATA_OBJECT_TYPE);
+ // Hide replies if we're in noticeboard mode
+ if (forum.isNoticeboard()) {
+ messages.addEqualsFilter("id", rootID);
+ return new DomainCollection(messages);
+ }
FilterFactory ff = messages.getFilterFactory();
messages.addFilter(
@@ -188,11 +198,6 @@
messages.addOrderWithNull("sortKey", "---", true);
// Add a filter to only show approved messages
- ForumContext context = ForumContext.getContext(state);
- Party party = Kernel.getContext().getParty();
- Forum forum = context.getForum();
-
-
if (forum.isModerated() && !forum.canModerate(party)) {
messages.addFilter(ff.or()
.addFilter(ff.equals("status", Post.APPROVED))
|
Author: sskracic Date: 2005-06-01 18:38:00 +0200 (Wed, 01 Jun 2005) New Revision: 532 Added: ccm-forum/trunk/sql/ccm-forum/oracle-se/ ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/ ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/ ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql ccm-forum/trunk/sql/ccm-forum/postgres/ ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/ ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/ ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql ccm-forum/trunk/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql ccm-forum/trunk/src/ccm-forum.upgrade ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/NoticeboardFormSection.java Modified: ccm-forum/trunk/application.xml ccm-forum/trunk/pdl/com/arsdigita/forum/Forum.pdl ccm-forum/trunk/src/com/arsdigita/forum/Forum.java ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumComponent.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumResources.properties ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationFormSection.java ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationView.java Log: Adding optional noticeboard functionality to forums. If noticeboard property is set, replying is disabled. Modified: ccm-forum/trunk/application.xml =================================================================== --- ccm-forum/trunk/application.xml 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/application.xml 2005-06-01 16:38:00 UTC (rev 532) @@ -2,10 +2,10 @@ <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" name="ccm-forum" prettyName="Forum" - version="1.4.2" + version="1.4.3" release="1"> <ccm:dependencies> - <ccm:requires name="ccm-core" version="6.1.2"/> + <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/> </ccm:dependencies> <ccm:contacts> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> Modified: ccm-forum/trunk/pdl/com/arsdigita/forum/Forum.pdl =================================================================== --- ccm-forum/trunk/pdl/com/arsdigita/forum/Forum.pdl 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/pdl/com/arsdigita/forum/Forum.pdl 2005-06-01 16:38:00 UTC (rev 532) @@ -30,6 +30,7 @@ join forum_forums.forum_id to messages.object_id; Boolean [1..1] isModerated = forum_forums.is_moderated; + Boolean [1..1] isNoticeboard = forum_forums.is_noticeboard; component Group [0..1] moderationGroup = join forum_forums.mod_group_id to groups.group_id; Added: ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql =================================================================== --- ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql 2005-06-01 16:38:00 UTC (rev 532) @@ -0,0 +1,5 @@ +alter table forum_forums add is_noticeboard char(1); +update forum_forums set is_noticeboard = '0'; +alter table forum_forums modify is_noticeboard not null; +alter table forum_forums add constraint foru_for_is_noticeboar_c_1deu6 + check(is_noticeboard in ('0', '1')); Property changes on: ccm-forum/trunk/sql/ccm-forum/oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql =================================================================== --- ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql 2005-06-01 16:38:00 UTC (rev 532) @@ -0,0 +1,3 @@ +alter table forum_forums add is_noticeboard boolean; +update forum_forums set is_noticeboard = false; +alter table forum_forums alter is_noticeboard set not null; Property changes on: ccm-forum/trunk/sql/ccm-forum/postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql =================================================================== --- ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql 2005-06-01 16:38:00 UTC (rev 532) @@ -0,0 +1 @@ +@@ ../oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql Property changes on: ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-forum/trunk/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql =================================================================== --- ccm-forum/trunk/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql 2005-06-01 16:38:00 UTC (rev 532) @@ -0,0 +1 @@ +\i ../postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql Property changes on: ccm-forum/trunk/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-forum/trunk/src/ccm-forum.upgrade =================================================================== --- ccm-forum/trunk/src/ccm-forum.upgrade 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/ccm-forum.upgrade 2005-06-01 16:38:00 UTC (rev 532) @@ -0,0 +1,5 @@ +<upgrade> + <version from="1.4.2" to="1.4.3"> + <script sql="ccm-forum/upgrade/::database::-1.4.2-1.4.3.sql"/> + </version> +</upgrade> Modified: ccm-forum/trunk/src/com/arsdigita/forum/Forum.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/Forum.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/Forum.java 2005-06-01 16:38:00 UTC (rev 532) @@ -86,6 +86,7 @@ private static final String POSTS = "posts"; private static final String SUBSCRIPTIONS = "subscriptions"; private static final String MODERATION = "isModerated"; + private static final String NOTICEBOARD = "isNoticeboard"; private static final String MODERATION_GROUP = "moderationGroup"; private static final String CATEGORY = "category"; @@ -183,6 +184,7 @@ if (isNew()) { setModerated(false); + setNoticeboard(false); createRootCategory(); createModerationGroup(); } @@ -514,6 +516,18 @@ return isModerated.booleanValue(); } + /** + * Enables/disables the noticeboard functionality. + * If enabled, no replies will be allowed. + */ + public void setNoticeboard(boolean noticeboard) { + set(NOTICEBOARD, new Boolean(noticeboard)); + } + + public boolean isNoticeboard() { + return Boolean.TRUE.equals(get(NOTICEBOARD)); + } + /** Returns the moderator group. Null if it doesn't exist */ public Group getModerationGroup() { DataObject dObj = (DataObject) get( MODERATION_GROUP ); Modified: ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java 2005-06-01 16:38:00 UTC (rev 532) @@ -92,6 +92,9 @@ // XXX new post param Forum forum = (Forum)m_portlet.getParentApplication(); + + content.addAttribute("noticeboard", (new Boolean(forum.isNoticeboard())).toString()); + Party party = Kernel.getContext().getParty(); ThreadCollection threads = forum.getThreads( Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumComponent.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumComponent.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumComponent.java 2005-06-01 16:38:00 UTC (rev 532) @@ -137,6 +137,7 @@ generateModeXML(state, content, MODE_ALERTS); Forum forum = ForumContext.getContext(state).getForum(); content.addAttribute("title", forum.getTitle()); + content.addAttribute("noticeboard", (new Boolean(forum.isNoticeboard())).toString()); Party party = Kernel.getContext().getParty(); if (party != null) { Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumResources.properties =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumResources.properties 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumResources.properties 2005-06-01 16:38:00 UTC (rev 532) @@ -19,3 +19,9 @@ forum.ui.moderate.status.on=Active forum.ui.moderate.status.off=Inactive forum.ui.moderate.warning=NB. Turning moderation off will change pending posts to approved status + +forum.ui.noticeboard.label=Noticeboard functionality (disable replying) +forum.ui.noticeboard.switch.on=Turn on (disable replying) +forum.ui.noticeboard.switch.off=Turn off (enable replying) +forum.ui.noticeboard.status.on=On (replying disabled) +forum.ui.noticeboard.status.off=Off (replying enabled) Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java 2005-06-01 16:38:00 UTC (rev 532) @@ -212,6 +212,7 @@ Forum forum = ForumContext.getContext(state).getForum(); content.addAttribute("forumTitle", forum.getTitle()); + content.addAttribute("noticeboard", (new Boolean(forum.isNoticeboard())).toString()); DomainCollection messages = getMessages(state); Integer page = (Integer)state.getValue(m_pageNumber); @@ -293,8 +294,10 @@ makeURL(state, ACTION_EDIT, post)); } - parent.addAttribute("replyURL", - makeURL(state, ACTION_REPLY, post)); + if (!ctx.getForum().isNoticeboard()) { + parent.addAttribute("replyURL", + makeURL(state, ACTION_REPLY, post)); + } } Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationFormSection.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationFormSection.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationFormSection.java 2005-06-01 16:38:00 UTC (rev 532) @@ -52,7 +52,7 @@ private Label m_warning; public ModerationFormSection() { - super(new ColumnPanel(3)); + super(new ColumnPanel(3, true)); addWidgets(); addProcessListener(new ModFormProcessListener()); addInitListener(new ModForumInitListener()); Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationView.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationView.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationView.java 2005-06-01 16:38:00 UTC (rev 532) @@ -19,6 +19,7 @@ package com.arsdigita.forum.ui.admin; +import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.SimpleContainer; @@ -34,10 +35,11 @@ private Form m_modForm; public ModerationView() { - m_modForm = new Form("moderationForm"); + m_modForm = new Form("moderationForm", new ColumnPanel(3)); m_modForm.setRedirecting(true); m_modSection = new ModerationFormSection(); - m_modForm.add(m_modSection); + m_modForm.add(m_modSection, ColumnPanel.INSERT); + m_modForm.add(new NoticeboardFormSection(), ColumnPanel.INSERT); add(m_modForm); m_moderatorPane = new ModeratorEditPane(); Added: ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/NoticeboardFormSection.java =================================================================== --- ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/NoticeboardFormSection.java 2005-06-01 15:48:30 UTC (rev 531) +++ ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/NoticeboardFormSection.java 2005-06-01 16:38:00 UTC (rev 532) @@ -0,0 +1,118 @@ +/* + * 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.arsdigita.forum.ui.admin; + +import com.arsdigita.bebop.FormSection; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; + +import com.arsdigita.util.Assert; + +import com.arsdigita.forum.Forum; +import com.arsdigita.forum.ForumContext; +import com.arsdigita.forum.ui.Text; + +import org.apache.log4j.Logger; + +/** + * Form for turning the noticeboard functionality on/off. + */ +public class NoticeboardFormSection extends FormSection { + + private static final Logger s_log = Logger + .getLogger(NoticeboardFormSection.class); + + private Label m_statusOn; + private Label m_statusOff; + private Submit m_switchOn; + private Submit m_switchOff; + private Label m_warning; + + public NoticeboardFormSection() { + super(new ColumnPanel(3, true)); + addWidgets(); + addProcessListener(new ModFormProcessListener()); + addInitListener(new ModFormInitListener()); + } + + public void addWidgets() { + add(new Label( + Text.gz("forum.ui.noticeboard.label"))); + + m_statusOn = new Label( + Text.gz("forum.ui.noticeboard.status.on")); + m_statusOff = new Label( + Text.gz("forum.ui.noticeboard.status.off")); + add(m_statusOn); + add(m_statusOff); + + m_switchOn = new Submit( + Text.gz("forum.ui.noticeboard.switch.on")); + m_switchOff = new Submit( + Text.gz("forum.ui.noticeboard.switch.off")); + add(m_switchOn); + add(m_switchOff); + } + + + private void calculateVisibility(PageState state) { + Forum forum = ForumContext.getContext(state).getForum(); + + boolean noticeboard = forum.isNoticeboard(); + + m_statusOn.setVisible(state, noticeboard); + m_statusOff.setVisible(state, !noticeboard); + + m_switchOn.setVisible(state, !noticeboard); + m_switchOff.setVisible(state, noticeboard); + } + + private class ModFormProcessListener implements FormProcessListener { + public void process(FormSectionEvent event) throws FormProcessException { + PageState state = event.getPageState(); + Forum forum = ForumContext.getContext(state).getForum(); + + if (m_switchOn.isSelected(state)) { + s_log.debug("Switch on pressed"); + forum.setNoticeboard(true); + } else if (m_switchOff.isSelected(state)) { + s_log.debug("Switch off pressed"); + forum.setNoticeboard(false); + } else { + s_log.debug("Something else pressed"); + } + + calculateVisibility(state); + } + } + + private class ModFormInitListener implements FormInitListener { + public void init(FormSectionEvent event) throws FormProcessException { + PageState state = event.getPageState(); + calculateVisibility(state); + } + } +} + Property changes on: ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/NoticeboardFormSection.java ___________________________________________________________________ Name: svn:keywords + Id Author URL |
|
From: <ssk...@re...> - 2005-06-01 15:53:49
|
Author: sskracic Date: 2005-06-01 17:48:30 +0200 (Wed, 01 Jun 2005) New Revision: 531 Added: ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se/ Removed: ccm-forum/trunk/sql/ccm-forum/upgrade/oracle/ Log: Rename directory to have proper database tag. Copied: ccm-forum/trunk/sql/ccm-forum/upgrade/oracle-se (from rev 528, ccm-forum/trunk/sql/ccm-forum/upgrade/oracle) |
|
From: <fa...@re...> - 2005-06-01 09:40:07
|
Author: fabrice
Date: 2005-06-01 11:34:12 +0200 (Wed, 01 Jun 2005)
New Revision: 530
Modified:
ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java
Log:
prefix URL property with http:// by default
Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java
===================================================================
--- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java 2005-05-31 14:46:28 UTC (rev 529)
+++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java 2005-06-01 09:34:12 UTC (rev 530)
@@ -52,7 +52,7 @@
* This form can be extended to create forms for Address subclasses.
*
* @author <a href="mailto:do...@re...">Dominik Kacprzak</a>
- * @version $Revision: #5 $ $Date: 2004/08/17 $
+ * @version $Revision: $ $Date: $
**/
public class AddressPropertyForm extends BasicPageForm
implements FormProcessListener, FormInitListener, FormSubmissionListener {
@@ -203,7 +203,16 @@
ParameterModel uriParam = new StringParameter( URI );
uriParam.addParameterListener( new StringInRangeValidationListener(0, 250) );
TextField uri = new TextField( uriParam );
- uri.addValidationListener(new URLValidationListener());
+ uri.addValidationListener(new URLValidationListener(){
+ public void validate(ParameterEvent e)throws FormProcessException{
+ ParameterData d = e.getParameterData();
+ String value = (String)d.getValue();
+ if(value.indexOf("http")<0)
+ value = "http://" + value;
+ d.setValue(value);
+ super.validate(e);
+ }
+ });
uri.setSize(30);
uri.setMaxLength( 250 );
uri.setHint(AddressGlobalizationUtil.globalize( "cms.contenttypes.ui.address.uri.hint").localize().toString());
@@ -216,7 +225,7 @@
TextArea notes = new TextArea( notesParam );
notes.setRows(8);
notes.setCols(30);
- add( notes );
+ add( notes );
}
/**
@@ -225,6 +234,16 @@
public void init(FormSectionEvent fse) {
FormData data = fse.getFormData();
Address address = ( Address ) super.initBasicWidgets(fse);
+
+ //remind the user to prefix the URI with "http://"
+ String uri = address.getURI();
+ if(uri != null){
+ // this will accept https
+ if(uri.toLowerCase().indexOf("http") < 0)
+ address.setURI("http://" + uri);
+ } else {
+ address.setURI("http://");
+ }
data.put( ADDRESS, address.getAddress() );
data.put( ISO_COUNTRY_CODE, address.getCountryIsoCode() );
|
|
From: <ssk...@re...> - 2005-05-31 14:51:45
|
Author: sskracic
Date: 2005-05-31 16:46:28 +0200 (Tue, 31 May 2005)
New Revision: 529
Modified:
ccm-core/trunk/application.xml
ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryInfo.java
ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryLog.java
ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryPlanComponent.java
Log:
Display bind vars in proper order, instead of random order
dictated by HashMap.
Modified: ccm-core/trunk/application.xml
===================================================================
--- ccm-core/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528)
+++ ccm-core/trunk/application.xml 2005-05-31 14:46:28 UTC (rev 529)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.2"
- release="2"
+ release="3"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Modified: ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryInfo.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryInfo.java 2005-05-30 09:30:36 UTC (rev 528)
+++ ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryInfo.java 2005-05-31 14:46:28 UTC (rev 529)
@@ -20,7 +20,8 @@
import com.arsdigita.util.StringUtils;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
/**
*
@@ -33,7 +34,7 @@
private int m_connection_id;
private String m_type;
private String m_query;
- private HashMap m_bindvars;
+ private TreeMap m_bindvars;
private long m_time;
private java.sql.SQLException m_sqle;
private Throwable m_stack_trace;
@@ -42,14 +43,14 @@
int connection_id,
String type,
String query,
- HashMap bindvars,
+ Map bindvars,
long time,
java.sql.SQLException sqle) {
m_id = id;
m_connection_id = connection_id;
m_type = type;
m_query = query;
- m_bindvars = bindvars;
+ m_bindvars = new TreeMap(bindvars);
m_time = time;
m_sqle = sqle;
m_stack_trace = new Throwable();
@@ -67,7 +68,7 @@
public String getQuery() {
return m_query;
}
- public HashMap getBindvars() {
+ public Map getBindvars() {
return m_bindvars;
}
public long getTime() {
Modified: ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryLog.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryLog.java 2005-05-30 09:30:36 UTC (rev 528)
+++ ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryLog.java 2005-05-31 14:46:28 UTC (rev 529)
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
+import java.util.Map;
import java.util.ArrayList;
import java.util.Iterator;
@@ -102,7 +103,7 @@
final Perl5Compiler compiler = new Perl5Compiler();
String query = info.getQuery();
- HashMap vars = info.getBindvars();
+ Map vars = info.getBindvars();
HashSubstitution subst = new HashSubstitution(vars);
@@ -129,9 +130,9 @@
private static Perl5Util s_util = new Perl5Util();
private static class HashSubstitution implements Substitution {
- private HashMap m_hash;
+ private Map m_hash;
private int index = 1;
- public HashSubstitution(HashMap hash) {
+ public HashSubstitution(Map hash) {
m_hash = hash;
}
Modified: ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryPlanComponent.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryPlanComponent.java 2005-05-30 09:30:36 UTC (rev 528)
+++ ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryPlanComponent.java 2005-05-31 14:46:28 UTC (rev 529)
@@ -48,7 +48,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.HashMap;
+import java.util.Map;
class QueryPlanComponent extends com.arsdigita.bebop.SimpleContainer {
@@ -273,7 +273,7 @@
return null;
}
- private HashMap getBindVars(PageState s) {
+ private Map getBindVars(PageState s) {
Integer request_id = (Integer) s.getValue(m_request_id);
Integer query_id = (Integer) s.getValue(m_query_id);
|
Author: sskracic Date: 2005-05-30 11:30:36 +0200 (Mon, 30 May 2005) New Revision: 528 Added: contrib/ccm-ldn-coventry-councillor/trunk/web/ contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/ contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/ contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/coventry/ contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/coventry/types/ contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/coventry/types/Councillor.xsl contrib/ccm-ldn-coventry-event/trunk/web/ contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/ contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/ contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/coventry/ contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/coventry/types/ contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/coventry/types/CoventryEvent.xsl contrib/ccm-ldn-coventry-faqitem/trunk/web/ contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/ contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/ contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/coventry/ contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/coventry/types/ contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/coventry/types/CoventryFAQ.xsl contrib/ccm-ldn-coventry-job/trunk/web/ contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/ contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/ contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/coventry/ contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/coventry/types/ contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/coventry/types/CoventryJob.xsl contrib/ccm-ldn-coventry-person/trunk/web/ contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/ contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/ contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/coventry/ contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/coventry/types/ contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/coventry/types/Person.xsl contrib/ccm-ldn-coventry-pressrelease/trunk/web/ contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/ contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/ contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/coventry/ contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/coventry/types/ contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/coventry/types/CoventryPressRelease.xsl Modified: contrib/ccm-ldn-coventry-councillor/trunk/application.xml contrib/ccm-ldn-coventry-councillor/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Councillor.xml contrib/ccm-ldn-coventry-event/trunk/application.xml contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Event.xml contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Event.xml contrib/ccm-ldn-coventry-faqitem/trunk/application.xml contrib/ccm-ldn-coventry-faqitem/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/FAQItem.xml contrib/ccm-ldn-coventry-job/trunk/application.xml contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Job.xml contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Job.xml contrib/ccm-ldn-coventry-person/trunk/application.xml contrib/ccm-ldn-coventry-person/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Person.xml contrib/ccm-ldn-coventry-pressrelease/trunk/application.xml contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml Log: Decoupling dependencies on some Coventry-specific bits, so that the ccm-ldn-coventry-* content types can be installed independently. Modified: contrib/ccm-ldn-coventry-councillor/trunk/application.xml =================================================================== --- contrib/ccm-ldn-coventry-councillor/trunk/application.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-councillor/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-coventry-councillor" prettyName="Red Hat CCM Content Types" version="1.0.1" - release="1" + release="2" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> @@ -17,6 +17,7 @@ <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> + <ccm:directory name="web"/> </ccm:directories> <ccm:contacts> Modified: contrib/ccm-ldn-coventry-councillor/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Councillor.xml =================================================================== --- contrib/ccm-ldn-coventry-councillor/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Councillor.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-councillor/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Councillor.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -12,7 +12,7 @@ component="com.arsdigita.coventry.cms.contenttypes.ui.CouncillorPropertiesStep" ordering="1"/> - <ctd:include href="/WEB-INF/content-types/coventry-shared.xml"/> + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> </ctd:authoring-kit> </ctd:content-type> Added: contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/coventry/types/Councillor.xsl =================================================================== --- contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/coventry/types/Councillor.xsl 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-councillor/trunk/web/__ccm__/themes/coventry/types/Councillor.xsl 2005-05-30 09:30:36 UTC (rev 528) @@ -0,0 +1,94 @@ +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + exclude-result-prefixes="cms" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.coventry.cms.contenttypes.Councillor']" + name="cms:CT_graphics_com_arsdigita_coventry_cms_contenttypes_Councillor"> + <h1><xsl:value-of select="title"/></h1> + + <table border="0" cellpadding="0" cellspacing="0" class="councillorList" + summary="Details for councillor {title}"> + <tr> + <xsl:if test="imageAttachments"> + <td rowspan="3" class="councillorIMG"> + <xsl:for-each select="imageAttachments"> + <img border="1" width="75" height="115"> + <xsl:attribute name="src"> + <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="image/id" /> + </xsl:attribute> + <!-- + <xsl:if test="image/width"> + <xsl:attribute name="width"><xsl:value-of select="image/width" /></xsl:attribute> + </xsl:if> + <xsl:if test="image/height"> + <xsl:attribute name="height"><xsl:value-of select="image/height" /></xsl:attribute> + </xsl:if> + --> + <xsl:attribute name="alt"><xsl:value-of select="caption" /></xsl:attribute> + </img> + </xsl:for-each> + </td> + </xsl:if> + + <th>Position</th> + <td> + <xsl:choose> + <xsl:when test="position"> + <xsl:value-of select="position"/> + </xsl:when> + <xsl:otherwise> + + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + + <tr> + <th>Political party</th> + <td> + <xsl:choose> + <xsl:when test="politicalParty"> + <xsl:value-of select="politicalParty"/> + </xsl:when> + <xsl:otherwise> + + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + + <tr> + <th>Term of office</th> + <td> + <xsl:choose> + <xsl:when test="termOfOffice"> + <xsl:value-of select="termOfOffice"/> + </xsl:when> + <xsl:otherwise> + + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </table> + <xsl:if test="textAsset/content"> + <p><xsl:value-of select="textAsset/content" disable-output-escaping="yes"/></p> + </xsl:if> + + <xsl:if test="contactDetails"> + <h2>Contact details</h2> + <p><xsl:value-of select="contactDetails" disable-output-escaping="yes"/></p> + </xsl:if> + + <xsl:if test="surgeryDetails"> + <h2>Surgery details</h2> + <p><xsl:value-of select="surgeryDetails" disable-output-escaping="yes"/></p> + </xsl:if> + + </xsl:template> +</xsl:stylesheet> Modified: contrib/ccm-ldn-coventry-event/trunk/application.xml =================================================================== --- contrib/ccm-ldn-coventry-event/trunk/application.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-event/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-coventry-event" prettyName="Red Hat CCM Content Types" version="1.0.1" - release="1" + release="2" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> @@ -16,6 +16,7 @@ <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> + <ccm:directory name="web"/> </ccm:directories> <ccm:contacts> Modified: contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Event.xml =================================================================== --- contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Event.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Event.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -12,7 +12,7 @@ component="com.arsdigita.coventry.cms.contenttypes.ui.EventPropertiesStep" ordering="1"/> - <ctd:include href="/WEB-INF/content-types/coventry-shared.xml"/> + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> </ctd:authoring-kit> </ctd:content-type> Modified: contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Event.xml =================================================================== --- contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Event.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-event/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Event.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -8,7 +8,7 @@ </xrd:associations> <xrd:formatter property="/object/startDate" - class="com.arsdigita.coventry.ui.DateFormatter"/> + class="com.arsdigita.xml.formatters.DateFormatter"/> <xrd:formatter property="/object/startTime" class="com.arsdigita.xml.formatters.TimeFormatter"/> </xrd:adapter> Added: contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/coventry/types/CoventryEvent.xsl =================================================================== --- contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/coventry/types/CoventryEvent.xsl 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-event/trunk/web/__ccm__/themes/coventry/types/CoventryEvent.xsl 2005-05-30 09:30:36 UTC (rev 528) @@ -0,0 +1,81 @@ +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + exclude-result-prefixes="cms" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.coventry.cms.contenttypes.Event']" + name="cms:CT_graphics_com_arsdigita_coventry_cms_contenttypes_Event"> + <h1><xsl:value-of select="title"/></h1> + + <table border="0" cellpadding="0" cellspacing="0" summary="Event date, venue and whether tickets are required" class="eventDetails"> + <tr> + <th>Date:</th> + <td><xsl:value-of select="startDate"/></td> + </tr> + <tr> + <th>Venue:</th> + <td><xsl:value-of select="location"/></td> + </tr> + <tr> + <th>Start time:</th> + <td><xsl:value-of select="startTime"/></td> + </tr> + </table> + + <h2>Description</h2> + <xsl:if test="imageAttachments"> + <table border="0" cellpadding="0" cellspacing="0" class="photo floatRight" summary="Feature table : Draws attention to photo or extra of text"> + <xsl:for-each select="imageAttachments"> + <xsl:if test="image/width"> + <xsl:attribute name="width"> + <xsl:value-of select="image/width"/> + </xsl:attribute> + </xsl:if> + <tr> + <th> + <xsl:value-of select="caption" disable-output-escaping="yes"/> + </th> + </tr> + <tr> + <td> + <img> + <xsl:attribute name="src"><xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="image/id" /></xsl:attribute> + <xsl:if test="image/width"> + <xsl:attribute name="width"><xsl:value-of select="image/width" /></xsl:attribute> + </xsl:if> + <xsl:if test="image/height"> + <xsl:attribute name="height"><xsl:value-of select="image/height" /></xsl:attribute> + </xsl:if> + <xsl:attribute name="alt"><xsl:value-of select="caption" /></xsl:attribute> + </img> + </td> + </tr> + </xsl:for-each> + </table> + </xsl:if> + + <xsl:if test="textAsset/content"> + <p><xsl:value-of select="textAsset/content" disable-output-escaping="yes"/></p> + </xsl:if> + + <h2>Contact Details</h2> + <p>For more information on <xsl:value-of select="title"/> please contact:</p> + <address> + <xsl:value-of select="contactName" disable-output-escaping="yes"/> + <br/> + <xsl:if test="contactPhone"> + <b>Tel: </b> <xsl:value-of select="contactPhone"/> + <br /> + </xsl:if> + + <xsl:if test="contactEmail"> + <b>E-mail: </b> + <a><xsl:attribute name="href">mailto:<xsl:value-of select="contactEmail"/></xsl:attribute><xsl:value-of select="contactEmail"/></a> + </xsl:if> + </address> + </xsl:template> +</xsl:stylesheet> Modified: contrib/ccm-ldn-coventry-faqitem/trunk/application.xml =================================================================== --- contrib/ccm-ldn-coventry-faqitem/trunk/application.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-faqitem/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-coventry-faqitem" prettyName="Red Hat CCM Content Types" version="1.0.1" - release="1" + release="2" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> @@ -16,6 +16,7 @@ <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> + <ccm:directory name="web"/> </ccm:directories> <ccm:contacts> Modified: contrib/ccm-ldn-coventry-faqitem/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/FAQItem.xml =================================================================== --- contrib/ccm-ldn-coventry-faqitem/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/FAQItem.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-faqitem/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/FAQItem.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -9,7 +9,7 @@ <ctd:authoring-step label="FAQ Item Properties" description="Edit the title, description, question and answer" component="com.arsdigita.coventry.cms.contenttypes.ui.FAQItemPropertiesStep"/> - <ctd:include href="/WEB-INF/content-types/coventry-shared.xml"/> + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> </ctd:authoring-kit> </ctd:content-type> Added: contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/coventry/types/CoventryFAQ.xsl =================================================================== --- contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/coventry/types/CoventryFAQ.xsl 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-faqitem/trunk/web/__ccm__/themes/coventry/types/CoventryFAQ.xsl 2005-05-30 09:30:36 UTC (rev 528) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + exclude-result-prefixes="cms" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.coventry.cms.contenttypes.FAQItem']" + name="cms:CT_graphics_com_arsdigita_coventry_cms_contenttypes_FAQItem"> + <h1><xsl:value-of select="title"/></h1> + + <table border="0" cellpadding="0" cellspacing="0" class= + "FAQItem" summary= + "Single display of a FAQItem"> + <tr> + <th>Question</th> + + <td><xsl:value-of select="question"/></td> + </tr> + + <tr> + <th>Answer</th> + + <td><xsl:value-of select="answer"/></td> + </tr> + </table> + </xsl:template> +</xsl:stylesheet> Modified: contrib/ccm-ldn-coventry-job/trunk/application.xml =================================================================== --- contrib/ccm-ldn-coventry-job/trunk/application.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-job/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-coventry-job" prettyName="Red Hat CCM Content Types" version="1.0.2" - release="1" + release="4" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> @@ -16,6 +16,7 @@ <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> + <ccm:directory name="web"/> </ccm:directories> <ccm:contacts> Modified: contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Job.xml =================================================================== --- contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Job.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Job.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -12,7 +12,7 @@ component="com.arsdigita.coventry.cms.contenttypes.ui.JobPropertiesStep" ordering="1"/> - <ctd:include href="/WEB-INF/content-types/coventry-shared.xml"/> + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> </ctd:authoring-kit> </ctd:content-type> Modified: contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Job.xml =================================================================== --- contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Job.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-job/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/Job.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -8,7 +8,7 @@ </xrd:associations> <xrd:formatter property="/object/closingDate" - class="com.arsdigita.coventry.ui.DateFormatter"/> + class="com.arsdigita.xml.formatters.DateFormatter"/> </xrd:adapter> </xrd:context> Added: contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/coventry/types/CoventryJob.xsl =================================================================== --- contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/coventry/types/CoventryJob.xsl 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-job/trunk/web/__ccm__/themes/coventry/types/CoventryJob.xsl 2005-05-30 09:30:36 UTC (rev 528) @@ -0,0 +1,74 @@ +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + exclude-result-prefixes="cms" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.coventry.cms.contenttypes.Job']" + name="cms:CT_graphics_com_arsdigita_coventry_cms_contenttypes_Job"> + <h1><xsl:value-of select="title"/></h1> + + <table border="0" cellpadding="0" cellspacing="0" class= + "jobDetails" summary="Layout table : Job details"> + <tr> + <th align="left">Department :</th> + + <td><xsl:value-of select="department"/></td> + </tr> + + <tr> + <th align="left">Salary :</th> + + <td><xsl:value-of select="salary"/></td> + </tr> + + <tr> + <th align="left">Closing date :</th> + + <td><xsl:value-of select="closingDate"/></td> + </tr> + + <tr> + <th align="left">Ref number :</th> + + <td><xsl:value-of select="refNumber"/></td> + </tr> + </table> + + <xsl:if test="offendersActExempt='true'"> + <p class="checkStatement">This post is exempted under the + Rehabilitation of Offenders Act 1974 and as such + appointments to these posts will be conditional upon the + receipt of a satisfactory response to a check of police + records via the Criminal Records Bureau.</p> + </xsl:if> + + <xsl:if test="textAsset/content"> + <h2>Job description</h2> + <p> <xsl:value-of disable-output-escaping="yes" select="textAsset/content"/></p> + </xsl:if> + + + <xsl:if test="fileAttachments"> + <h2>Additional material</h2> + <ul> + <xsl:for-each select="fileAttachments"> + <li><a href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={./id}" class="body"><xsl:value-of select="description"/></a></li> + </xsl:for-each> + </ul> + </xsl:if> + + <h2>Contact details</h2> + + <xsl:if test="contactDetails"> + <p>Application details available from and returnable + to:</p> + <address><xsl:value-of disable-output-escaping="yes" select="contactDetails"/></address> + </xsl:if> + <p class="backTop"><a href="/jobs">Back to current vacancies</a></p> + + </xsl:template> +</xsl:stylesheet> Modified: contrib/ccm-ldn-coventry-person/trunk/application.xml =================================================================== --- contrib/ccm-ldn-coventry-person/trunk/application.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-person/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-coventry-person" prettyName="Red Hat CCM Content Types" version="1.0.1" - release="1" + release="2" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> @@ -16,6 +16,7 @@ <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> + <ccm:directory name="web"/> </ccm:directories> <ccm:contacts> Modified: contrib/ccm-ldn-coventry-person/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Person.xml =================================================================== --- contrib/ccm-ldn-coventry-person/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Person.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-person/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/Person.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -12,7 +12,7 @@ component="com.arsdigita.coventry.cms.contenttypes.ui.PersonPropertiesStep" ordering="1"/> - <ctd:include href="/WEB-INF/content-types/coventry-shared.xml"/> + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> </ctd:authoring-kit> </ctd:content-type> Added: contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/coventry/types/Person.xsl =================================================================== --- contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/coventry/types/Person.xsl 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-person/trunk/web/__ccm__/themes/coventry/types/Person.xsl 2005-05-30 09:30:36 UTC (rev 528) @@ -0,0 +1,49 @@ +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + exclude-result-prefixes="cms" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.coventry.cms.contenttypes.Person']" + name="cms:CT_graphics_com_arsdigita_coventry_cms_contenttypes_Person"> + <h1><xsl:value-of select="title"/></h1> + + <table border="0" cellpadding="0" cellspacing="10" class= + "councillorList" summary= + "List of the councillor and summary details"> + <tr> + <xsl:if test="imageAttachments"> + <td class="councillorIMG"> + <xsl:for-each select="imageAttachments"> + <img border="1"> + <xsl:attribute name="src"><xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="image/id" /></xsl:attribute> + <xsl:if test="image/width"> + <xsl:attribute name="width"><xsl:value-of select="image/width" /></xsl:attribute> + </xsl:if> + <xsl:if test="image/height"> + <xsl:attribute name="height"><xsl:value-of select="image/height" /></xsl:attribute> + </xsl:if> + <xsl:attribute name="alt"><xsl:value-of select="caption" /></xsl:attribute> + </img> + </xsl:for-each> + </td> + </xsl:if> + + <xsl:if test="textAsset/content"> + <td align="left" valign="top"><p><xsl:value-of select="textAsset/content" disable-output-escaping="yes"/></p></td> + </xsl:if> + + </tr> + </table> + <p/> + + <xsl:if test="contactDetails"> + <h2>Contact details</h2> + <p><xsl:value-of select="contactDetails" disable-output-escaping="yes"/></p> + </xsl:if> + + </xsl:template> +</xsl:stylesheet> Modified: contrib/ccm-ldn-coventry-pressrelease/trunk/application.xml =================================================================== --- contrib/ccm-ldn-coventry-pressrelease/trunk/application.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-pressrelease/trunk/application.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-coventry-pressrelease" prettyName="Red Hat CCM Content Types" version="1.0.2" - release="1" + release="2" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> @@ -16,6 +16,7 @@ <ccm:directory name="pdl"/> <ccm:directory name="sql"/> <ccm:directory name="src"/> + <ccm:directory name="web"/> </ccm:directories> <ccm:contacts> Modified: contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml =================================================================== --- contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/content-types/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -17,7 +17,7 @@ component="com.arsdigita.cms.ui.authoring.TextPageBody" ordering="2" /> - <ctd:include href="/WEB-INF/content-types/coventry-shared.xml"/> + <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/> </ctd:authoring-kit> </ctd:content-type> Modified: contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml =================================================================== --- contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-pressrelease/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/coventry/cms/contenttypes/PressRelease.xml 2005-05-30 09:30:36 UTC (rev 528) @@ -7,7 +7,7 @@ </xrd:associations> <xrd:formatter property="/object/rel_date" - class="com.arsdigita.coventry.ui.DateFormatter"/> + class="com.arsdigita.xml.formatters.DateFormatter"/> </xrd:adapter> </xrd:context> Added: contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/coventry/types/CoventryPressRelease.xsl =================================================================== --- contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/coventry/types/CoventryPressRelease.xsl 2005-05-23 14:28:28 UTC (rev 527) +++ contrib/ccm-ldn-coventry-pressrelease/trunk/web/__ccm__/themes/coventry/types/CoventryPressRelease.xsl 2005-05-30 09:30:36 UTC (rev 528) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + exclude-result-prefixes="cms" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.coventry.cms.contenttypes.PressRelease']" + name="cms:CT_graphics_com_arsdigita_coventry_cms_contenttypes_PressRelease"> + <h1><xsl:value-of select="title"/></h1> + <p class="releaseDate">Release date: <xsl:value-of select="rel_date"/></p> + + <xsl:for-each select="imageAttachments"> + <table border="0" cellpadding="0" cellspacing="0" class="photo floatLeft" summary="{caption}"> + <tr> + <th><xsl:value-of select="caption"/></th> + </tr> + <tr> + <td> + <img border="0" src="{$dispatcher-prefix}/cms-service/stream/image/?image_id={image/id}" width="240" height="160" alt="{caption}"/> + </td> + </tr> + </table> + </xsl:for-each> + + <p> + <xsl:value-of select="textAsset/content" disable-output-escaping="yes"/> + </p> + + <xsl:if test="contactInfo"> + <h2>Contact details</h2> + <address> + <xsl:value-of disable-output-escaping="yes" select="contactInfo"/> + </address> + </xsl:if> + </xsl:template> +</xsl:stylesheet> |
|
From: <ss...@re...> - 2005-05-23 14:33:24
|
Author: sshinde
Date: 2005-05-23 16:28:28 +0200 (Mon, 23 May 2005)
New Revision: 527
Modified:
ccm-cms/trunk/web/assets/htmlarea/popups/insert_link.html
Log:
URL Encode the URLs entered with the
Link selection popup dialog fired up from
the text editor in admin UI.
Modified: ccm-cms/trunk/web/assets/htmlarea/popups/insert_link.html
===================================================================
--- ccm-cms/trunk/web/assets/htmlarea/popups/insert_link.html 2005-05-20 21:47:47 UTC (rev 526)
+++ ccm-cms/trunk/web/assets/htmlarea/popups/insert_link.html 2005-05-23 14:28:28 UTC (rev 527)
@@ -30,7 +30,7 @@
for (var i in fields) {
var id = fields[i];
var el = document.getElementById(id);
- param[id] = el.value;
+ param[id] = encodeURI(el.value);
}
__dlg_close(param);
return false;
|
18 messages has been excluded from this view by a project administrator.
