Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Author: fabrice Date: 2006-06-14 15:08:25 +0200 (Wed, 14 Jun 2006) New Revision: 1167 Added: trunk/ccm-core/debian/ trunk/ccm-core/debian/ccm-build.sh trunk/ccm-core/debian/ccm-clean.sh trunk/ccm-core/debian/ccm-config.sh trunk/ccm-core/debian/ccm-core.dirs trunk/ccm-core/debian/ccm-disperse.sh trunk/ccm-core/debian/ccm-install.sh trunk/ccm-core/debian/ccm-settings-run.sh trunk/ccm-core/debian/ccm-settings.sh trunk/ccm-core/debian/cctest trunk/ccm-core/debian/changelog trunk/ccm-core/debian/compat trunk/ccm-core/debian/config trunk/ccm-core/debian/control trunk/ccm-core/debian/copyright trunk/ccm-core/debian/postinst trunk/ccm-core/debian/postrm trunk/ccm-core/debian/prerm trunk/ccm-core/debian/rules trunk/ccm-core/debian/templates trunk/ccm-core/sql/ccm-core/default/upgrade/6.3.0-6.3.1/ trunk/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context-quick.sql trunk/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/ trunk/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql trunk/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/add_column_users_banned.sql trunk/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.1-6.3.2/ trunk/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/ trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/add_column_users_banned.sql trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.3.1-6.3.2/ trunk/ccm-core/sql/ccm-core/postgres/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql trunk/ccm-core/src/com/arsdigita/xml/XMLConfig.java trunk/ccm-core/src/com/arsdigita/xml/XMLConfig_parameter.properties trunk/ccm-core/src/com/arsdigita/xml/formatters/DateFormatterConfig.java trunk/ccm-core/src/com/arsdigita/xml/formatters/DateFormatterConfig_parameter.properties trunk/ccm-core/web/assets/htmlarea/config/ trunk/ccm-core/web/assets/htmlarea/config/Basic.js trunk/ccm-core/web/assets/htmlarea/config/Styled.js trunk/ccm-core/web/assets/htmlarea/popups/frame.html trunk/ccm-core/web/assets/htmlarea/popups/frame_image.html trunk/ccm-core/web/assets/htmlarea/popups/frame_main.html trunk/ccm-core/web/assets/htmlarea/popups/insert_image_form.html trunk/ccm-core/web/assets/htmlarea/popups/insert_link.html trunk/ccm-core/web/upload.jsp Removed: trunk/ccm-core/sql/ccm-core/default/upgrade/6.2.0-6.3.1/ trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.2.0-6.3.1.sql trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.2.0-6.3.1.sql Modified: trunk/ccm-core/application.xml trunk/ccm-core/pdl/com/arsdigita/categorization/CategoryPurpose.pdl trunk/ccm-core/pdl/com/arsdigita/kernel/User.pdl trunk/ccm-core/pdl/com/arsdigita/versioning/Txn.pdl trunk/ccm-core/sql/ccm-core/default/categorization/table-cat_purposes.sql trunk/ccm-core/sql/ccm-core/default/kernel/insert-users.sql trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql trunk/ccm-core/src/ccm-core.config trunk/ccm-core/src/ccm-core.upgrade trunk/ccm-core/src/com/arsdigita/bebop/Tree.java trunk/ccm-core/src/com/arsdigita/categorization/CategoryPurpose.java trunk/ccm-core/src/com/arsdigita/dispatcher/DispatcherConfig.java trunk/ccm-core/src/com/arsdigita/dispatcher/DispatcherConfig_parameter.properties trunk/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java trunk/ccm-core/src/com/arsdigita/kernel/Initializer.java trunk/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java trunk/ccm-core/src/com/arsdigita/kernel/Role.java trunk/ccm-core/src/com/arsdigita/kernel/User.java trunk/ccm-core/src/com/arsdigita/kernel/security/UserContext.java trunk/ccm-core/src/com/arsdigita/mimetypes/MimeTypeInitializer.java trunk/ccm-core/src/com/arsdigita/packaging/Command.java trunk/ccm-core/src/com/arsdigita/packaging/MasterTool.java trunk/ccm-core/src/com/arsdigita/search/Search.java trunk/ccm-core/src/com/arsdigita/search/ui/ResultsPane.java trunk/ccm-core/src/com/arsdigita/templating/PatternStylesheetResolver.java trunk/ccm-core/src/com/arsdigita/ui/admin/AdminConstants.java trunk/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties trunk/ccm-core/src/com/arsdigita/ui/admin/UserBrowsePane.java trunk/ccm-core/src/com/arsdigita/ui/admin/UserInfo.java trunk/ccm-core/src/com/arsdigita/ui/login/LoginConstants.java trunk/ccm-core/src/com/arsdigita/ui/login/RecoverPasswordPanel.java trunk/ccm-core/src/com/arsdigita/ui/login/SubsiteDispatcher.java trunk/ccm-core/src/com/arsdigita/ui/login/SubsiteResources_en.properties trunk/ccm-core/src/com/arsdigita/xml/XML.java trunk/ccm-core/src/com/arsdigita/xml/formatters/DateFormatter.java trunk/ccm-core/src/com/arsdigita/xml/formatters/DateTimeFormatter.java trunk/ccm-core/src/com/arsdigita/xml/formatters/FullDateFormatter.java trunk/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java trunk/ccm-core/web/assets/htmlarea/htmlarea.js trunk/ccm-core/web/assets/htmlarea/plugins/SpellChecker/lang/en.js trunk/ccm-core/web/assets/htmlarea/plugins/SpellChecker/spell-check-ui.html trunk/ccm-core/web/assets/htmlarea/popups/insert_image.html trunk/ccm-core/web/packages/bebop/xsl/DHTMLEditor.xsl trunk/ccm-core/web/packages/bebop/xsl/Link.xsl trunk/ccm-core/web/packages/bebop/xsl/TextArea.xsl Log: * new language category purpose * ability to ban users * isSelected attribute on Tree * defaultPageClass parameter * minor fixes * option to set a default locale for DateFormatter to use * option to (de)activate the FullDateFormatter * upload images in wysiwyg editor Modified: trunk/ccm-core/application.xml =================================================================== --- trunk/ccm-core/application.xml 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/application.xml 2006-06-14 13:08:25 UTC (rev 1167) @@ -2,8 +2,8 @@ <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" name="ccm-core" prettyName="Core" - version="6.3.1" - release="2" + version="6.3.2" + release="4" webapp="ROOT" buildHooks="build-hooks.xml"> <ccm:dependencies> Added: trunk/ccm-core/debian/ccm-build.sh =================================================================== --- trunk/ccm-core/debian/ccm-build.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-build.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-build.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $ + +. debian/ccm-settings.sh + +# for eg Oracle jar +CLASSPATH=./lib/:$CLASSPATH +$ANT build-${name} Added: trunk/ccm-core/debian/ccm-clean.sh =================================================================== --- trunk/ccm-core/debian/ccm-clean.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-clean.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-clean.sh,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $ + +. debian/ccm-settings.sh + +[ -f build.xml ] && $ANT clean-${appname} + +rm -rf build build.xml ccm.classpath + +# ccm-disperse.sh creates the .install files automatically, so let's clean them too. + +rm -f ${appname}.install ${appname}-doc.install Added: trunk/ccm-core/debian/ccm-config.sh =================================================================== --- trunk/ccm-core/debian/ccm-config.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-config.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-config.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $ + +. debian/ccm-settings.sh + +if [ ! -L $name ]; then + ln -s . $name +fi +ccm-create-projectxml.pl > project.xml +ccm-configure.sh Added: trunk/ccm-core/debian/ccm-core.dirs =================================================================== --- trunk/ccm-core/debian/ccm-core.dirs 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-core.dirs 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1 @@ +usr/share/java/ccm-core-6.3.2 Added: trunk/ccm-core/debian/ccm-disperse.sh =================================================================== --- trunk/ccm-core/debian/ccm-disperse.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-disperse.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-disperse.sh,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $ + +. debian/ccm-settings.sh + +SRCDIR="$1" +[ "x$SRCDIR" != "x" ] || exit 1 + +# automatically generate the .install file lists for dh_install: + +(cd $SRCDIR && find . -type f \ + | grep -v DEBIAN \ + | grep -v var/www/html \ + | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}.install + +(cd $SRCDIR && find . -type f -path './var/www/html/*' \ + | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}-doc.install + +# for some reason, dh_install doesn't work properly; let's disperse the files ourselves: + +for pkg in ${name} ${name}-doc; do + # skip this package if mentioned in CCM_DEBIAN_NO_PACKAGES + [ `echo $CCM_DEBIAN_NO_PACKAGES | tr ' ' '\n' | grep -c "^${pkg}$"` -eq 1 ] && continue || true + + # this should exist [due to dh_installdocs, dh_installchangelog], but just in case... + mkdir -p debian/$pkg + + [ -e debian/${pkg}.install ] && \ + echo -n "Dispersing files to debian/$pkg/ ... " && \ + for file in `cat debian/${pkg}.install`; do + dir=`dirname $file` + mkdir -p debian/$pkg/$dir + cp $SRCDIR/$file debian/$pkg/$dir/ + done + echo "done." +done Added: trunk/ccm-core/debian/ccm-install.sh =================================================================== --- trunk/ccm-core/debian/ccm-install.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-install.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-install.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $ + +. debian/ccm-settings.sh + +DESTDIR="$1" +[ "xDESTDIR" != "x" ] || exit 1 + +rm -rf $DESTDIR +mkdir -p $DESTDIR +mkdir -p $DESTDIR${confdir} +mkdir -p $DESTDIR/var/www/html/${name}-${version} + +ANT_OPTS="-Dapps.${name}.version=${version}" +ANT_OPTS="$ANT_OPTS -Ddeploy.conf.dir=$DESTDIR${confdir}" +ANT_OPTS="$ANT_OPTS -Ddeploy.shared.lib.dir=$DESTDIR${sharedjardir}" +ANT_OPTS="$ANT_OPTS -Ddeploy.private.lib.dir=$DESTDIR${sharedjardir}/${name}-${version}" +ANT_OPTS="$ANT_OPTS -Ddeploy.webapp.dir=$DESTDIR${webappdir}/${name}-${version}" +ANT_OPTS="$ANT_OPTS -Ddeploy.system.jars.dir=$DESTDIR${sharedjardir}" +ANT_OPTS="$ANT_OPTS -Ddeploy.api.dir.${appname}=$DESTDIR/var/www/html/${name}-${version}/api" +ANT_OPTS="$ANT_OPTS -Ddeploy.shared.classes.dir=$DESTDIR/tmp/${name}-${version}" +export ANT_OPTS + +$ANT deploy-jar-classes-${appname} +$ANT deploy-${appname} + +rm -rf "$DESTDIR/tmp" + + +# only generate and deploy javadocs if we didn't specify otherwise in CCM_DEBIAN_NO_JAVADOC + +GENERATE_JAVADOC=true +if [ `echo $CCM_DEBIAN_NO_JAVADOC | tr ' ' '\n' | grep -c "^${name}-doc$"` -eq 1 ]; then + GENERATE_JAVADOC=false +fi + +if [ -d ${appname}/src ]; then + $ANT deploy-jar-classes-${appname} + [ "$GENERATE_JAVADOC" == "true" ] && $ANT deploy-javadoc-${appname} || true +fi Added: trunk/ccm-core/debian/ccm-settings-run.sh =================================================================== --- trunk/ccm-core/debian/ccm-settings-run.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-settings-run.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $ + +# say which app to compile, amongst those specified in the project.xml +export CCM_APP=$name + +# do some checks + +check_JAVA_HOME + +if [ "$name" = "ccm-core" ]; then + check_ORACLE_JDBC_LIB +fi + + +# set the environment + +for file in `echo /etc/profile.d/ccm-{tools,devel,scripts}.sh`; do + . $file +done + +cd .. +. $CCM_SCRIPTS_HOME/bin/env-conf.sh ${appname} > /dev/null +cd - +export CCM_HOME=`pwd` + +if which classic-ant > /dev/null 2>&1; then + ANT=classic-ant +else + ANT=ant +fi + + +# perhaps we don't like to build some packages -- get them from DH_OPTIONS + +export CCM_DEBIAN_NO_PACKAGES=`echo $DH_OPTIONS | tr -s ' ' '\n' | grep -E '(-N|--no-package=)' | xargs | sed -re 's/(-N|--no-package)//g'` + +# for now, assume that if we don't want to build some packages then we don't +# want to generate javadocs for them either + +export CCM_DEBIAN_NO_JAVADOC="$CCM_DEBIAN_NO_JAVADOC $CCM_DEBIAN_NO_PACKAGES" Property changes on: trunk/ccm-core/debian/ccm-settings-run.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/ccm-core/debian/ccm-settings.sh =================================================================== --- trunk/ccm-core/debian/ccm-settings.sh 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/ccm-settings.sh 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,27 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $ + +# source the shell library [for the check_* functions] +# FIXME: ugly-looking hack. +orig_DEBIAN_HAS_FRONTEND=$DEBIAN_HAS_FRONTEND +DEBIAN_HAS_FRONTEND=1 +. /usr/share/ccm-tools/lib/shellmodule +DEBIAN_HAS_FRONTEND=$orig_DEBIAN_HAS_FRONTEND + + +# variables we use [especially in ccm-install.sh] + +name=ccm-core +version=6.3.2 +appname=ccm-core +appversion=6.3.2 +confdir="/etc/ccm/conf" +sharedjardir="/usr/share/java" +webappdir="/usr/share/java/webapps" +ccmclasspathfile="ccm/ccm.classpath" +ccmwebappfile="ccm/ccm.webapps" + +. debian/ccm-settings-run.sh Added: trunk/ccm-core/debian/cctest =================================================================== --- trunk/ccm-core/debian/cctest 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/cctest 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,39 @@ +Test file to see if cruisecontrol will pick up the changes and build automatically. + +Testing + +Testing 2 + +Testing 3 + +Testing 4 + +Testing 5 + +Testing 6 + +Testing 7 + +Testing 8 + +Testing 9 + +Testing 11 + +Testing 12 + +Testing 13 + +Testing 14 + +Testing 15 + +Testing 16 + +Testing 17 + +Testing 18 + +Testing 19 + +Testing 20 Added: trunk/ccm-core/debian/changelog =================================================================== --- trunk/ccm-core/debian/changelog 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/changelog 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,287 @@ +ccm-core (6.3.2-3) unstable; urgency=low + + * Added a new parameter: waf.xml.formatters.locale. If this is set then + given locale will be used instead of getting the locale from the + KernelContext. Currently this is only used by date formatters. + + -- Matt Roberts <ma...@ru...> Tue, 18 Apr 2006 11:48:36 +0100 + +ccm-core (6.3.2-2) unstable; urgency=low + + * Increment the version in debian/ccm-settings.sh. This should be done + automatically. + + -- David Pashley <da...@ru...> Tue, 18 Apr 2006 11:09:57 +0100 + +ccm-core (6.3.2-1) unstable; urgency=low + + * Added a default value (en) for cat_purposes.language + + -- Matt Roberts <ma...@ru...> Wed, 5 Apr 2006 17:25:19 +0100 + +ccm-core (6.3.1-6) unstable; urgency=low + + * Updating static table definition for cat_purposes. Made language not null + and added a compound unique constraint on language and key + + -- Matt Roberts <ma...@ru...> Thu, 30 Mar 2006 10:46:53 +0100 + +ccm-core (6.3.1-5) unstable; urgency=low + + * Updating static table definition for cat_purposes. Added the language + column. + + -- Matt Roberts <ma...@ru...> Thu, 30 Mar 2006 10:35:05 +0100 + +ccm-core (6.3.1-4) unstable; urgency=low + + * Added waf.dispatcher.default_page_class. By default it is set to + com.arsdigita.bebop.Page but you can change that now. + + -- Matt Roberts <ma...@ru...> Mon, 6 Mar 2006 15:58:26 +0000 + +ccm-core (6.3.1-3) unstable; urgency=low + + * Adding language to category purpose, from UNDP + + -- My <my...@fi...> Fri, 3 Mar 2006 10:55:29 +0000 + +ccm-core (6.3.1-2) unstable; urgency=low + + * Suggest rather than depend on postgresql + + -- David Pashley <da...@ru...> Fri, 10 Feb 2006 12:29:25 +0000 + +ccm-core (6.3.1-1) unstable; urgency=low + + * Upgrade script for users.banned + + -- My <my...@fi...> Fri, 3 Feb 2006 11:22:09 +0000 + +ccm-core (6.3.0-8) unstable; urgency=low + + * Removed hardcoded server names from file upload + + -- James Burt <ja...@ru...> Tue, 24 Jan 2006 14:12:35 +0000 + +ccm-core (6.3.0-7) unstable; urgency=low + + * Changes to complete HTMLArea change + + -- James Burt <ja...@ru...> Tue, 24 Jan 2006 10:23:44 +0000 + +ccm-core (6.3.0-6) unstable; urgency=low + + * Fixing RedHat breaking the build, it seems + + -- My <my...@fi...> Fri, 20 Jan 2006 08:41:59 +0000 + +ccm-core (6.3.0-5) unstable; urgency=low + + * Tree enhancement (show isSelected) + + -- My <my...@fi...> Thu, 19 Jan 2006 15:30:28 +0000 + +ccm-core (6.3.0-4) unstable; urgency=low + + * RedHat patches + + -- My <my...@fi...> Fri, 30 Dec 2005 08:52:59 +0000 + +ccm-core (6.3.0-3) unstable; urgency=low + + * New changes to add banned status for users + + -- James Burt <ja...@ru...> Mon, 7 Nov 2005 09:51:34 +0000 + +ccm-core (6.3.0-2) unstable; urgency=low + + * Adding missing description of form config param + + -- My <my...@fi...> Wed, 19 Oct 2005 11:14:24 +0000 + +ccm-core (6.3.0-1) unstable; urgency=low + + * Automatic update of version number from 6.2.0 to 6.3.0 + + -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 13:51:58 +0000 + +ccm-core (6.2.0-1) unstable; urgency=low + + * Automatic update of version number from 6.1.2 to 6.2.0 + + -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 12:30:10 +0000 + +ccm-core (6.1.2-17) unstable; urgency=low + + * fix encoding messup + + -- My <my...@fi...> Wed, 21 Sep 2005 08:26:13 +0000 + +ccm-core (6.1.2-16) unstable; urgency=low + + * Catch more POI exceptions when indexing content + + -- My <my...@fi...> Thu, 1 Sep 2005 07:23:11 +0000 + +ccm-core (6.1.2-15) unstable; urgency=low + + * replacing spaces with spaces in htmlarea.js, yeah. Ticket 19036 + + -- My <my...@fi...> Thu, 4 Aug 2005 12:46:58 +0000 + +ccm-core (6.1.2-14) unstable; urgency=low + + * 17170 - DefaultAncestorsFixer tools + + -- My <my...@fi...> Fri, 29 Jul 2005 13:34:15 +0000 + +ccm-core (6.1.2-13) unstable; urgency=low + + * Patches from Phil Collins + + -- My <my...@fi...> Wed, 27 Jul 2005 08:14:21 +0000 + +ccm-core (6.1.2-12) unstable; urgency=low + + * Upgrade patch from RedHat + + -- My <my...@fi...> Fri, 8 Jul 2005 08:53:05 +0000 + +ccm-core (6.1.2-11) unstable; urgency=low + + * Attempt to fix permissions fix + + -- David Pashley <da...@ru...> Tue, 28 Jun 2005 14:46:04 +0100 + +ccm-core (6.1.2-10) unstable; urgency=low + + * Permissions fix + + -- My <my...@fi...> Fri, 24 Jun 2005 12:39:40 +0000 + +ccm-core (6.1.2-9) unstable; urgency=low + + * Log output for 17509 + + -- My <my...@fi...> Tue, 17 May 2005 09:17:25 +0000 + +ccm-core (6.1.2-8) unstable; urgency=low + + * Upgrading PDFBox version + + -- Fabrice Retkowsky <fa...@ru...> Thu, 12 May 2005 12:34:36 +0000 + +ccm-core (6.1.2-7) unstable; urgency=low + + * Let the build know where the oracle jar file is. + + -- David Pashley <da...@ru...> Thu, 12 May 2005 10:14:48 +0100 + +ccm-core (6.1.2-6) unstable; urgency=low + + * Parameter to prevent notifications + + -- Fabrice Retkowsky <fa...@ru...> Tue, 10 May 2005 13:53:04 +0000 + +ccm-core (6.1.2-5) unstable; urgency=low + + * #17876 dynamichostprovider used to specify servername in email reminder + + -- Fabrice Retkowsky <fa...@ru...> Fri, 29 Apr 2005 07:50:39 +0000 + +ccm-core (6.1.2-4) unstable; urgency=low + + * Added new member to Category class to enable categories to ignore the + default parent index item. + + -- <cr...@ru...> Mon, 25 Apr 2005 12:17:27 +0000 + +ccm-core (6.1.2-3) unstable; urgency=low + + * New parameter waf.formbuilder.interpolate_email_actions_to_address to send simple/xml/templated emails to an interpolated email address, ticket 17328 + + -- Fabrice Retkowsky <fa...@ru...> Fri, 22 Apr 2005 08:29:47 +0000 + +ccm-core (6.1.2-2) unstable; urgency=low + + * parameter to de-activate fulldateformatter + + -- Fabrice Retkowsky <fa...@ru...> Wed, 13 Apr 2005 15:43:30 +0000 + +ccm-core (6.1.2-1) unstable; urgency=low + + * Automatic update of version number from 6.1.1 to 6.1.2 + + -- Runtime Collective Ltd. <in...@ru...> Thu, 31 Mar 2005 11:59:54 +0000 + +ccm-core (6.1.1-1) unstable; urgency=low + + * for qa + + -- Fabrice Retkowsky <fa...@ru...> Mon, 28 Feb 2005 11:12:56 +0000 + +ccm-core (6.1.0-8) unstable; urgency=low + + * fixed for null string for content-section + * added build-all-rpms.sh + + -- Fabrice Retkowsky <fa...@ru...> Mon, 28 Feb 2005 11:12:56 +0000 + +ccm-core (6.1.0-7) unstable; urgency=low + + * modified DHTMLEditor.xsl to remove a hard-coded variable (config_text_entry), replacing with the dynamic version used elsewhere in the file. + + -- Steve Hunt <st...@ru...> Tue, 22 Feb 2005 17:27:56 +0000 + +ccm-core (6.1.0-6) unstable; urgency=low + + * bebop.form.Submit has methods to set onclick attribute + + -- Fabrice Retkowsky <fa...@ru...> Tue, 22 Feb 2005 09:36:31 +0000 + +ccm-core (6.1.0-5) unstable; urgency=low + + * Depend on j2sdk1.4 | java2-compiler + * Update to policy 3.6.1 + * Change maintainer to the mailing list and add uploaders + + -- David Pashley <da...@ru...> Mon, 31 Jan 2005 11:39:40 +0000 + +ccm-core (6.1.0-4) unstable; urgency=low + + * debian/postrm: disabled the purge operations [had some weird problems]. + * updated the debian control scripts to get the package name and version from their invocation. + + -- Berkan Eskikaya <be...@ru...> Mon, 10 May 2004 12:33:33 +0100 + +ccm-core (6.1.0-3) unstable; urgency=low + + * debian/templates: made load-at-install and setup-database-at-install the default behaviour. + * debian/postinst: ccm_hostinit will try to use web.xml-aplaws from ccm-ldn-aplaws. + * debian/ccm-settings.sh: correct checking/setting of ORACLE_JDBC_LIB [Chris]. + * debian/templates: changed the default postgresql database and user names to "ccm01.db" and "ccm". + * debian/config: added detection of the hostname of the machine and possibly the user's email. + * major restructuring of the debian scripts: moved all utility functions to ccm-tools and made postinst, postrm, prerm and ccm-settings.sh source and use that file. + + -- Berkan Eskikaya <be...@ru...> Fri, 7 May 2004 13:04:43 +0100 + +ccm-core (6.1.0-2) unstable; urgency=low + + * The build process now tries to automatically detect JAVA_HOME and the location of Oracle's java library. + * debian/ccm-clean.sh: only calls the ant process if build.xml exists. + * debian/{postinst,prerm,config,templates}: added debconf support + * debian/postinst: accepts 'reconfigure' and treats it as 'configure'. + * debian/postinst: added postgresql.jar to CLASSPATH; added libpgjava to the dependencies. + * debian/postinst: removed some bashisms upon recommendation from lintian. + * debian/rules: enabled dh_installdebconf. + * debian/control: made the package depend on debconf. + + -- Berkan Eskikaya <be...@ru...> Fri, 1 May 2004 15:41:43 +0100 + + +ccm-core (6.1.0-1) unstable; urgency=low + + * Initial release. + + -- Berkan Eskikaya <be...@ru...> Fri, 24 Apr 2004 12:27:56 +0100 Added: trunk/ccm-core/debian/compat =================================================================== --- trunk/ccm-core/debian/compat 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/compat 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1 @@ +4 Added: trunk/ccm-core/debian/config =================================================================== --- trunk/ccm-core/debian/config 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/config 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,79 @@ +#!/bin/sh +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: config,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $ + +set -e + +. /usr/share/debconf/confmodule +db_capb backup + +HOSTNAME=`hostname -f` 2>/dev/null || true + +if [ -n "$HOSTNAME" ]; then + db_metaget ccm/shared/waf_web_server default || true + PORTNUM=`echo $RET | cut -d: -f2` + db_set ccm/shared/waf_web_server "$HOSTNAME:$PORTNUM" || true +fi + +if [ -n "$EMAIL" ]; then + db_set ccm/shared/waf_admin_email "$EMAIL" || true +fi + + +STATE=1 +LASTSTATE=5 + +while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do + case "$STATE" in + 1) + # Database questions + db_input high ccm/shared/dbase_type || true + db_input high ccm/shared/dbase_host || true + db_input high ccm/shared/dbase_name || true + db_input high ccm/shared/dbase_user || true + db_input high ccm/shared/dbase_password || true + + ;; + 2) + # Server address + db_input high ccm/shared/waf_web_server || true + ;; + 3) + # Admin questions + db_input high ccm/shared/waf_admin_email || true + db_input high ccm/shared/waf_admin_name_given || true + db_input high ccm/shared/waf_admin_name_family || true + db_input high ccm/shared/waf_admin_password || true + db_input high ccm/shared/waf_admin_password_question || true + db_input high ccm/shared/waf_admin_password_answer || true + ;; + 4) + # When to load the applications + db_input medium ccm/shared/ccm_load_apps_at_install_p || true + ;; + 5) + # Whether to set up the [local] database + db_get ccm/shared/dbase_host || true + if [ "$RET" = "localhost" ]; then + db_input medium ccm/shared/pg_set_up_database_p || true + fi + ;; + + # Add additional states here, making sure to + # increment LASTSTATE. + esac + + if db_go; then + STATE=$(($STATE + 1)) + else + STATE=$(($STATE - 1)) + fi +done + + +db_go || true + +db_stop + Added: trunk/ccm-core/debian/control =================================================================== --- trunk/ccm-core/debian/control 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/control 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,22 @@ +Source: ccm-core +Section: contrib/web +Priority: optional +Maintainer: Runtime Packaging <run...@ru...> +Uploaders: David Pashley <da...@ru...> +Build-Depends-Indep: debhelper (>= 4.0.0), j2sdk1.4| java2-compiler, ant, libservlet2.3-java, libpgjava, debconf, po-debconf, ccm-tools, ccm-devel, ccm-scripts, libjdbc-oracle9i-java, ccm-runtime +Standards-Version: 3.6.1 + +Package: ccm-core +Architecture: all +Depends: java-virtual-machine-dummy | j2sdk1.4 | java-virtual-machine, ccm-tools, ccm-servlet-container, libservlet2.3-java, libpgjava, liblog4j1.2-java | debconf +Suggests: postgresql +Description: APLAWS: CCM Core + This package contains the Core application for APLAWS. + . + FIXME: We need a longer and more meaningful description here. + +Package: ccm-core-doc +Architecture: all +Depends: ccm-tools +Description: Documentation for ccm-core + Documentation for ccm-core. Provides the JavaDoc API documentation. Added: trunk/ccm-core/debian/copyright =================================================================== --- trunk/ccm-core/debian/copyright 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/copyright 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,15 @@ +This package was debianized by Berkan Eskikaya <be...@ru...> on +Tue, 13 Apr 2004 19:03:14 +0100. + +It was downloaded from http://aplaws.sourceforge.net/ + +Upstream Authors: Redhat UK. + +Copyright: + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL'. + + Added: trunk/ccm-core/debian/postinst =================================================================== --- trunk/ccm-core/debian/postinst 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/postinst 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,109 @@ +#! /bin/sh +# postinst script for ccm-core +# +# see: dh_installdeb(1) +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: postinst,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $ + +set -e + +. /usr/share/debconf/confmodule +. /usr/share/ccm-tools/lib/shellmodule + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure|reconfigure) + # FIXME: we need to be sensitive to upgrade operations here. + # basically, if pkgversion = appversion, then the datamodel + # hasn't changed -- we just configure the package and don't + # touch the database; else, we need to also update the + # datamodel in the database. + + + ### get the settings for the operations below + + ccm_set_env + db_get_ccm_settings ;# db_stop + + get_pkgname_from_arg "$0" + ccm_package_name="$RET" + get_pkgversion_from_dpkg "$ccm_package_name" + ccm_package_version="$RET" + + + ### do the usual post-installion configuration + + if [ ! -d "/etc/ccm" ]; then + db_message "ccm/shared/error_etc_ccm_missing_dir" + mkdir -p "/etc/ccm" + fi + + ccm_update_ccm_classpath add $ccm_package_name $ccm_package_version + ccm_update_ccm_webapps add $ccm_package_name $ccm_package_version + ccm_update_file_attributes $ccm_package_name $ccm_package_version + + + ### try to set up the database if asked to do so + + if [ "$pg_set_up_database_p" = "true" ]; then + pg_set_up_database + fi + + ### try to load the application if asked to do so + + if [ "$ccm_load_apps_at_install_p" = "true" -a -n "$JAVA_HOME" ]; then + ccm_load + fi + + ### run the hostinit step + + if [ -n "$JAVA_HOME" ]; then + tomcat_http_port=`echo $waf_web_server | cut -d':' -f2` || true + tomcat_shutdown_port=`expr $tomcat_http_port + 1` || true + ccm_host_init tomcat $tomcat_http_port $tomcat_shutdown_port + fi + + + ### don't give others the registry details [eg the database password] on a golden plate + # FIXME: this interferes with "ccm load" updating the registry. Need to find the right ownership. + # chmod -R o-rwx /etc/ccm/conf/registry || true + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + Added: trunk/ccm-core/debian/postrm =================================================================== --- trunk/ccm-core/debian/postrm 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/postrm 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,62 @@ +#! /bin/sh +# postrm script for ccm-core +# +# see: dh_installdeb(1) +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: postrm,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $ + +set -e + +. /usr/share/debconf/confmodule +. /usr/share/ccm-tools/lib/shellmodule + +db_get_ccm_settings + +get_pkgname_from_arg "$0" +ccm_package_name="$RET" +get_pkgversion_from_dpkg "$ccm_package_name" +ccm_package_version="$RET" + +if [ "$ccm_package_name" != "ccm-core" ]; then + exit 0 ;# nothing to do +fi + +case "$1" in + purge-FIXME) + # FIXME: there are problems with this, so disabling for the moment. + + # maybe drop the database + if [ "$dbase_host" = "localhost" ]; then + + db_input high ccm/shared/pg_drop_database_at_purge_p || true + db_go + db_stop + + if [ "$pg_drop_database_at_purge_p" = "true" ]; then + su - postgres -c "dropdb $dbase_name" 1>&2 || true + su - postgres -c "dropuser $dbase_user" 1>&2 || true + fi + + fi + + # FIXME: should we still remove /etc/ccm/conf/registry/registry.properties, + # even if we don't or fail to drop the database. + rm -rf /etc/ccm/conf/registry/* + ;; + + *) + # Nothing to do here. + ;; + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + Added: trunk/ccm-core/debian/prerm =================================================================== --- trunk/ccm-core/debian/prerm 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/prerm 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,60 @@ +#! /bin/sh +# prerm script for ccm-core +# +# see: dh_installdeb(1) +# +# Author: Berkan Eskikaya <be...@ru...>, 2004 +# +# $Id: prerm,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $ + +set -e + +. /usr/share/debconf/confmodule +. /usr/share/ccm-tools/lib/shellmodule + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +db_get_ccm_settings ; db_stop + +get_pkgname_from_arg "$0" +ccm_package_name="$RET" +get_pkgversion_from_dpkg "$ccm_package_name" +ccm_package_version="$RET" + +case "$1" in + remove|purge|upgrade|deconfigure) + + ccm_update_ccm_classpath remove $ccm_package_name $ccm_package_version + ccm_update_ccm_webapps remove $ccm_package_name $ccm_package_version + ;; + + failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ "$1" = "remove" -a "$ccm_package_name" = "ccm-core" -a -x "/etc/init.d/ccm" ]; then + invoke-rc.d ccm stop || true +fi + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + Added: trunk/ccm-core/debian/rules =================================================================== --- trunk/ccm-core/debian/rules 2006-06-14 12:30:15 UTC (rev 1166) +++ trunk/ccm-core/debian/rules 2006-06-14 13:08:25 UTC (rev 1167) @@ -0,0 +1,86 @@ +#!/usr/bin/make -f +# debian/rules that uses debhelper. +# This file is public domain software, originally written by Joey Hess. +# .. |
|
From: <fa...@vh...> - 2006-06-14 12:34:52
|
Author: fabrice
Date: 2006-06-14 14:30:15 +0200 (Wed, 14 Jun 2006)
New Revision: 1166
Added:
trunk/ccm-cms-types-newsitem/debian/
trunk/ccm-cms-types-newsitem/debian/ccm-build.sh
trunk/ccm-cms-types-newsitem/debian/ccm-clean.sh
trunk/ccm-cms-types-newsitem/debian/ccm-cms-types-newsitem.dirs
trunk/ccm-cms-types-newsitem/debian/ccm-config.sh
trunk/ccm-cms-types-newsitem/debian/ccm-disperse.sh
trunk/ccm-cms-types-newsitem/debian/ccm-install.sh
trunk/ccm-cms-types-newsitem/debian/ccm-settings-run.sh
trunk/ccm-cms-types-newsitem/debian/ccm-settings.sh
trunk/ccm-cms-types-newsitem/debian/changelog
trunk/ccm-cms-types-newsitem/debian/compat
trunk/ccm-cms-types-newsitem/debian/config
trunk/ccm-cms-types-newsitem/debian/control
trunk/ccm-cms-types-newsitem/debian/copyright
trunk/ccm-cms-types-newsitem/debian/postinst
trunk/ccm-cms-types-newsitem/debian/postrm
trunk/ccm-cms-types-newsitem/debian/prerm
trunk/ccm-cms-types-newsitem/debian/rules
trunk/ccm-cms-types-newsitem/debian/templates
Modified:
trunk/ccm-cms-types-newsitem/pdl/com/arsdigita/content-types/NewsItem.pdl
Log:
* new sql queries
* debian files
Added: trunk/ccm-cms-types-newsitem/debian/ccm-build.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-build.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-build.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-build.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+# for eg Oracle jar
+CLASSPATH=./lib/:$CLASSPATH
+$ANT build-${name}
Added: trunk/ccm-cms-types-newsitem/debian/ccm-clean.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-clean.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-clean.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-clean.sh,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+[ -f build.xml ] && $ANT clean-${appname}
+
+rm -rf build build.xml ccm.classpath
+
+# ccm-disperse.sh creates the .install files automatically, so let's clean them too.
+
+rm -f ${appname}.install ${appname}-doc.install
Added: trunk/ccm-cms-types-newsitem/debian/ccm-cms-types-newsitem.dirs
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-cms-types-newsitem.dirs 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-cms-types-newsitem.dirs 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1 @@
+usr/share/java/ccm-cms-types-newsitem-6.3.0
Added: trunk/ccm-cms-types-newsitem/debian/ccm-config.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-config.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-config.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-config.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+if [ ! -L $name ]; then
+ ln -s . $name
+fi
+ccm-create-projectxml.pl > project.xml
+ccm-configure.sh
Added: trunk/ccm-cms-types-newsitem/debian/ccm-disperse.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-disperse.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-disperse.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-disperse.sh,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+SRCDIR="$1"
+[ "x$SRCDIR" != "x" ] || exit 1
+
+# automatically generate the .install file lists for dh_install:
+
+(cd $SRCDIR && find . -type f \
+ | grep -v DEBIAN \
+ | grep -v var/www/html \
+ | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}.install
+
+(cd $SRCDIR && find . -type f -path './var/www/html/*' \
+ | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}-doc.install
+
+# for some reason, dh_install doesn't work properly; let's disperse the files ourselves:
+
+for pkg in ${name} ${name}-doc; do
+ # skip this package if mentioned in CCM_DEBIAN_NO_PACKAGES
+ [ `echo $CCM_DEBIAN_NO_PACKAGES | tr ' ' '\n' | grep -c "^${pkg}$"` -eq 1 ] && continue || true
+
+ # this should exist [due to dh_installdocs, dh_installchangelog], but just in case...
+ mkdir -p debian/$pkg
+
+ [ -e debian/${pkg}.install ] && \
+ echo -n "Dispersing files to debian/$pkg/ ... " && \
+ for file in `cat debian/${pkg}.install`; do
+ dir=`dirname $file`
+ mkdir -p debian/$pkg/$dir
+ cp $SRCDIR/$file debian/$pkg/$dir/
+ done
+ echo "done."
+done
Added: trunk/ccm-cms-types-newsitem/debian/ccm-install.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-install.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-install.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-install.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+DESTDIR="$1"
+[ "xDESTDIR" != "x" ] || exit 1
+
+rm -rf $DESTDIR
+mkdir -p $DESTDIR
+mkdir -p $DESTDIR${confdir}
+mkdir -p $DESTDIR/var/www/html/${name}-${version}
+
+ANT_OPTS="-Dapps.${name}.version=${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.conf.dir=$DESTDIR${confdir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.shared.lib.dir=$DESTDIR${sharedjardir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.private.lib.dir=$DESTDIR${sharedjardir}/${name}-${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.webapp.dir=$DESTDIR${webappdir}/${name}-${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.system.jars.dir=$DESTDIR${sharedjardir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.api.dir.${appname}=$DESTDIR/var/www/html/${name}-${version}/api"
+ANT_OPTS="$ANT_OPTS -Ddeploy.shared.classes.dir=$DESTDIR/tmp/${name}-${version}"
+export ANT_OPTS
+
+$ANT deploy-jar-classes-${appname}
+$ANT deploy-${appname}
+
+rm -rf "$DESTDIR/tmp"
+
+
+# only generate and deploy javadocs if we didn't specify otherwise in CCM_DEBIAN_NO_JAVADOC
+
+GENERATE_JAVADOC=true
+if [ `echo $CCM_DEBIAN_NO_JAVADOC | tr ' ' '\n' | grep -c "^${name}-doc$"` -eq 1 ]; then
+ GENERATE_JAVADOC=false
+fi
+
+if [ -d ${appname}/src ]; then
+ $ANT deploy-jar-classes-${appname}
+ [ "$GENERATE_JAVADOC" == "true" ] && $ANT deploy-javadoc-${appname} || true
+fi
Added: trunk/ccm-cms-types-newsitem/debian/ccm-settings-run.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-settings-run.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-settings-run.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+# say which app to compile, amongst those specified in the project.xml
+export CCM_APP=$name
+
+# do some checks
+
+check_JAVA_HOME
+
+if [ "$name" = "ccm-core" ]; then
+ check_ORACLE_JDBC_LIB
+fi
+
+
+# set the environment
+
+for file in `echo /etc/profile.d/ccm-{tools,devel,scripts}.sh`; do
+ . $file
+done
+
+cd ..
+. $CCM_SCRIPTS_HOME/bin/env-conf.sh ${appname} > /dev/null
+cd -
+export CCM_HOME=`pwd`
+
+if which classic-ant > /dev/null 2>&1; then
+ ANT=classic-ant
+else
+ ANT=ant
+fi
+
+
+# perhaps we don't like to build some packages -- get them from DH_OPTIONS
+
+export CCM_DEBIAN_NO_PACKAGES=`echo $DH_OPTIONS | tr -s ' ' '\n' | grep -E '(-N|--no-package=)' | xargs | sed -re 's/(-N|--no-package)//g'`
+
+# for now, assume that if we don't want to build some packages then we don't
+# want to generate javadocs for them either
+
+export CCM_DEBIAN_NO_JAVADOC="$CCM_DEBIAN_NO_JAVADOC $CCM_DEBIAN_NO_PACKAGES"
Property changes on: trunk/ccm-cms-types-newsitem/debian/ccm-settings-run.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-cms-types-newsitem/debian/ccm-settings.sh
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/ccm-settings.sh 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/ccm-settings.sh 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+# source the shell library [for the check_* functions]
+# FIXME: ugly-looking hack.
+orig_DEBIAN_HAS_FRONTEND=$DEBIAN_HAS_FRONTEND
+DEBIAN_HAS_FRONTEND=1
+. /usr/share/ccm-tools/lib/shellmodule
+DEBIAN_HAS_FRONTEND=$orig_DEBIAN_HAS_FRONTEND
+
+
+# variables we use [especially in ccm-install.sh]
+
+name=ccm-cms-types-newsitem
+version=6.3.0
+appname=ccm-cms-types-newsitem
+appversion=6.3.0
+confdir="/etc/ccm/conf"
+sharedjardir="/usr/share/java"
+webappdir="/usr/share/java/webapps"
+ccmclasspathfile="ccm/ccm.classpath"
+ccmwebappfile="ccm/ccm.webapps"
+
+. debian/ccm-settings-run.sh
Added: trunk/ccm-cms-types-newsitem/debian/changelog
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/changelog 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/changelog 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,61 @@
+ccm-cms-types-newsitem (6.3.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.2.0 to 6.3.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 13:51:58 +0000
+
+ccm-cms-types-newsitem (6.2.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.1.1 to 6.2.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 12:30:08 +0000
+
+ccm-cms-types-newsitem (6.1.1-2) unstable; urgency=low
+
+ * Final (?) fix for dublincore dates, #17509
+
+ -- My <my...@fi...> Wed, 18 May 2005 08:29:00 +0000
+
+ccm-cms-types-newsitem (6.1.1-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.1.0 to 6.1.1
+
+ -- Runtime Collective Ltd. <in...@ru...> Thu, 31 Mar 2005 11:59:53 +0000
+
+ccm-cms-types-newsitem (6.1.0-4) unstable; urgency=low
+
+ * debian/postrm: disabled the purge operations [had some weird problems].
+ * updated the debian control scripts to get the package name and version from their invocation.
+
+ -- Berkan Eskikaya <be...@ru...> Mon, 10 May 2004 12:33:33 +0100
+
+ccm-cms-types-newsitem (6.1.0-3) unstable; urgency=low
+
+ * debian/templates: made load-at-install and setup-database-at-install the default behaviour.
+ * debian/postinst: ccm_hostinit will try to use web.xml-aplaws from ccm-ldn-aplaws.
+ * debian/ccm-settings.sh: correct checking/setting of ORACLE_JDBC_LIB [Chris].
+ * debian/templates: changed the default postgresql database and user names to "ccm01.db" and "ccm".
+ * debian/config: added detection of the hostname of the machine and possibly the user's email.
+ * major restructuring of the debian scripts: moved all utility functions to ccm-tools and made postinst, postrm, prerm and ccm-settings.sh source and use that file.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 7 May 2004 13:04:43 +0100
+
+ccm-cms-types-newsitem (6.1.0-2) unstable; urgency=low
+
+ * The build process now tries to automatically detect JAVA_HOME and the location of Oracle's java library.
+ * debian/ccm-clean.sh: only calls the ant process if build.xml exists.
+ * debian/{postinst,prerm,config,templates}: added debconf support
+ * debian/postinst: accepts 'reconfigure' and treats it as 'configure'.
+ * debian/postinst: added postgresql.jar to CLASSPATH; added libpgjava to the dependencies.
+ * debian/postinst: removed some bashisms upon recommendation from lintian.
+ * debian/rules: enabled dh_installdebconf.
+ * debian/control: made the package depend on debconf.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 1 May 2004 15:41:43 +0100
+
+
+ccm-cms-types-newsitem (6.1.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 24 Apr 2004 12:27:56 +0100
Added: trunk/ccm-cms-types-newsitem/debian/compat
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/compat 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/compat 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1 @@
+4
Added: trunk/ccm-cms-types-newsitem/debian/config
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/config 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/config 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: config,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_capb backup
+
+HOSTNAME=`hostname -f` 2>/dev/null || true
+
+if [ -n "$HOSTNAME" ]; then
+ db_metaget ccm/shared/waf_web_server default || true
+ PORTNUM=`echo $RET | cut -d: -f2`
+ db_set ccm/shared/waf_web_server "$HOSTNAME:$PORTNUM" || true
+fi
+
+if [ -n "$EMAIL" ]; then
+ db_set ccm/shared/waf_admin_email "$EMAIL" || true
+fi
+
+
+STATE=1
+LASTSTATE=5
+
+while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
+ case "$STATE" in
+ 1)
+ # Database questions
+ db_input high ccm/shared/dbase_type || true
+ db_input high ccm/shared/dbase_host || true
+ db_input high ccm/shared/dbase_name || true
+ db_input high ccm/shared/dbase_user || true
+ db_input high ccm/shared/dbase_password || true
+
+ ;;
+ 2)
+ # Server address
+ db_input high ccm/shared/waf_web_server || true
+ ;;
+ 3)
+ # Admin questions
+ db_input high ccm/shared/waf_admin_email || true
+ db_input high ccm/shared/waf_admin_name_given || true
+ db_input high ccm/shared/waf_admin_name_family || true
+ db_input high ccm/shared/waf_admin_password || true
+ db_input high ccm/shared/waf_admin_password_question || true
+ db_input high ccm/shared/waf_admin_password_answer || true
+ ;;
+ 4)
+ # When to load the applications
+ db_input medium ccm/shared/ccm_load_apps_at_install_p || true
+ ;;
+ 5)
+ # Whether to set up the [local] database
+ db_get ccm/shared/dbase_host || true
+ if [ "$RET" = "localhost" ]; then
+ db_input medium ccm/shared/pg_set_up_database_p || true
+ fi
+ ;;
+
+ # Add additional states here, making sure to
+ # increment LASTSTATE.
+ esac
+
+ if db_go; then
+ STATE=$(($STATE + 1))
+ else
+ STATE=$(($STATE - 1))
+ fi
+done
+
+
+db_go || true
+
+db_stop
+
Added: trunk/ccm-cms-types-newsitem/debian/control
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/control 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/control 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,20 @@
+Source: ccm-cms-types-newsitem
+Section: contrib/web
+Priority: optional
+Maintainer: Berkan Eskikaya <be...@ru...>
+Build-Depends-Indep: debhelper (>= 4.0.0), j2re1.4 | java2-runtime, j2sdk1.4 | java2-compiler, ant, libservlet2.3-java, libpgjava, debconf, po-debconf, ccm-tools, ccm-devel, ccm-scripts, ccm-core, ccm-cms
+Standards-Version: 3.6.0
+
+Package: ccm-cms-types-newsitem
+Architecture: all
+Depends: java-virtual-machine-dummy | j2sdk1.4 | java-virtual-machine, ccm-tools, ccm-servlet-container, libservlet2.3-java, libpgjava, liblog4j1.2-java , ccm-core, ccm-cms
+Description: APLAWS: The News Item content type for publishing news.
+ This package contains the Red Hat CCM Content Types application for APLAWS.
+ .
+ FIXME: We need a longer and more meaningful description here.
+
+Package: ccm-cms-types-newsitem-doc
+Architecture: all
+Depends: ccm-tools
+Description: Documentation for ccm-cms-types-newsitem
+ Documentation for ccm-cms-types-newsitem. Provides the JavaDoc API documentation.
Added: trunk/ccm-cms-types-newsitem/debian/copyright
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/copyright 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/copyright 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,15 @@
+This package was debianized by Berkan Eskikaya <be...@ru...> on
+Tue, 13 Apr 2004 19:03:14 +0100.
+
+It was downloaded from http://aplaws.sourceforge.net/
+
+Upstream Authors: Redhat UK.
+
+Copyright:
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'.
+
+
Added: trunk/ccm-cms-types-newsitem/debian/postinst
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/postinst 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/postinst 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,112 @@
+#! /bin/sh
+# postinst script for ccm-cms-types-newsitem
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postinst,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure|reconfigure)
+ # FIXME: we need to be sensitive to upgrade operations here.
+ # basically, if pkgversion = appversion, then the datamodel
+ # hasn't changed -- we just configure the package and don't
+ # touch the database; else, we need to also update the
+ # datamodel in the database.
+
+
+ ### get the settings for the operations below
+
+ ccm_set_env
+ db_get_ccm_settings ;# db_stop
+
+ get_pkgname_from_arg "$0"
+ ccm_package_name="$RET"
+ get_pkgversion_from_dpkg "$ccm_package_name"
+ ccm_package_version="$RET"
+
+
+ ### do the usual post-installion configuration
+
+ if [ ! -d "/etc/ccm" ]; then
+ db_message "ccm/shared/error_etc_ccm_missing_dir"
+ mkdir -p "/etc/ccm"
+ fi
+
+ ccm_update_ccm_classpath add $ccm_package_name $ccm_package_version
+ ccm_update_ccm_webapps add $ccm_package_name $ccm_package_version
+ ccm_update_file_attributes $ccm_package_name $ccm_package_version
+
+
+ ### try to set up the database if asked to do so
+
+ if [ "$pg_set_up_database_p" = "true" ]; then
+ pg_set_up_database
+ fi
+
+
+ ### try to load the application if asked to do so
+
+ if [ "$ccm_load_apps_at_install_p" = "true" -a -n "$JAVA_HOME" ]; then
+ ccm_load
+ fi
+
+
+ ### run the hostinit step
+
+ if [ -n "$JAVA_HOME" ]; then
+ tomcat_http_port=`echo $waf_web_server | cut -d':' -f2` || true
+ tomcat_shutdown_port=`expr $tomcat_http_port + 1` || true
+ ccm_host_init tomcat $tomcat_http_port $tomcat_shutdown_port
+ fi
+
+
+ ### don't give others the registry details [eg the database password] on a golden plate
+ # FIXME: this interferes with "ccm load" updating the registry. Need to find the right ownership.
+ # chmod -R o-rwx /etc/ccm/conf/registry || true
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Added: trunk/ccm-cms-types-newsitem/debian/postrm
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/postrm 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/postrm 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,62 @@
+#! /bin/sh
+# postrm script for ccm-cms-types-newsitem
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postrm,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+db_get_ccm_settings
+
+get_pkgname_from_arg "$0"
+ccm_package_name="$RET"
+get_pkgversion_from_dpkg "$ccm_package_name"
+ccm_package_version="$RET"
+
+if [ "$ccm_package_name" != "ccm-core" ]; then
+ exit 0 ;# nothing to do
+fi
+
+case "$1" in
+ purge-FIXME)
+ # FIXME: there are problems with this, so disabling for the moment.
+
+ # maybe drop the database
+ if [ "$dbase_host" = "localhost" ]; then
+
+ db_input high ccm/shared/pg_drop_database_at_purge_p || true
+ db_go
+ db_stop
+
+ if [ "$pg_drop_database_at_purge_p" = "true" ]; then
+ su - postgres -c "dropdb $dbase_name" 1>&2 || true
+ su - postgres -c "dropuser $dbase_user" 1>&2 || true
+ fi
+
+ fi
+
+ # FIXME: should we still remove /etc/ccm/conf/registry/registry.properties,
+ # even if we don't or fail to drop the database.
+ rm -rf /etc/ccm/conf/registry/*
+ ;;
+
+ *)
+ # Nothing to do here.
+ ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/ccm-cms-types-newsitem/debian/prerm
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/prerm 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/prerm 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,60 @@
+#! /bin/sh
+# prerm script for ccm-cms-types-newsitem
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: prerm,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+db_get_ccm_settings ; db_stop
+
+get_pkgname_from_arg "$0"
+ccm_package_name="$RET"
+get_pkgversion_from_dpkg "$ccm_package_name"
+ccm_package_version="$RET"
+
+case "$1" in
+ remove|purge|upgrade|deconfigure)
+
+ ccm_update_ccm_classpath remove $ccm_package_name $ccm_package_version
+ ccm_update_ccm_webapps remove $ccm_package_name $ccm_package_version
+ ;;
+
+ failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+if [ "$1" = "remove" -a "$ccm_package_name" = "ccm-core" -a -x "/etc/init.d/ccm" ]; then
+ invoke-rc.d ccm stop || true
+fi
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Added: trunk/ccm-cms-types-newsitem/debian/rules
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/rules 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/rules 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+# debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
+#
+# This version is for packages that are architecture independent.
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: rules,v 1.1.1.1 2004/11/12 09:30:00 fabrice Exp $
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build.xml:
+ dh_testdir
+ # Add here commands to configure the package.
+ @sh debian/ccm-config.sh
+
+build: build-stamp
+build-stamp: build.xml
+ dh_testdir
+
+ # Add here commands to compile the package.
+ @sh debian/ccm-build.sh
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ @sh debian/ccm-clean.sh
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/<packagename>.
+ @sh debian/ccm-install.sh $(CURDIR)/debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ @sh debian/ccm-disperse.sh debian/tmp
+# dh_install --sourcedir=debian/tmp
+# dh_installmenu
+ dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+# dh_undocumented
+ dh_installman
+ dh_link
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: trunk/ccm-cms-types-newsitem/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-cms-types-newsitem/debian/templates
===================================================================
--- trunk/ccm-cms-types-newsitem/debian/templates 2006-06-14 12:27:28 UTC (rev 1165)
+++ trunk/ccm-cms-types-newsitem/debian/templates 2006-06-14 12:30:15 UTC (rev 1166)
@@ -0,0 +1,207 @@
+Template: ccm/debconf/version
+Type: string
+Default: $Id: templates,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+Description: The version of the debconf template
+ Author: Berkan Eskikaya <be...@ru...>, 2004
+ .
+ $Id: templates,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+Template: ccm/package_name
+Type: string
+Default: ccm-cms-types-newsitem
+Description: The name of the package
+ This is syntetic sugar.
+
+Template: ccm/package_version
+Type: string
+Default: 6.3.0
+Description: The version of the package
+ This is synthetic sugar.
+
+Template: ccm/shared/dbase_type
+Type: select
+Choices: postgresql
+Default: postgresql
+Description: Database backend:
+ Please choose a database backend. At the moment, you could only select PostgreSQL.
+
+Template: ccm/shared/dbase_host
+Type: string
+Default: localhost
+Description: Database host:
+ Please specify the host that the database runs on.
+
+Template: ccm/shared/dbase_name
+Type: string
+Default: ccm01.db
+Description: Database name:
+ Please specify the name of the APLAWS database.
+
+Template: ccm/shared/dbase_user
+Type: string
+Default: ccm
+Description: Database user name:
+ Please specify the database account for the APLAWS database.
+
+Template: ccm/shared/dbase_password
+Type: password
+Default: ccmpwd
+Description: Database password:
+ Please choose a password for the APLAWS database account.
+
+Template: ccm/shared/waf_runtime_jdbc_url
+Type: string
+Default: jdbc:postgresql://localhost/ccm01.db?user=ccm&password=ccmpwd
+Description: JDBC connection URL:
+ The WAF runtime uses this value to connect to a database.
+ .
+ Format: jdbc:[subprotocol]:[subname]
+ .
+ Example: jdbc:postgresql://localhost/ccm01.db?user=ccm&password=ccmpwd
+
+Template: ccm/shared/waf_web_server
+Type: string
+Default: localhost:9090
+Description: Server virtual host:
+ Please specify the hostname and port that users of a site will
+ see in URLs generated by WAF.
+ .
+ Format: [server hostname]:[port number]
+ .
+ Example: example.com:80
+
+Template: ccm/shared/waf_admin_email
+Type: string
+Default:
+Description: Administrator Email Address:
+ Please specify the system administrator account.
+ .
+ Format: <user>@<domain>
+ .
+ Example: jo...@ex...
+
+Template: ccm/shared/waf_admin_name_given
+Type: string
+Default:
+Description: Administrator First Name:
+ Please specify the name of the system administrator.
+
+Template: ccm/shared/waf_admin_name_family
+Type: string
+Default:
+Description: Administrator Last Name:
+ Please specify the surname of the system administrator.
+
+Template: ccm/shared/waf_admin_password
+Type: password
+Default:
+Description: Administrator Password
+ Please choose a password for the system administrator account.
+
+Template: ccm/shared/waf_admin_password_question
+Type: string
+Default: The name of your primary school
+Description: Administrator Password Question:
+ This question will be asked when the password to the system administrator
+ account is lost and access must be recovered.
+ .
+ Please only use letters and numbers.
+
+Template: ccm/shared/waf_admin_password_answer
+Type: string
+Default:
+Description: Administrator Password Answer:
+ Now specify the correct answer to the Administrator Password Question.
+ .
+ Please only use letters and numbers.
+
+Template: ccm/shared/ccm_load_apps_at_install_p
+Type: boolean
+Default: true
+Description: Load CCM applications as they install?
+ You could choose to load CCM applications into the database
+ automatically after they are installed, or you could load them
+ manually [with 'ccm load'] yourself.
+ .
+ The former will save you some manual work, while the latter is probably
+ most suited if you are trying to build the applications from the
+ sources and prefer to load them once all are built and installed.
+
+Template: ccm/shared/pg_set_up_database_p
+Type: boolean
+Default: true
+Description: Do you want me to set up the CCM database and adjust the access permissions?
+ You have specified a database on your localhost. I could set it up
+ for you and automatically adjust the access permissions. I could do
+ this independently of whether or not you have choosen to load the
+ applications at install time.
+ .
+ Say no here if you have already prepared the CCM database yourself
+ or if you would like to do it later. Saying yes will save you some
+ manual work.
+
+Template: ccm/shared/pg_drop_database_at_purge_p
+Type: boolean
+Default: true
+Description: Do you want me to drop the CCM database?
+
+
+Template: ccm/shared/error_etc_ccm_missing_dir
+Type: note
+Description: CCM configuration directory does not exist.
+ I couldn't find the CCM configuration directory: /etc/ccm.
+ .
+ This probably points at a corrupt or unusual CCM installation. The ccm-tools
+ package creates this directory --- please verify that it is installed and
+ intact.
+ .
+ I will continue with the configuration by re-creating the directory,
+ but we may experience problems later.
+
+Template: ccm/shared/ccm_aux_setupdb_failed
+Type: note
+Description: ccm-aux-setupdb couldn't complete.
+ The helper script ccm-aux-setupdb didn't succeed.
+ This means that the CCM database couldn't be set up.
+ .
+ If you have answered yes to the automatic loading of
+ applications at install time, I will still try to honour
+ that.
+ .
+ In case that doesn't succeed [likely now], please manually
+ prepare the database and load the application(s) after the
+ installation.
+
+Template: ccm/shared/ccm_aux_update_hba_conf_failed
+Type: note
+Description: ccm-aux-update-hba-conf couldn't complete.
+ The helper script ccm-aux-update-hba-conf didn't succeed.
+ This means that the access permissions for the ccm database
+ couldn't be set up.
+ .
+ If you have answered yes to the automatic loading of
+ applications at install time, I will still try to honour
+ that.
+ .
+ In case that doesn't succeed [likely now], please manually
+ check/edit the pg_hba.conf file of your PostgreSQL instance
+ and load the application(s) after the installation.
+
+Template: ccm/shared/error_ccm_tool_not_found
+Type: note
+Description: The 'ccm' tool not found.
+ I need the 'ccm' tool [/usr/bin/ccm] to continue but I cannot find it.
+ .
..
|
|
From: <fa...@vh...> - 2006-06-14 12:32:03
|
Author: fabrice
Date: 2006-06-14 14:27:28 +0200 (Wed, 14 Jun 2006)
New Revision: 1165
Added:
trunk/ccm-cms-types-mparticle/debian/
trunk/ccm-cms-types-mparticle/debian/ccm-build.sh
trunk/ccm-cms-types-mparticle/debian/ccm-clean.sh
trunk/ccm-cms-types-mparticle/debian/ccm-cms-types-mparticle.dirs
trunk/ccm-cms-types-mparticle/debian/ccm-config.sh
trunk/ccm-cms-types-mparticle/debian/ccm-disperse.sh
trunk/ccm-cms-types-mparticle/debian/ccm-install.sh
trunk/ccm-cms-types-mparticle/debian/ccm-settings-run.sh
trunk/ccm-cms-types-mparticle/debian/ccm-settings.sh
trunk/ccm-cms-types-mparticle/debian/changelog
trunk/ccm-cms-types-mparticle/debian/compat
trunk/ccm-cms-types-mparticle/debian/config
trunk/ccm-cms-types-mparticle/debian/control
trunk/ccm-cms-types-mparticle/debian/copyright
trunk/ccm-cms-types-mparticle/debian/postinst
trunk/ccm-cms-types-mparticle/debian/postrm
trunk/ccm-cms-types-mparticle/debian/prerm
trunk/ccm-cms-types-mparticle/debian/rules
trunk/ccm-cms-types-mparticle/debian/templates
Modified:
trunk/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java
trunk/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleSectionURLFinder.java
trunk/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/ArticleSectionPanel.java
Log:
ability to set MPAs as index items
Added: trunk/ccm-cms-types-mparticle/debian/ccm-build.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-build.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-build.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-build.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+# for eg Oracle jar
+CLASSPATH=./lib/:$CLASSPATH
+$ANT build-${name}
Added: trunk/ccm-cms-types-mparticle/debian/ccm-clean.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-clean.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-clean.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-clean.sh,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+[ -f build.xml ] && $ANT clean-${appname}
+
+rm -rf build build.xml ccm.classpath
+
+# ccm-disperse.sh creates the .install files automatically, so let's clean them too.
+
+rm -f ${appname}.install ${appname}-doc.install
Added: trunk/ccm-cms-types-mparticle/debian/ccm-cms-types-mparticle.dirs
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-cms-types-mparticle.dirs 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-cms-types-mparticle.dirs 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1 @@
+usr/share/java/ccm-cms-types-mparticle-6.3.0
Added: trunk/ccm-cms-types-mparticle/debian/ccm-config.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-config.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-config.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-config.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+if [ ! -L $name ]; then
+ ln -s . $name
+fi
+ccm-create-projectxml.pl > project.xml
+ccm-configure.sh
Added: trunk/ccm-cms-types-mparticle/debian/ccm-disperse.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-disperse.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-disperse.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-disperse.sh,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+SRCDIR="$1"
+[ "x$SRCDIR" != "x" ] || exit 1
+
+# automatically generate the .install file lists for dh_install:
+
+(cd $SRCDIR && find . -type f \
+ | grep -v DEBIAN \
+ | grep -v var/www/html \
+ | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}.install
+
+(cd $SRCDIR && find . -type f -path './var/www/html/*' \
+ | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}-doc.install
+
+# for some reason, dh_install doesn't work properly; let's disperse the files ourselves:
+
+for pkg in ${name} ${name}-doc; do
+ # skip this package if mentioned in CCM_DEBIAN_NO_PACKAGES
+ [ `echo $CCM_DEBIAN_NO_PACKAGES | tr ' ' '\n' | grep -c "^${pkg}$"` -eq 1 ] && continue || true
+
+ # this should exist [due to dh_installdocs, dh_installchangelog], but just in case...
+ mkdir -p debian/$pkg
+
+ [ -e debian/${pkg}.install ] && \
+ echo -n "Dispersing files to debian/$pkg/ ... " && \
+ for file in `cat debian/${pkg}.install`; do
+ dir=`dirname $file`
+ mkdir -p debian/$pkg/$dir
+ cp $SRCDIR/$file debian/$pkg/$dir/
+ done
+ echo "done."
+done
Added: trunk/ccm-cms-types-mparticle/debian/ccm-install.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-install.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-install.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-install.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+DESTDIR="$1"
+[ "xDESTDIR" != "x" ] || exit 1
+
+rm -rf $DESTDIR
+mkdir -p $DESTDIR
+mkdir -p $DESTDIR${confdir}
+mkdir -p $DESTDIR/var/www/html/${name}-${version}
+
+ANT_OPTS="-Dapps.${name}.version=${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.conf.dir=$DESTDIR${confdir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.shared.lib.dir=$DESTDIR${sharedjardir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.private.lib.dir=$DESTDIR${sharedjardir}/${name}-${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.webapp.dir=$DESTDIR${webappdir}/${name}-${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.system.jars.dir=$DESTDIR${sharedjardir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.api.dir.${appname}=$DESTDIR/var/www/html/${name}-${version}/api"
+ANT_OPTS="$ANT_OPTS -Ddeploy.shared.classes.dir=$DESTDIR/tmp/${name}-${version}"
+export ANT_OPTS
+
+$ANT deploy-jar-classes-${appname}
+$ANT deploy-${appname}
+
+rm -rf "$DESTDIR/tmp"
+
+
+# only generate and deploy javadocs if we didn't specify otherwise in CCM_DEBIAN_NO_JAVADOC
+
+GENERATE_JAVADOC=true
+if [ `echo $CCM_DEBIAN_NO_JAVADOC | tr ' ' '\n' | grep -c "^${name}-doc$"` -eq 1 ]; then
+ GENERATE_JAVADOC=false
+fi
+
+if [ -d ${appname}/src ]; then
+ $ANT deploy-jar-classes-${appname}
+ [ "$GENERATE_JAVADOC" == "true" ] && $ANT deploy-javadoc-${appname} || true
+fi
Added: trunk/ccm-cms-types-mparticle/debian/ccm-settings-run.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-settings-run.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-settings-run.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+# say which app to compile, amongst those specified in the project.xml
+export CCM_APP=$name
+
+# do some checks
+
+check_JAVA_HOME
+
+if [ "$name" = "ccm-core" ]; then
+ check_ORACLE_JDBC_LIB
+fi
+
+
+# set the environment
+
+for file in `echo /etc/profile.d/ccm-{tools,devel,scripts}.sh`; do
+ . $file
+done
+
+cd ..
+. $CCM_SCRIPTS_HOME/bin/env-conf.sh ${appname} > /dev/null
+cd -
+export CCM_HOME=`pwd`
+
+if which classic-ant > /dev/null 2>&1; then
+ ANT=classic-ant
+else
+ ANT=ant
+fi
+
+
+# perhaps we don't like to build some packages -- get them from DH_OPTIONS
+
+export CCM_DEBIAN_NO_PACKAGES=`echo $DH_OPTIONS | tr -s ' ' '\n' | grep -E '(-N|--no-package=)' | xargs | sed -re 's/(-N|--no-package)//g'`
+
+# for now, assume that if we don't want to build some packages then we don't
+# want to generate javadocs for them either
+
+export CCM_DEBIAN_NO_JAVADOC="$CCM_DEBIAN_NO_JAVADOC $CCM_DEBIAN_NO_PACKAGES"
Property changes on: trunk/ccm-cms-types-mparticle/debian/ccm-settings-run.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-cms-types-mparticle/debian/ccm-settings.sh
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/ccm-settings.sh 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/ccm-settings.sh 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+# source the shell library [for the check_* functions]
+# FIXME: ugly-looking hack.
+orig_DEBIAN_HAS_FRONTEND=$DEBIAN_HAS_FRONTEND
+DEBIAN_HAS_FRONTEND=1
+. /usr/share/ccm-tools/lib/shellmodule
+DEBIAN_HAS_FRONTEND=$orig_DEBIAN_HAS_FRONTEND
+
+
+# variables we use [especially in ccm-install.sh]
+
+name=ccm-cms-types-mparticle
+version=6.3.0
+appname=ccm-cms-types-mparticle
+appversion=6.3.0
+confdir="/etc/ccm/conf"
+sharedjardir="/usr/share/java"
+webappdir="/usr/share/java/webapps"
+ccmclasspathfile="ccm/ccm.classpath"
+ccmwebappfile="ccm/ccm.webapps"
+
+. debian/ccm-settings-run.sh
Added: trunk/ccm-cms-types-mparticle/debian/changelog
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/changelog 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/changelog 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,94 @@
+ccm-cms-types-mparticle (6.3.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.2.0 to 6.3.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 13:51:58 +0000
+
+ccm-cms-types-mparticle (6.2.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.1.1 to 6.2.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 12:30:08 +0000
+
+ccm-cms-types-mparticle (6.1.1-6) unstable; urgency=low
+
+ * Refactoring MPA/SiteProxy as index item patch, adding 404s for invalid
+ category hits
+
+ -- My <my...@fi...> Thu, 28 Jul 2005 12:26:46 +0000
+
+ccm-cms-types-mparticle (6.1.1-5) unstable; urgency=low
+
+ * 18269 - getting search results on section to work on postgres
+
+ -- My <my...@fi...> Mon, 25 Jul 2005 11:12:58 +0000
+
+ccm-cms-types-mparticle (6.1.1-4) unstable; urgency=low
+
+ * SiteProxy as index items
+
+ -- My <my...@fi...> Fri, 24 Jun 2005 09:21:26 +0000
+
+ccm-cms-types-mparticle (6.1.1-3) unstable; urgency=low
+
+ * MPAs as index items
+
+ -- My <my...@fi...> Thu, 23 Jun 2005 15:37:52 +0000
+
+ccm-cms-types-mparticle (6.1.1-2) unstable; urgency=low
+
+ * Final (?) fix for dublincore dates, #17509
+
+ -- My <my...@fi...> Wed, 18 May 2005 08:30:29 +0000
+
+ccm-cms-types-mparticle (6.1.1-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.1.0 to 6.1.1
+
+ -- Runtime Collective Ltd. <in...@ru...> Thu, 31 Mar 2005 11:59:53 +0000
+
+ccm-cms-types-mparticle (6.1.0-5) unstable; urgency=low
+
+ * Depend on j2sdk1.4 | java2-compiler
+ * Update to policy 3.6.1
+ * Change maintainer to the mailing list and add uploaders
+
+ -- David Pashley <da...@ru...> Mon, 14 Feb 2005 14:59:28 +0000
+
+ccm-cms-types-mparticle (6.1.0-4) unstable; urgency=low
+
+ * debian/postrm: disabled the purge operations [had some weird problems].
+ * updated the debian control scripts to get the package name and version from their invocation.
+
+ -- Berkan Eskikaya <be...@ru...> Mon, 10 May 2004 12:33:33 +0100
+
+ccm-cms-types-mparticle (6.1.0-3) unstable; urgency=low
+
+ * debian/templates: made load-at-install and setup-database-at-install the default behaviour.
+ * debian/postinst: ccm_hostinit will try to use web.xml-aplaws from ccm-ldn-aplaws.
+ * debian/ccm-settings.sh: correct checking/setting of ORACLE_JDBC_LIB [Chris].
+ * debian/templates: changed the default postgresql database and user names to "ccm01.db" and "ccm".
+ * debian/config: added detection of the hostname of the machine and possibly the user's email.
+ * major restructuring of the debian scripts: moved all utility functions to ccm-tools and made postinst, postrm, prerm and ccm-settings.sh source and use that file.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 7 May 2004 13:04:43 +0100
+
+ccm-cms-types-mparticle (6.1.0-2) unstable; urgency=low
+
+ * The build process now tries to automatically detect JAVA_HOME and the location of Oracle's java library.
+ * debian/ccm-clean.sh: only calls the ant process if build.xml exists.
+ * debian/{postinst,prerm,config,templates}: added debconf support
+ * debian/postinst: accepts 'reconfigure' and treats it as 'configure'.
+ * debian/postinst: added postgresql.jar to CLASSPATH; added libpgjava to the dependencies.
+ * debian/postinst: removed some bashisms upon recommendation from lintian.
+ * debian/rules: enabled dh_installdebconf.
+ * debian/control: made the package depend on debconf.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 1 May 2004 15:41:43 +0100
+
+
+ccm-cms-types-mparticle (6.1.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 24 Apr 2004 12:27:56 +0100
Added: trunk/ccm-cms-types-mparticle/debian/compat
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/compat 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/compat 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1 @@
+4
Added: trunk/ccm-cms-types-mparticle/debian/config
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/config 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/config 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: config,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_capb backup
+
+HOSTNAME=`hostname -f` 2>/dev/null || true
+
+if [ -n "$HOSTNAME" ]; then
+ db_metaget ccm/shared/waf_web_server default || true
+ PORTNUM=`echo $RET | cut -d: -f2`
+ db_set ccm/shared/waf_web_server "$HOSTNAME:$PORTNUM" || true
+fi
+
+if [ -n "$EMAIL" ]; then
+ db_set ccm/shared/waf_admin_email "$EMAIL" || true
+fi
+
+
+STATE=1
+LASTSTATE=5
+
+while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
+ case "$STATE" in
+ 1)
+ # Database questions
+ db_input high ccm/shared/dbase_type || true
+ db_input high ccm/shared/dbase_host || true
+ db_input high ccm/shared/dbase_name || true
+ db_input high ccm/shared/dbase_user || true
+ db_input high ccm/shared/dbase_password || true
+
+ ;;
+ 2)
+ # Server address
+ db_input high ccm/shared/waf_web_server || true
+ ;;
+ 3)
+ # Admin questions
+ db_input high ccm/shared/waf_admin_email || true
+ db_input high ccm/shared/waf_admin_name_given || true
+ db_input high ccm/shared/waf_admin_name_family || true
+ db_input high ccm/shared/waf_admin_password || true
+ db_input high ccm/shared/waf_admin_password_question || true
+ db_input high ccm/shared/waf_admin_password_answer || true
+ ;;
+ 4)
+ # When to load the applications
+ db_input medium ccm/shared/ccm_load_apps_at_install_p || true
+ ;;
+ 5)
+ # Whether to set up the [local] database
+ db_get ccm/shared/dbase_host || true
+ if [ "$RET" = "localhost" ]; then
+ db_input medium ccm/shared/pg_set_up_database_p || true
+ fi
+ ;;
+
+ # Add additional states here, making sure to
+ # increment LASTSTATE.
+ esac
+
+ if db_go; then
+ STATE=$(($STATE + 1))
+ else
+ STATE=$(($STATE - 1))
+ fi
+done
+
+
+db_go || true
+
+db_stop
+
Added: trunk/ccm-cms-types-mparticle/debian/control
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/control 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/control 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,21 @@
+Source: ccm-cms-types-mparticle
+Section: contrib/web
+Priority: optional
+Maintainer: Runtime Packaging <run...@ru...>
+Uploaders: David Pashley <da...@ru...>
+Build-Depends-Indep: debhelper (>= 4.0.0), j2re1.4 | java2-runtime, j2sdk1.4 | java2-compiler, ant, libservlet2.3-java, libpgjava, debconf, po-debconf, ccm-tools, ccm-devel, ccm-scripts, ccm-core, ccm-cms
+Standards-Version: 3.6.1
+
+Package: ccm-cms-types-mparticle
+Architecture: all
+Depends: java-virtual-machine-dummy | j2sdk1.4 | java-virtual-machine, ccm-tools, ccm-servlet-container, libservlet2.3-java, libpgjava, liblog4j1.2-java , ccm-core, ccm-cms
+Description: APLAWS: The Multi-Part Article content type for publishing complex articles with multiple sections and images.
+ This package contains the Red Hat CCM Content Types application for APLAWS.
+ .
+ FIXME: We need a longer and more meaningful description here.
+
+Package: ccm-cms-types-mparticle-doc
+Architecture: all
+Depends: ccm-tools
+Description: Documentation for ccm-cms-types-mparticle
+ Documentation for ccm-cms-types-mparticle. Provides the JavaDoc API documentation.
Added: trunk/ccm-cms-types-mparticle/debian/copyright
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/copyright 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/copyright 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,15 @@
+This package was debianized by Berkan Eskikaya <be...@ru...> on
+Tue, 13 Apr 2004 19:03:14 +0100.
+
+It was downloaded from http://aplaws.sourceforge.net/
+
+Upstream Authors: Redhat UK.
+
+Copyright:
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'.
+
+
Added: trunk/ccm-cms-types-mparticle/debian/postinst
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/postinst 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/postinst 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,112 @@
+#! /bin/sh
+# postinst script for ccm-cms-types-mparticle
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postinst,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure|reconfigure)
+ # FIXME: we need to be sensitive to upgrade operations here.
+ # basically, if pkgversion = appversion, then the datamodel
+ # hasn't changed -- we just configure the package and don't
+ # touch the database; else, we need to also update the
+ # datamodel in the database.
+
+
+ ### get the settings for the operations below
+
+ ccm_set_env
+ db_get_ccm_settings ;# db_stop
+
+ get_pkgname_from_arg "$0"
+ ccm_package_name="$RET"
+ get_pkgversion_from_dpkg "$ccm_package_name"
+ ccm_package_version="$RET"
+
+
+ ### do the usual post-installion configuration
+
+ if [ ! -d "/etc/ccm" ]; then
+ db_message "ccm/shared/error_etc_ccm_missing_dir"
+ mkdir -p "/etc/ccm"
+ fi
+
+ ccm_update_ccm_classpath add $ccm_package_name $ccm_package_version
+ ccm_update_ccm_webapps add $ccm_package_name $ccm_package_version
+ ccm_update_file_attributes $ccm_package_name $ccm_package_version
+
+
+ ### try to set up the database if asked to do so
+
+ if [ "$pg_set_up_database_p" = "true" ]; then
+ pg_set_up_database
+ fi
+
+
+ ### try to load the application if asked to do so
+
+ if [ "$ccm_load_apps_at_install_p" = "true" -a -n "$JAVA_HOME" ]; then
+ ccm_load
+ fi
+
+
+ ### run the hostinit step
+
+ if [ -n "$JAVA_HOME" ]; then
+ tomcat_http_port=`echo $waf_web_server | cut -d':' -f2` || true
+ tomcat_shutdown_port=`expr $tomcat_http_port + 1` || true
+ ccm_host_init tomcat $tomcat_http_port $tomcat_shutdown_port
+ fi
+
+
+ ### don't give others the registry details [eg the database password] on a golden plate
+ # FIXME: this interferes with "ccm load" updating the registry. Need to find the right ownership.
+ # chmod -R o-rwx /etc/ccm/conf/registry || true
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Added: trunk/ccm-cms-types-mparticle/debian/postrm
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/postrm 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/postrm 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,62 @@
+#! /bin/sh
+# postrm script for ccm-cms-types-mparticle
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postrm,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+db_get_ccm_settings
+
+get_pkgname_from_arg "$0"
+ccm_package_name="$RET"
+get_pkgversion_from_dpkg "$ccm_package_name"
+ccm_package_version="$RET"
+
+if [ "$ccm_package_name" != "ccm-core" ]; then
+ exit 0 ;# nothing to do
+fi
+
+case "$1" in
+ purge-FIXME)
+ # FIXME: there are problems with this, so disabling for the moment.
+
+ # maybe drop the database
+ if [ "$dbase_host" = "localhost" ]; then
+
+ db_input high ccm/shared/pg_drop_database_at_purge_p || true
+ db_go
+ db_stop
+
+ if [ "$pg_drop_database_at_purge_p" = "true" ]; then
+ su - postgres -c "dropdb $dbase_name" 1>&2 || true
+ su - postgres -c "dropuser $dbase_user" 1>&2 || true
+ fi
+
+ fi
+
+ # FIXME: should we still remove /etc/ccm/conf/registry/registry.properties,
+ # even if we don't or fail to drop the database.
+ rm -rf /etc/ccm/conf/registry/*
+ ;;
+
+ *)
+ # Nothing to do here.
+ ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/ccm-cms-types-mparticle/debian/prerm
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/prerm 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/prerm 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,60 @@
+#! /bin/sh
+# prerm script for ccm-cms-types-mparticle
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: prerm,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+db_get_ccm_settings ; db_stop
+
+get_pkgname_from_arg "$0"
+ccm_package_name="$RET"
+get_pkgversion_from_dpkg "$ccm_package_name"
+ccm_package_version="$RET"
+
+case "$1" in
+ remove|purge|upgrade|deconfigure)
+
+ ccm_update_ccm_classpath remove $ccm_package_name $ccm_package_version
+ ccm_update_ccm_webapps remove $ccm_package_name $ccm_package_version
+ ;;
+
+ failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+if [ "$1" = "remove" -a "$ccm_package_name" = "ccm-core" -a -x "/etc/init.d/ccm" ]; then
+ invoke-rc.d ccm stop || true
+fi
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Added: trunk/ccm-cms-types-mparticle/debian/rules
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/rules 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/rules 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+# debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
+#
+# This version is for packages that are architecture independent.
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: rules,v 1.1.1.1 2004/11/12 09:30:00 fabrice Exp $
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build.xml:
+ dh_testdir
+ # Add here commands to configure the package.
+ @sh debian/ccm-config.sh
+
+build: build-stamp
+build-stamp: build.xml
+ dh_testdir
+
+ # Add here commands to compile the package.
+ @sh debian/ccm-build.sh
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ @sh debian/ccm-clean.sh
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/<packagename>.
+ @sh debian/ccm-install.sh $(CURDIR)/debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ @sh debian/ccm-disperse.sh debian/tmp
+# dh_install --sourcedir=debian/tmp
+# dh_installmenu
+ dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+# dh_undocumented
+ dh_installman
+ dh_link
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: trunk/ccm-cms-types-mparticle/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-cms-types-mparticle/debian/templates
===================================================================
--- trunk/ccm-cms-types-mparticle/debian/templates 2006-06-14 11:45:15 UTC (rev 1164)
+++ trunk/ccm-cms-types-mparticle/debian/templates 2006-06-14 12:27:28 UTC (rev 1165)
@@ -0,0 +1,207 @@
+Template: ccm/debconf/version
+Type: string
+Default: $Id: templates,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+Description: The version of the debconf template
+ Author: Berkan Eskikaya <be...@ru...>, 2004
+ .
+ $Id: templates,v 1.1.1.1 2004/11/12 09:30:09 fabrice Exp $
+
+Template: ccm/package_name
+Type: string
+Default: ccm-cms-types-mparticle
+Description: The name of the package
+ This is syntetic sugar.
+
+Template: ccm/package_version
+Type: string
+Default: 6.3.0
+Description: The version of the package
+ This is synthetic sugar.
+
+Template: ccm/shared/dbase_type
+Type: select
+Choices: postgresql
+Default: postgresql
+Description: Database backend:
+ Please choose a database backend. At the moment, you could only select PostgreSQL.
+
+Template: ccm/shared/dbase_host
+Type: string
+Default: localhost
+Description: Database host:
+ Please specify the host that the database runs on.
+
+Template: ccm/shared/dbase_name
+Type: string
+Default: ccm01.db
+Description: Database name:
+ Please specify the name of the APLAWS database.
+
+Template: ccm/shared/dbase_user
+Type: string
+Default: ccm
+Description: Database user name:
+ Please specify the database account for the APLAWS database.
+
+Template: ccm/shared/dbase_password
+Type: password
+Default: ccmpwd
+Description: Database password:
+ Please choose a password for the APLAWS database account.
+
+Template: ccm/shared/waf_runtime_jdbc_url
+Type: string
+Default: jdbc:postgresql://localhost/ccm01.db?user=ccm&password=ccmpwd
+Description: JDBC connection URL:
+ The WAF runtime uses this value to connect to a database.
+ .
+ Format: jdbc:[subprotocol]:[subname]
+ .
+ Example: jdbc:postgresql://localhost/ccm01.db?user=ccm&password=ccmpwd
+
+Template: ccm/shared/waf_web_server
+Type: string
+Default: localhost:9090
+Description: Server virtual host:
+ Please specify the hostname and port that users of a site will
+ see in URLs generated by WAF.
+ .
+ Format: [server hostname]:[port number]
+ .
+ Example: example.com:80
+
+Template: ccm/shared/waf_admin_email
+Type: string
+Default:
+Description: Administrator Email Address:
+ Please specify the system administrator account.
+ .
+ Format: <user>@<domain>
+ .
+ Example: jo...@ex...
+
+Template: ccm/shared/waf_admin_name_given
+Type: string
+Default:
+Description: Administrator First Name:
+ Please specify the name of the system administrator.
+
+Template: ccm/shared/waf_admin_name_family
+Type: string
+Default:
+Description: Administrator Last Name:
+ Please specify the surname of the system administrator.
+
+Template: ccm/shared/waf_admin_password
+Type: password
+Default:
+Description: Administrator Password
+ Please choose a password for the system administrator account.
+
+Template: ccm/shared/waf_admin_password_question
+Type: string
+Default: The name of your primary school
+Description: Administrator Password Question:
+ This question will be asked when the password to the system administrator
+ account is lost and access must be recovered.
+ .
+ Please only use letters and numbers.
+
+Template: ccm/shared/waf_admin_password_answer
+Type: string
+Default:
+Description: Administrator Password Answer:
+ Now specify the correct answer to the Administrator Password Question.
+ .
+ Please only use letters and numbers.
+
+Template: ccm/shared/ccm_load_apps_at_install_p
+Type: boolean
+Default: true
+Description: Load CCM applications as they install?
+ You could choose to load CCM applications into the database
+ automatically after they are installed, or you could load them
+ manually [with 'ccm load'] yourself.
+ .
+ The former will save you some manual work, while the latter is probably
+ most suited if you are trying to build the applications from the
+ sources and prefer to load them once all are built and installed.
+
+Template: ccm/shared/pg_set_up_database_p
+Type: boolean
+Default: true
+Description: Do you want me to set up the CCM database and adjust the access permissions?
+ You have specified a database on your localhost. I could set it up
+ for you and automatically adjust the access permissions. I could do
+ this independently of whether or not you have choosen to load the
+ applications at install time.
+ .
+ Say no here if you have already prepared the CCM database yourself
+ or if you would like to do it later. Saying yes will save you some
+ manual work.
+
+Template: ccm/shared/pg_drop_database_at_purge_p
+Type: boolean
+Default: true
+Description: Do you want me to drop the CCM database?
+
+
+Template: ccm/shared/error_etc_ccm_missing_dir
+Type: note
+Description: CCM configuration directory does not exist.
+ I couldn't find the CCM configuration directory: /etc/ccm.
+ .
+ This probably points at a corrupt or unusual CCM installation. The ccm-tools
+ package creates this directory --- please verify that it is installed and
+ intact.
+ .
+ I will continue with the configuration by re-creating the directory,
+ but we may experience problems later.
+
..
|
|
From: <fa...@vh...> - 2006-06-14 11:49:55
|
Author: fabrice
Date: 2006-06-14 13:45:15 +0200 (Wed, 14 Jun 2006)
New Revision: 1164
Added:
trunk/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderAllContent.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderContent.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/LevelOneFolderHierarchyNav.java
Modified:
trunk/ccm-cms/application.xml
trunk/ccm-cms/src/ccm-cms.upgrade
trunk/ccm-cms/src/com/arsdigita/cms/ContentItem.java
trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java
trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java
trunk/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties
trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java
trunk/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl
trunk/ccm-cms/web/__ccm__/static/cms/admin/page/page.xsl
Log:
* option for links to open in new windows
* when editing categories, option to see links to edit/view their index item
* option for links to only refer to items in the same subsite
* ability to set MPAs etc as index items
* minor fixes
Modified: trunk/ccm-cms/application.xml
===================================================================
--- trunk/ccm-cms/application.xml 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/application.xml 2006-06-14 11:45:15 UTC (rev 1164)
@@ -3,10 +3,10 @@
name="ccm-cms"
prettyName="Red Hat CCM Content Management System"
version="6.3.0"
- release="6"
+ release="14"
webapp="ROOT">
<ccm:dependencies>
- <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
+ <ccm:requires name="ccm-core" version="6.3.0" relation="ge"/>
</ccm:dependencies>
<ccm:contacts>
<ccm:contact uri="http://www.redhat.com/software/ccm" type="website"/>
Modified: trunk/ccm-cms/src/ccm-cms.upgrade
===================================================================
--- trunk/ccm-cms/src/ccm-cms.upgrade 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/ccm-cms.upgrade 2006-06-14 11:45:15 UTC (rev 1164)
@@ -1,4 +1,7 @@
<upgrade>
+ <version from="6.0.0" to="6.0.1">
+ <script sql="ccm-cms/upgrade/::database::-6.0.0-6.0.1.sql"/>
+ </version>
<version from="6.0.1" to="6.1.0">
<script sql="ccm-cms/upgrade/::database::-6.0.1-6.1.0.sql"/>
</version>
@@ -8,6 +11,9 @@
<version from="6.1.1" to="6.2.0">
<script sql="ccm-cms/upgrade/::database::-6.1.1-6.2.0.sql"/>
</version>
+ <version from="6.2.0" to="6.2.1">
+ <script sql="ccm-cms/upgrade/::database::-6.2.0-6.2.1.sql"/>
+ </version>
<version from="6.3.0" to="6.3.1">
<script sql="ccm-cms/upgrade/::database::-6.3.0-6.3.1.sql"/>
</version>
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentItem.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentItem.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentItem.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -65,6 +65,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Set;
/**
@@ -2068,4 +2069,15 @@
public String getLastModifiedIP() {
return m_audit_trail.getLastModifiedIP();
}
+
+ protected static List extraXMLGenerators = new ArrayList();
+
+ /**
+ * Override this to explicit that your content items
+ * have extra XML to generate.
+ * ATM This is used in navigation for GreetingItems.
+ */
+ public List getExtraXMLGenerators() {
+ return extraXMLGenerators;
+ }
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -20,6 +20,7 @@
import com.arsdigita.bebop.form.DHTMLEditor;
import com.arsdigita.bebop.SimpleComponent;
+import com.arsdigita.cms.ExtraXMLGenerator;
import com.arsdigita.cms.dispatcher.DefaultTemplateResolver;
import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.cms.dispatcher.MultilingualItemResolver;
@@ -102,6 +103,7 @@
private final Parameter m_soonExpiredTimespanDays;
private final Parameter m_defaultTaskAlerts;
private final Parameter m_unpublishedNotFound;
+ private final Parameter m_linksOnlyInSameSubsite;
/**
* Do not instantiate this class directly.
@@ -127,6 +129,10 @@
PublishToFile.class,
PublishToFileListener.class);
+ m_linksOnlyInSameSubsite = new BooleanParameter
+ ("com.arsdigita.cms.browse_links_in_same_subsite_only",
+ Parameter.REQUIRED, new Boolean(false));
+
m_defaultTaskAlerts = new StringArrayParameter
("com.arsdigita.cms.default_task_alerts",
Parameter.REQUIRED, new String[] {
@@ -299,6 +305,7 @@
register(m_soonExpiredTimespanDays);
register(m_defaultTaskAlerts);
register(m_unpublishedNotFound);
+ register(m_linksOnlyInSameSubsite);
loadInfo();
}
@@ -423,6 +430,10 @@
return ((Boolean) get(m_deleteWorkflowAfterPublication)).booleanValue();
}
+ public final boolean getLinksOnlyInSameSubsite() {
+ return ((Boolean) get(m_linksOnlyInSameSubsite)).booleanValue();
+ }
+
public final int getSoonExpiredMonths() {
return ((Integer) get(m_soonExpiredTimespanMonths)).intValue();
}
@@ -477,4 +488,29 @@
return DHTMLEditor.Config.valueOf(value);
}
}
+
+
+ protected static HashMap extraXMLGenerators = new HashMap();
+ protected static List allExtraXMLGenerators = new ArrayList();
+
+ /** Add one ExtraXMLGenerator to the list. */
+ public static void registerExtraXMLGenerator(String type, ExtraXMLGenerator gen) {
+ List gens = (List) extraXMLGenerators.get(type);
+ if (gens == null) {
+ gens = new ArrayList();
+ extraXMLGenerators.put(type, gens);
+ }
+ gens.add(gen);
+ allExtraXMLGenerators.add(gen);
+ }
+
+ /** Get the list of all ExtraXMLGenerators. */
+ public static List getExtraXMLGenerators() {
+ return allExtraXMLGenerators;
+ }
+
+ /** Get the list of ExtraXMLGenerators for a type. Could be null. */
+ public static List getExtraXMLGenerators(String type) {
+ return (List) extraXMLGenerators.get(type);
+ }
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties 2006-06-14 11:45:15 UTC (rev 1164)
@@ -162,3 +162,8 @@
com.arsdigita.cms.unpublished_not_found.purpose=Does a redirect to the unpublished item generate not found error?
com.arsdigita.cms.unpublished_not_found.example=true
com.arsdigita.cms.unpublished_not_found.format=[boolean]
+
+com.arsdigita.cms.browse_links_in_same_subsite_only.title=Browse links in same subsite only
+com.arsdigita.cms.browse_links_in_same_subsite_only.purpose=Links created through browse interfaces should only be within the same subsite
+com.arsdigita.cms.browse_links_in_same_subsite_only.example=false
+com.arsdigita.cms.browse_links_in_same_subsite_only.format=[boolean]
Added: trunk/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2005 Runtime Collective Ltd. All Rights Reserved.
+ */
+
+package com.arsdigita.cms;
+
+import com.arsdigita.bebop.Page;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.xml.Element;
+
+/**
+ * Implement this interface to specify what extra XML
+ * your content types may have.
+ *
+ * @author Fabrice Retkowsky (fa...@ru...)
+ * @version $Revision: #17 $ $Date: 2004/08/17 $
+ */
+public interface ExtraXMLGenerator {
+
+ public static final String versionId = "$Id: ContentType.java 285 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
+
+ /**
+ * Specify the XML for a given content item.
+ */
+ public void generateXML(ContentItem item, Element element, PageState state);
+
+ /**
+ * Add all required global parameters.
+ */
+ public void addGlobalStateParams(Page p);
+}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -35,6 +35,7 @@
import com.arsdigita.bebop.form.Submit;
import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.form.RadioGroup;
+import com.arsdigita.bebop.form.CheckboxGroup;
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
@@ -74,6 +75,7 @@
private TextField m_title;
private TextField m_targetURI;
private RadioGroup m_linkType;
+ private CheckboxGroup m_URIOption;
private ItemSelectionModel m_itemModel;
private LinkSelectionModel m_linkModel;
private SaveCancelSection m_saveCancelSection;
@@ -129,6 +131,7 @@
"<!-- \n" +
"function toggle_link_fields(status) { \n" +
" document.forms['linkEditForm'].targetURI.disabled = status; \n" +
+ " document.forms['linkEditForm'].openOption.disabled = status; \n" +
" document.forms['linkEditForm'].contentItem.disabled = !status; \n" +
" document.forms['linkEditForm'].contentItem_search.disabled = !status; \n" +
" document.forms['linkEditForm'].contentItem_clear.disabled = !status; \n" +
@@ -147,12 +150,17 @@
Option m_internal = new Option(Link.INTERNAL_LINK, "Content Item");
m_internal.setOnClick("toggle_link_fields(true)");
+ Option m_selectWindow = new Option(Link.TARGET_WINDOW, "Open URL in new window");
+ m_URIOption = new CheckboxGroup("openOption");
+ m_URIOption.addOption(m_selectWindow);
+
m_linkType.addOption(m_external);
m_linkType.addOption(m_internal);
m_linkType.setOptionSelected(m_external);
m_linkType.addValidationListener(new NotNullValidationListener());
add(new Label("Link Type (Choose one):"));
add(m_linkType);
+ add(m_URIOption, ColumnPanel.FULL_WIDTH);
m_targetURI = new TextField("targetURI");
m_targetURI.setOnFocus("toggle_link_fields(false)");
@@ -363,6 +371,11 @@
m_title.setValue(state, link.getTitle());
m_description.setValue(state, link.getDescription());
m_targetURI.setValue(state, link.getTargetURI());
+ if ( com.arsdigita.bebop.Link.NEW_FRAME.equals(link.getTargetWindow()) ) {
+ m_URIOption.setValue(state, Link.TARGET_WINDOW);
+ } else {
+ m_URIOption.setValue(state, null);
+ }
m_linkType.setValue(state, link.getTargetType());
if (Link.INTERNAL_LINK.equals(link.getTargetType())) {
data.put(ITEM_SEARCH, link.getTargetItem());
@@ -378,6 +391,7 @@
m_title.setValue(state, null);
m_description.setValue(state, null);
m_targetURI.setValue(state, null);
+ m_URIOption.setValue(state, null);
m_linkType.setValue(state, Link.EXTERNAL_LINK);
data.put(ITEM_SEARCH, null);
}
@@ -443,6 +457,20 @@
link.setTargetURI(null);
link.setTargetItem((ContentItem) data.get(ITEM_SEARCH));
}
+ // Process whether link is to be opened in new window
+ boolean isNewWindow = false;
+ String[] value = (String[])m_URIOption.getValue(state);
+ // Technically this isn't really necessary as there is only one box so any
+ // non-null value means it was checked
+ if (value != null) {
+ isNewWindow = link.TARGET_WINDOW.equals(value[0]);
+ }
+ if (isNewWindow) {
+ link.setTargetWindow(com.arsdigita.bebop.Link.NEW_FRAME);
+ } else {
+ link.setTargetWindow("");
+ }
+
link.save();
}
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -104,7 +104,13 @@
response.setContentType(mimeType.getMimeType());
}
+ // PDFs need to be cached for a different amount of time to avoid issues with IE6 - see ticket #20266
+ if (mimeType.getMimeType().equals("application/pdf")) {
+ DispatcherHelper.cacheForWorld(response,30);
+ } else {
+ // Default caching for all other types
DispatcherHelper.cacheForWorld(response);
+ }
}
private void send(HttpServletResponse response,
Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -43,4 +43,8 @@
super(false);
}
+ // do not set Content-Disposition for asset streaming
+ protected void setFilenameHeader(HttpServletResponse response,
+ BinaryAsset asset) {
+ }
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -46,6 +46,7 @@
+ " by $Author$, $DateTime: 2004/08/17 23:15:09 $";
public String getTitle(DomainObject dobj) {
+ if (dobj instanceof ContentPage) {
ContentPage item = (ContentPage)dobj;
String title = item.getTitle();
if (StringUtils.emptyString(title)) {
@@ -54,20 +55,32 @@
);
}
return title;
+ } else {
+ // this is not pretty,
+ // but fails more gracefully for items which are not contentpages
+ s_log.warn("Item is not a ContentPage.");
+ return "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+ }
}
public String getSummary(DomainObject dobj) {
+ if (dobj instanceof ContentPage) {
ContentPage item = (ContentPage)dobj;
return item.getSearchSummary();
+ } else {
+ return "";
+ }
}
public String getContentSection(DomainObject dobj) {
String sectionName = "";
+ if (dobj instanceof ContentPage) {
ContentPage item = (ContentPage)dobj;
ContentSection section = item.getContentSection();
if (section != null) {
sectionName = section.getName();
}
+ }
return sectionName;
}
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties 2006-06-14 11:45:15 UTC (rev 1164)
@@ -283,6 +283,8 @@
cms.ui.category.categorized_objects=Order Live Objects in This Category
cms.ui.category.category.current=Current category
cms.ui.category.change_index_item=Change index item
+cms.ui.category.view_index_item=View index item
+cms.ui.category.edit_index_item=Edit index item
cms.ui.category.content_item=Content Item
cms.ui.category.delete=Delete category
cms.ui.category.delete_prompt=Are you sure you want to delete this category?
Added: trunk/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2001, 2002, 2003 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.cms.ui;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.SimpleComponent;
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.util.Assert;
+import com.arsdigita.xml.Element;
+
+
+/**
+ * Show ContentSection info in generated xml.
+ */
+public class ContentSectionComponent extends SimpleComponent {
+
+ public static final String versionId = "$Id: ContentSectionComponent.java,v 1.1 2003/09/26 20:49:24 cwolfe Exp $ by $Author: cwolfe $, $DateTime: 2003/08/18 23:54:14 $";
+
+ public ContentSectionComponent() {
+ super();
+ }
+
+ /**
+ * Generates XML that includes content section info.
+ *
+ * @param state The page state
+ * @param parent The parent DOM element
+ */
+ public void generateXML(PageState state, Element parent) {
+ if ( isVisible(state) ) {
+ ContentSection section = CMS.getContext().getContentSection();
+ if (section == null) { return; }
+ Element content = parent.newChildElement("cms:contentSection", CMS.CMS_XML_NS);
+ content.addAttribute("displayName", section.getDisplayName());
+
+ }
+ }
+
+}
Added: trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderAllContent.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderAllContent.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderAllContent.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2006 Runtime Collective Ltd. 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.cms.ui;
+
+import org.apache.log4j.Logger;
+
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.Folder;
+
+
+/**
+ * Implementation of FolderContent that automatically sets the
+ * content section and folder to the current ones as obtained
+ * by <code>CMS.getContext()</code>, and which pulls out all
+ * items, even unpublished ones.
+ *
+ */
+public class CurrentFolderAllContent extends CurrentFolderContent {
+
+ private static Logger log = Logger.getLogger(CurrentFolderAllContent.class);
+
+ public CurrentFolderAllContent() {
+ super();
+ setLiveOnly(false);
+ setFolder((Folder) CMS.getContext().getContentItem().getDraftVersion());
+ }
+}
Added: trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderContent.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderContent.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/CurrentFolderContent.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2006 Runtime Collective Ltd. 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.cms.ui;
+
+import org.apache.log4j.Logger;
+
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.Folder;
+
+
+/**
+ * Implementation of FolderContent that automatically sets the
+ * content section and folder to the current ones as obtained
+ * by <code>CMS.getContext()</code>.
+ *
+ */
+
+public class CurrentFolderContent extends FolderContent {
+
+ private static Logger log = Logger.getLogger(CurrentFolderContent.class);
+
+ public CurrentFolderContent() {
+ super();
+ setContentSection(CMS.getContext().getContentSection().getName());
+ setFolder((Folder) CMS.getContext().getContentItem());
+ }
+}
Added: trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2001, 2002, 2003 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.cms.ui;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.SimpleComponent;
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.ContentBundle;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.Folder;
+import com.arsdigita.cms.dispatcher.CMSPage;
+import com.arsdigita.xml.Element;
+import java.util.ArrayList;
+import org.apache.log4j.Logger;
+
+/**
+ * Generates XML that is breadcrumb trail. Includes all folders in
+ * the path to the currently requested content item, minus the content
+ * section root folder.
+ *
+ * @author Crag Wolfe
+ */
+public class FolderBreadcrumbNav extends SimpleComponent {
+
+ public static final String versionId = "$Id: FolderBreadcrumbNav.java,v 1.2 2003/12/18 18:33:55 cwolfe Exp $ by $Author: cwolfe $, $DateTime: 2003/08/18 23:54:14 $";
+
+ private static Logger s_log =
+ Logger.getLogger(FolderBreadcrumbNav.class);
+
+ public FolderBreadcrumbNav() {
+ super();
+ }
+
+ /**
+ * Generates XML for a breadcrumb trail
+ *
+ * @param state The page state
+ * @param parent The parent DOM element
+ */
+ public void generateXML(PageState state, Element parent) {
+ if ( !isVisible(state)) {
+ return;
+ }
+ if (!CMS.getContext().hasContentItem()) {
+ s_log.debug("no content item found for current request");
+ return;
+ }
+
+ ContentItem curItem = CMS.getContext().getContentItem();
+
+ ArrayList folders = new ArrayList(8);
+
+ Folder f = null;
+ try {
+ f = (Folder) curItem;
+ folders.add(0,f);
+ } catch (java.lang.ClassCastException ccex) {
+ f = (Folder)
+ ((ContentBundle) curItem.getParent()).getParent();
+ folders.add(0,f);
+ }
+
+ f = (Folder) f.getParent();
+ while (f != null) {
+ folders.add(0,f);
+ f = (Folder) f.getParent();
+ }
+
+ // EE 2006-01-18 disabled this
+ //if (folders.size() < 2) {
+ // return;
+ //}
+
+ Element component = parent.newChildElement
+ ("cms:folderPathLinks", CMSPage.CMS_XML_NS);
+ component.addAttribute("id","folderPath");
+
+ // root folder of the content section is not in breadcrumb
+ // trail, so remove it
+ folders.remove(0);
+
+ String contentSection = CMS.getContext().getContentSection().getURL();
+
+ while (folders.size() > 0) {
+ f = (Folder) folders.remove(0);
+ Element folderElem = component.newChildElement
+ ("cms:folderPathLink", CMSPage.CMS_XML_NS);
+ folderElem.addAttribute("title", f.getLabel());
+ folderElem.addAttribute
+ ("url", contentSection+f.getPath()+"/");
+ }
+ }
+}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2005 Runtime Collective Ltd. All Rights Reserved.
+ * Copyright (C) 2002-2006 Runtime Collective Ltd. 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
@@ -103,6 +103,25 @@
randomOne = random;
}
+ /** Whether to pull out live items only (the default), or all items. */
+ protected boolean liveOnly = true;
+ public boolean getLiveOnly() {
+ return liveOnly;
+ }
+ public void setLiveOnly(boolean liveOnly) {
+ this.liveOnly = liveOnly;
+ }
+
+ /** The folder to look into. */
+ protected Folder folder;
+ public Folder getFolder() {
+ return folder;
+ }
+ public void setFolder(Folder f) {
+ folder = f;
+ setFolderName((f != null) ? f.getName() : null);
+ }
+
/**
* Generates the XML.
*
@@ -131,9 +150,9 @@
return;
}
- // get the folder
+ // get the folder by name if necessary
+ if (folder == null) {
Folder root = section.getRootFolder();
- Folder folder = null;
Folder.ItemCollection folders = root.getItems(true);
folders.addFolderFilter(true);
while (folders.next()) {
@@ -143,6 +162,7 @@
break;
}
}
+ }
if (folder == null) {
log.warn("FolderContent couldn't find the folder '"+getFolderName()+"'.");
return;
@@ -154,9 +174,12 @@
//folders.addFolderFilter(false);
while (items.next()) {
log.debug("FolderContent looking at item '"+items.getDisplayName()+"'.");
- if (!items.isFolder() && items.isLive()) {
- log.debug("FolderContent accepts item, it's live.");
+ if (!items.isFolder()) {
+ log.debug("FolderContent: this is an item, not a Folder.");
+ if (!liveOnly || items.isLive()) {
+ log.debug("FolderContent accepts item.");
liveItems.add(items.getContentItem());
+ }
}
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -82,19 +82,12 @@
l.setClassAttr("heading");
add(l);
- m_folderSel = new FolderSelectionModel("folder") {
- protected BigDecimal getRootFolderID( PageState ps ) {
- Folder root = getRootFolder( ps );
+ // As described in ticket 20540, some clients do not want the option to pick items from other
+ // subsites through the ItemSearchBrowsePane. A new parameter has been added to allow the
+ // administrator to pick between the old and new versions.
+ boolean linksOnlyInSameSubsite = ContentSection.getConfig().getLinksOnlyInSameSubsite();
+ s_log.debug("linksOnlyInSameSubsite value is "+linksOnlyInSameSubsite);
- if( null == root ) return super.getRootFolderID( ps );
- return root.getID();
- }
- };
- m_folderSel.addChangeListener(this);
-
- Form sectionForm = getSectionForm();
- add( sectionForm );
-
m_tree = new Tree( new FolderTreeModelBuilder() {
protected Folder getRoot( PageState ps ) {
Folder root = getRootFolder( ps );
@@ -103,7 +96,17 @@
return root;
}
} );
+ m_folderSel = createFolderSelectionModel();
+ m_folderSel.addChangeListener(this);
+
+ if(!linksOnlyInSameSubsite) {
+ // The client should be able to pick between the subsites
+ Form sectionForm = getSectionForm();
+ add( sectionForm );
+ }
+
m_tree.setSelectionModel( m_folderSel );
+
m_tree.setClassAttr("navbar");
m_tree.addTreeExpansionListener(this);
add(m_tree);
@@ -149,6 +152,9 @@
}
private Folder getRootFolder( PageState ps ) {
+ s_log.debug("Getting the root folder.");
+ if(m_section!=null) {
+ // We have more than one subsite to choose between
OID sectionOID = (OID) m_section.getValue( ps );
if( s_log.isDebugEnabled() ) {
if( null != sectionOID )
@@ -163,13 +169,20 @@
DomainObjectFactory.newInstance( sectionOID );
return section.getRootFolder();
+ } else {
+ return null;
+ }
}
public void register(Page p) {
super.register(p);
p.addComponentStateParam(this, m_folderSel.getStateParameter());
- p.addComponentStateParam(this, m_section.getParameterModel());
+
+ // Only add the SingleSelect item if it exists
+ if(m_section!=null) {
+ p.addComponentStateParam(this, m_section.getParameterModel());
}
+ }
public void reset(PageState s) {
//m_browser.reset(s);
@@ -227,8 +240,8 @@
}
public void process(FormSectionEvent e) {
+ /*
PageState s = e.getPageState();
- /*
if ( e.getSource() == m_browser.getManipulator().getItemView() ) {
// Hide everything except for the flat item list
m_tree.setVisible(s, false);
@@ -239,8 +252,8 @@
}
public void submitted(FormSectionEvent e) {
+ /*
PageState s = e.getPageState();
- /*
if ( e.getSource() == m_browser.getManipulator().getTargetSelector() ) {
if ( ! m_browser.getManipulator().getTargetSelector().isVisible(s) ) {
m_tree.setVisible(s, true);
@@ -249,5 +262,15 @@
*/
}
+ private FolderSelectionModel createFolderSelectionModel() {
+ return new FolderSelectionModel("folder") {
+ protected BigDecimal getRootFolderID( PageState ps ) {
+ Folder root = getRootFolder( ps );
+ if( null == root ) return super.getRootFolderID( ps );
+ return root.getID();
+ }
+ };
+ }
+
}
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -216,7 +216,7 @@
searchURL = com.arsdigita.cms.dispatcher.Utilities.getWorkspaceURL()
+ searchURL;
- // Not sure what to do when you get a null here
+ // TODO Not sure what to do when you get a null here
URL url = URL.there(state.getRequest(), searchURL,params);
Added: trunk/ccm-cms/src/com/arsdigita/cms/ui/LevelOneFolderHierarchyNav.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/LevelOneFolderHierarchyNav.java 2006-06-14 11:41:57 UTC (rev 1163)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/LevelOneFolderHierarchyNav.java 2006-06-14 11:45:15 UTC (rev 1164)
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2001, 2002, 2003 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.cms.ui;
+
+import java.util.Stack;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.SimpleComponent;
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.ContentBundle;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.Folder;
+import com.arsdigita.xml.Element;
+
+/**
+ * <p>
+ * 18/01/2006 - moved to ccm-cms by er...@ru...
+ * </p>
+ *
+ * <p>
+ * 06/01/2004 - moved to a new file by st...@ru...
+ *
+ * <p>
+ * 22/12/2003 - Alteration by Runtime Collective. Changed this class to reflect
+ * the actual folder structure that is currently used by UNDP, i.e. top-level
+ * is just below root rather than two below root.
+ * </p>
+ *
+ * Generates XML intended for a sidebar nav. Includes toplevel
+ * folders, with the current path expanded. In this case, toplevel
+ * folders are defined as folders two levels below a content section
+ * root folder.
+ *
+ * For example, if a request is made to
+ * /ccm/my-content-section/shapes/rectangle/square/square-article
+ * and the shapes folder contains subfolders of rectangle, round, and
+ * convex, the xml generated by this class would reflect this
+ * structure:
+ *
+ * /rectangle
+ * /square
+ * /round
+ * /convex
+ *
+ * The motivation for using 2-level deep folders as toplevel folders
+ * instead of 1-level deep folders, is it allows additional "sites" to
+ * be created with their own navigation schemes by creating addtional
+ * 1-level deep folders. For example, if we added a 1-level deep
+ * folder of "colors" with subfolders of red, blue and green, the
+ * toplevel folders displayed for requests within this "site" would
+ * be:
+ *
+ * /red
+ * /blue
+ * /green
+ *
+ * @author Peter Kopunec
+ */
+public class LevelOneFolderHierarchyNav extends SimpleComponent {
+
+ public LevelOneFolderHierarchyNav() {
+ }
+
+ /**
+ * Returns true if the pre conditions has been passed.
+ */
+ private boolean validPreConditions(PageState state) {
+ return (isVisible(state) && CMS.getContext().hasContentItem());
+ }
+
+ /**
+ * Generates XML for the left hand side nav bar.
+ *
+ * @param state The page state
+ * @param parent The parent DOM element
+ */
+ public void generateXML(PageState state, Element parent) {
+ if (!validPreConditions(state)) {
+ return;
+ }
+
+ Element parentElement = parent.newChildElement("cms:folderNavLinks", CMS.CMS_XML_NS);
+
+ String contentSectionURL = CMS.getContext().getContentSection().getURL();
+
+ Tree root = getTree(contentSectionURL);
+
+ makeChildElement(parentElement, root);
+ }
+
+ private void makeChildElement(Element parentElement, Tree child) {
+ Element childElement = parentElement.newChildElement("cms:folderNavLink", CMS.CMS_XML_NS);
+ childElement.addAttribute("title", child.label);
+ childElement.addAttribute("url", child.url);
+ if (!child.isRoot) {
+ if (child.isSelected) {
+ childElement.addAttribute("selected", "1");
+ }
+ else {
+ if (child.isOpen) {
+ childElement.addAttribute("open", "1");
+ }
+ }
+ }
+
+ if (child.children != null) {
+ while (!child.children.empty()) {
+ makeChildElement((child.isRoot ? parentElement : childElement), (Tree) child.children.pop());
+ }
+ }
+ }
+
+ private Tree getTree(String contentSectionURL) {
+ Tree tree = null;
+
+ Tree prevTree = null;
+ Tree child;
..
|
|
From: <fa...@vh...> - 2006-06-14 11:46:30
|
Author: fabrice
Date: 2006-06-14 13:41:57 +0200 (Wed, 14 Jun 2006)
New Revision: 1163
Added:
trunk/ccm-cms/debian/
trunk/ccm-cms/debian/ccm-build.sh
trunk/ccm-cms/debian/ccm-clean.sh
trunk/ccm-cms/debian/ccm-cms.dirs
trunk/ccm-cms/debian/ccm-config.sh
trunk/ccm-cms/debian/ccm-disperse.sh
trunk/ccm-cms/debian/ccm-install.sh
trunk/ccm-cms/debian/ccm-settings-run.sh
trunk/ccm-cms/debian/ccm-settings.sh
trunk/ccm-cms/debian/changelog
trunk/ccm-cms/debian/compat
trunk/ccm-cms/debian/config
trunk/ccm-cms/debian/control
trunk/ccm-cms/debian/copyright
trunk/ccm-cms/debian/postinst
trunk/ccm-cms/debian/postrm
trunk/ccm-cms/debian/prerm
trunk/ccm-cms/debian/rules
trunk/ccm-cms/debian/templates
Log:
debian files
Added: trunk/ccm-cms/debian/ccm-build.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-build.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-build.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-build.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+# for eg Oracle jar
+CLASSPATH=./lib/:$CLASSPATH
+$ANT build-${name}
Added: trunk/ccm-cms/debian/ccm-clean.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-clean.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-clean.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-clean.sh,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+[ -f build.xml ] && $ANT clean-${appname}
+
+rm -rf build build.xml ccm.classpath
+
+# ccm-disperse.sh creates the .install files automatically, so let's clean them too.
+
+rm -f ${appname}.install ${appname}-doc.install
Added: trunk/ccm-cms/debian/ccm-cms.dirs
===================================================================
--- trunk/ccm-cms/debian/ccm-cms.dirs 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-cms.dirs 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1 @@
+usr/share/java/ccm-cms-6.3.0
Added: trunk/ccm-cms/debian/ccm-config.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-config.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-config.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-config.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+if [ ! -L $name ]; then
+ ln -s . $name
+fi
+ccm-create-projectxml.pl > project.xml
+ccm-configure.sh
Added: trunk/ccm-cms/debian/ccm-disperse.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-disperse.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-disperse.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-disperse.sh,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+SRCDIR="$1"
+[ "x$SRCDIR" != "x" ] || exit 1
+
+# automatically generate the .install file lists for dh_install:
+
+(cd $SRCDIR && find . -type f \
+ | grep -v DEBIAN \
+ | grep -v var/www/html \
+ | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}.install
+
+(cd $SRCDIR && find . -type f -path './var/www/html/*' \
+ | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}-doc.install
+
+# for some reason, dh_install doesn't work properly; let's disperse the files ourselves:
+
+for pkg in ${name} ${name}-doc; do
+ # skip this package if mentioned in CCM_DEBIAN_NO_PACKAGES
+ [ `echo $CCM_DEBIAN_NO_PACKAGES | tr ' ' '\n' | grep -c "^${pkg}$"` -eq 1 ] && continue || true
+
+ # this should exist [due to dh_installdocs, dh_installchangelog], but just in case...
+ mkdir -p debian/$pkg
+
+ [ -e debian/${pkg}.install ] && \
+ echo -n "Dispersing files to debian/$pkg/ ... " && \
+ for file in `cat debian/${pkg}.install`; do
+ dir=`dirname $file`
+ mkdir -p debian/$pkg/$dir
+ cp $SRCDIR/$file debian/$pkg/$dir/
+ done
+ echo "done."
+done
Added: trunk/ccm-cms/debian/ccm-install.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-install.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-install.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-install.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+. debian/ccm-settings.sh
+
+DESTDIR="$1"
+[ "xDESTDIR" != "x" ] || exit 1
+
+rm -rf $DESTDIR
+mkdir -p $DESTDIR
+mkdir -p $DESTDIR${confdir}
+mkdir -p $DESTDIR/var/www/html/${name}-${version}
+
+ANT_OPTS="-Dapps.${name}.version=${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.conf.dir=$DESTDIR${confdir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.shared.lib.dir=$DESTDIR${sharedjardir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.private.lib.dir=$DESTDIR${sharedjardir}/${name}-${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.webapp.dir=$DESTDIR${webappdir}/${name}-${version}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.system.jars.dir=$DESTDIR${sharedjardir}"
+ANT_OPTS="$ANT_OPTS -Ddeploy.api.dir.${appname}=$DESTDIR/var/www/html/${name}-${version}/api"
+ANT_OPTS="$ANT_OPTS -Ddeploy.shared.classes.dir=$DESTDIR/tmp/${name}-${version}"
+export ANT_OPTS
+
+$ANT deploy-jar-classes-${appname}
+$ANT deploy-${appname}
+
+rm -rf "$DESTDIR/tmp"
+
+
+# only generate and deploy javadocs if we didn't specify otherwise in CCM_DEBIAN_NO_JAVADOC
+
+GENERATE_JAVADOC=true
+if [ `echo $CCM_DEBIAN_NO_JAVADOC | tr ' ' '\n' | grep -c "^${name}-doc$"` -eq 1 ]; then
+ GENERATE_JAVADOC=false
+fi
+
+if [ -d ${appname}/src ]; then
+ $ANT deploy-jar-classes-${appname}
+ [ "$GENERATE_JAVADOC" == "true" ] && $ANT deploy-javadoc-${appname} || true
+fi
Added: trunk/ccm-cms/debian/ccm-settings-run.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-settings-run.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-settings-run.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+# say which app to compile, amongst those specified in the project.xml
+export CCM_APP=$name
+
+# do some checks
+
+check_JAVA_HOME
+
+if [ "$name" = "ccm-core" ]; then
+ check_ORACLE_JDBC_LIB
+fi
+
+
+# set the environment
+
+for file in `echo /etc/profile.d/ccm-{tools,devel,scripts}.sh`; do
+ . $file
+done
+
+cd ..
+. $CCM_SCRIPTS_HOME/bin/env-conf.sh ${appname} > /dev/null
+cd -
+export CCM_HOME=`pwd`
+
+if which classic-ant > /dev/null 2>&1; then
+ ANT=classic-ant
+else
+ ANT=ant
+fi
+
+
+# perhaps we don't like to build some packages -- get them from DH_OPTIONS
+
+export CCM_DEBIAN_NO_PACKAGES=`echo $DH_OPTIONS | tr -s ' ' '\n' | grep -E '(-N|--no-package=)' | xargs | sed -re 's/(-N|--no-package)//g'`
+
+# for now, assume that if we don't want to build some packages then we don't
+# want to generate javadocs for them either
+
+export CCM_DEBIAN_NO_JAVADOC="$CCM_DEBIAN_NO_JAVADOC $CCM_DEBIAN_NO_PACKAGES"
Property changes on: trunk/ccm-cms/debian/ccm-settings-run.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-cms/debian/ccm-settings.sh
===================================================================
--- trunk/ccm-cms/debian/ccm-settings.sh 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/ccm-settings.sh 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
+
+# source the shell library [for the check_* functions]
+# FIXME: ugly-looking hack.
+orig_DEBIAN_HAS_FRONTEND=$DEBIAN_HAS_FRONTEND
+DEBIAN_HAS_FRONTEND=1
+. /usr/share/ccm-tools/lib/shellmodule
+DEBIAN_HAS_FRONTEND=$orig_DEBIAN_HAS_FRONTEND
+
+
+# variables we use [especially in ccm-install.sh]
+
+name=ccm-cms
+version=6.3.0
+appname=ccm-cms
+appversion=6.3.0
+confdir="/etc/ccm/conf"
+sharedjardir="/usr/share/java"
+webappdir="/usr/share/java/webapps"
+ccmclasspathfile="ccm/ccm.classpath"
+ccmwebappfile="ccm/ccm.webapps"
+
+. debian/ccm-settings-run.sh
Added: trunk/ccm-cms/debian/changelog
===================================================================
--- trunk/ccm-cms/debian/changelog 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/changelog 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,291 @@
+ccm-cms (6.3.0-13) unstable; urgency=low
+
+ * Fixed NPE
+
+ -- James Burt <ja...@ru...> Thu, 2 Mar 2006 13:09:54 +0000
+
+ccm-cms (6.3.0-12) unstable; urgency=low
+
+ * Fixing CurrentFolderAllContent
+
+ -- My <my...@fi...> Fri, 24 Feb 2006 14:07:39 +0000
+
+ccm-cms (6.3.0-11) unstable; urgency=low
+
+ * Adding CurrentFolderAllContent class
+
+ -- My <my...@fi...> Fri, 24 Feb 2006 10:48:55 +0000
+
+ccm-cms (6.3.0-10) unstable; urgency=low
+
+ * Fixed link to lock.png
+
+ -- My <my...@fi...> Wed, 22 Feb 2006 12:44:35 +0000
+
+ccm-cms (6.3.0-8) unstable; urgency=low
+
+ * Added com.arsdigita.cms.ui.CurrentFolderContent
+
+ -- Erik Erskine <er...@ru...> Thu, 2 Feb 2006 12:14:30 +0000
+
+ccm-cms (6.3.0-7) unstable; urgency=low
+
+ * Folder based navigation for undp
+
+ -- Erik Erskine <er...@ru...> Wed, 1 Feb 2006 10:08:35 +0000
+
+ccm-cms (6.3.0-6) unstable; urgency=low
+
+ * Adding missing entry to upgrades
+
+ -- My <my...@fi...> Wed, 25 Jan 2006 14:46:29 +0000
+
+ccm-cms (6.3.0-5) unstable; urgency=low
+
+ * Speeding up one upgrade step (6.0.1 to 6.1.0) from 2+ days to 13s, for UNDP
+
+ -- My <my...@fi...> Tue, 24 Jan 2006 17:45:09 +0000
+
+ccm-cms (6.3.0-4) unstable; urgency=low
+
+ * Change the dependency on ccm-core to >= 6.3.0 as we need the new SqlFilter
+ class.
+
+ -- David Pashley <da...@ru...> Tue, 10 Jan 2006 10:22:53 +0000
+
+ccm-cms (6.3.0-3) unstable; urgency=low
+
+ * RedHat patches
+
+ -- My <my...@fi...> Fri, 30 Dec 2005 08:52:41 +0000
+
+ccm-cms (6.3.0-2) unstable; urgency=low
+
+ * Including patch from official aplaws:
+ https://sourceforge.net/tracker/index.php?func=detail&aid=1324690&group_id=71505&atid=531527%C2%A0%3Cbr
+
+ -- Fabrice Retkowsky <fa...@ru...> Wed, 14 Dec 2005 11:40:16 +0000
+
+ccm-cms (6.3.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.2.0 to 6.3.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 13:51:54 +0000
+
+ccm-cms (6.2.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.1.2 to 6.2.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 12:29:57 +0000
+
+ccm-cms (6.1.2-23) unstable; urgency=low
+
+ * 18963 - notification emails should have a valid link to admin interface
+
+ -- My <my...@fi...> Tue, 16 Aug 2005 07:54:51 +0000
+
+ccm-cms (6.1.2-22) unstable; urgency=low
+
+ * Refactoring MPA/SiteProxy as index item patch, adding 404s for invalid
+ category hits
+
+ -- My <my...@fi...> Thu, 28 Jul 2005 12:25:48 +0000
+
+ccm-cms (6.1.2-21) unstable; urgency=low
+
+ * Removing constraint on CMSContext.getContentItem to be non-null
+
+ -- My <my...@fi...> Wed, 20 Jul 2005 09:56:06 +0000
+
+ccm-cms (6.1.2-20) unstable; urgency=low
+
+ * 18686 - added a break statement to improve performance
+
+ -- Matt Roberts <ma...@ru...> Fri, 15 Jul 2005 10:25:03 +0100
+
+ccm-cms (6.1.2-19) unstable; urgency=low
+
+ * 18686 - Made the Soon Expired pane aware of permissions
+
+ -- Matt Roberts <ma...@ru...> Thu, 14 Jul 2005 18:02:25 +0100
+
+ccm-cms (6.1.2-18) unstable; urgency=low
+
+ * 18769 - option not to delete workflow after publication
+
+ -- My <my...@fi...> Wed, 13 Jul 2005 16:33:25 +0000
+
+ccm-cms (6.1.2-17) unstable; urgency=low
+
+ * Added two new parameters to adjust the period that the Soon Expired page
+ looks ahead
+
+ -- Matt Roberts <ma...@ru...> Tue, 12 Jul 2005 13:16:26 +0100
+
+ccm-cms (6.1.2-16) unstable; urgency=low
+
+ * 18728: Redirect to login screen when access denied and user isn't logged
+
+ -- My <my...@fi...> Mon, 11 Jul 2005 13:38:19 +0000
+
+ccm-cms (6.1.2-15) unstable; urgency=low
+
+ * 15977: Rename live version of folders too
+
+ -- My <my...@fi...> Mon, 11 Jul 2005 12:29:32 +0000
+
+ccm-cms (6.1.2-14) unstable; urgency=low
+
+ * 18465: option to disable fileasset indexing
+
+ -- My <my...@fi...> Tue, 5 Jul 2005 13:48:36 +0000
+
+ccm-cms (6.1.2-13) unstable; urgency=low
+
+ * SiteProxy as index items
+
+ -- My <my...@fi...> Fri, 24 Jun 2005 09:20:55 +0000
+
+ccm-cms (6.1.2-12) unstable; urgency=low
+
+ * MPAs as index items
+
+ -- My <my...@fi...> Thu, 23 Jun 2005 15:37:18 +0000
+
+ccm-cms (6.1.2-11) unstable; urgency=low
+
+ * Preventing exceptions when disable_p2ds_item is set to true
+
+ -- My <my...@fi...> Tue, 21 Jun 2005 16:36:15 +0000
+
+ccm-cms (6.1.2-10) unstable; urgency=low
+
+ * Final (?) fix for dublincore dates, #17509
+
+ -- My <my...@fi...> Wed, 18 May 2005 08:28:16 +0000
+
+ccm-cms (6.1.2-9) unstable; urgency=low
+
+ * Another attempt at fixing 17509
+
+ -- My <my...@fi...> Mon, 16 May 2005 10:31:09 +0000
+
+ccm-cms (6.1.2-8) unstable; urgency=low
+
+ * 17509 fix for dublin core dates
+
+ -- My <my...@fi...> Mon, 9 May 2005 09:48:40 +0000
+
+ccm-cms (6.1.2-7) unstable; urgency=low
+
+ * fixed a bug in related items (null pointer exception when content item chosen)
+
+ -- <cr...@fi...> Wed, 4 May 2005 11:55:03 +0000
+
+ccm-cms (6.1.2-6) unstable; urgency=low
+
+ * 17509 fix for dubli core dates
+
+ -- My <my...@fi...> Fri, 29 Apr 2005 13:19:17 +0000
+
+
+ccm-cms (6.1.2-5) unstable; urgency=low
+
+ * It is now possible to set the related links to open in a new window
+
+ -- root <ro...@fi...> Mon, 25 Apr 2005 16:00:40 +0000
+
+ccm-cms (6.1.2-4) unstable; urgency=low
+
+ * added option to select NO index item for a given category
+
+ -- <cr...@fi...> Mon, 25 Apr 2005 12:44:56 +0000
+
+ccm-cms (6.1.2-3) unstable; urgency=low
+
+ * 17616: CMSPermissionsPane now resets when you switch folders
+
+ -- My <my...@fi...> Fri, 15 Apr 2005 12:52:11 +0000
+
+ccm-cms (6.1.2-2) unstable; urgency=low
+
+ * use fulldateformatter for beg/end date of dublin core metadata
+
+ -- My <my...@fi...> Wed, 13 Apr 2005 15:44:11 +0000
+
+ccm-cms (6.1.2-1) unstable; urgency=low
+
+ * Automatic update of version number from 6.1.1 to 6.1.2
+
+ -- Runtime Collective Ltd. <in...@ru...> Thu, 31 Mar 2005 11:59:49 +0000
+
+ccm-cms (6.1.1-1) unstable; urgency=low
+
+ * for qa
+
+ -- Fabrice Retkowsky <fa...@ru...> Tue, 1 Mar 2005 15:30:01 +0000
+
+ccm-cms (6.1.0-8) unstable; urgency=low
+
+ * ContentBundle not to duplicate AtoZ item aliases when being published
+
+ -- Fabrice Retkowsky <fa...@ru...> Tue, 1 Mar 2005 15:30:01 +0000
+
+ccm-cms (6.1.0-7) unstable; urgency=low
+
+ * TextAssetEditForm now has option to clean up MS tags when saved
+
+ -- Fabrice Retkowsky <fa...@ru...> Tue, 22 Feb 2005 09:48:24 +0000
+
+ccm-cms (6.1.0-6) unstable; urgency=low
+
+ * Remove the build-dependency on ccm-ldn-navigation as it isn't required.
+
+ -- David Pashley <da...@ru...> Mon, 31 Jan 2005 16:37:10 +0000
+
+ccm-cms (6.1.0-5) unstable; urgency=low
+
+ * Depend on j2sdk1.4 | java2-compiler
+ * Update to policy 3.6.1
+ * Depend on debconf
+ * Change maintainer to the mailing list and add uploaders
+
+ -- David Pashley <da...@ru...> Wed, 19 Jan 2005 09:57:58 +0000
+
+ccm-cms (6.1.0-4) unstable; urgency=low
+
+ * debian/postrm: disabled the purge operations [had some weird problems].
+ * updated the debian control scripts to get the package name and version from their invocation.
+
+ -- Berkan Eskikaya <be...@ru...> Mon, 10 May 2004 12:33:33 +0100
+
+ccm-cms (6.1.0-3) unstable; urgency=low
+
+ * debian/templates: made load-at-install and setup-database-at-install the default behaviour.
+ * debian/postinst: ccm_hostinit will try to use web.xml-aplaws from ccm-ldn-aplaws.
+ * debian/ccm-settings.sh: correct checking/setting of ORACLE_JDBC_LIB [Chris].
+ * debian/templates: changed the default postgresql database and user names to "ccm01.db" and "ccm".
+ * debian/config: added detection of the hostname of the machine and possibly the user's email.
+ * major restructuring of the debian scripts: moved all utility functions to ccm-tools and made postinst, postrm, prerm and ccm-settings.sh source and use that file.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 7 May 2004 13:04:43 +0100
+
+ccm-cms (6.1.0-2) unstable; urgency=low
+
+ * The build process now tries to automatically detect JAVA_HOME and the location of Oracle's java library.
+ * debian/ccm-clean.sh: only calls the ant process if build.xml exists.
+ * debian/{postinst,prerm,config,templates}: added debconf support
+ * debian/postinst: accepts 'reconfigure' and treats it as 'configure'.
+ * debian/postinst: added postgresql.jar to CLASSPATH; added libpgjava to the dependencies.
+ * debian/postinst: removed some bashisms upon recommendation from lintian.
+ * debian/rules: enabled dh_installdebconf.
+ * debian/control: made the package depend on debconf.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 1 May 2004 15:41:43 +0100
+
+
+ccm-cms (6.1.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 24 Apr 2004 12:27:56 +0100
Added: trunk/ccm-cms/debian/compat
===================================================================
--- trunk/ccm-cms/debian/compat 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/compat 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1 @@
+4
Added: trunk/ccm-cms/debian/config
===================================================================
--- trunk/ccm-cms/debian/config 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/config 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: config,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_capb backup
+
+HOSTNAME=`hostname -f` 2>/dev/null || true
+
+if [ -n "$HOSTNAME" ]; then
+ db_metaget ccm/shared/waf_web_server default || true
+ PORTNUM=`echo $RET | cut -d: -f2`
+ db_set ccm/shared/waf_web_server "$HOSTNAME:$PORTNUM" || true
+fi
+
+if [ -n "$EMAIL" ]; then
+ db_set ccm/shared/waf_admin_email "$EMAIL" || true
+fi
+
+
+STATE=1
+LASTSTATE=5
+
+while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
+ case "$STATE" in
+ 1)
+ # Database questions
+ db_input high ccm/shared/dbase_type || true
+ db_input high ccm/shared/dbase_host || true
+ db_input high ccm/shared/dbase_name || true
+ db_input high ccm/shared/dbase_user || true
+ db_input high ccm/shared/dbase_password || true
+
+ ;;
+ 2)
+ # Server address
+ db_input high ccm/shared/waf_web_server || true
+ ;;
+ 3)
+ # Admin questions
+ db_input high ccm/shared/waf_admin_email || true
+ db_input high ccm/shared/waf_admin_name_given || true
+ db_input high ccm/shared/waf_admin_name_family || true
+ db_input high ccm/shared/waf_admin_password || true
+ db_input high ccm/shared/waf_admin_password_question || true
+ db_input high ccm/shared/waf_admin_password_answer || true
+ ;;
+ 4)
+ # When to load the applications
+ db_input medium ccm/shared/ccm_load_apps_at_install_p || true
+ ;;
+ 5)
+ # Whether to set up the [local] database
+ db_get ccm/shared/dbase_host || true
+ if [ "$RET" = "localhost" ]; then
+ db_input medium ccm/shared/pg_set_up_database_p || true
+ fi
+ ;;
+
+ # Add additional states here, making sure to
+ # increment LASTSTATE.
+ esac
+
+ if db_go; then
+ STATE=$(($STATE + 1))
+ else
+ STATE=$(($STATE - 1))
+ fi
+done
+
+
+db_go || true
+
+db_stop
+
Added: trunk/ccm-cms/debian/control
===================================================================
--- trunk/ccm-cms/debian/control 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/control 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,21 @@
+Source: ccm-cms
+Section: contrib/web
+Priority: optional
+Maintainer: Runtime Packaging <run...@ru...>
+Uploaders: David Pashley <da...@ru...>
+Build-Depends-Indep: debhelper (>= 4.0.0), j2sdk1.4 | java2-compiler, ant, libservlet2.3-java, libpgjava, debconf, po-debconf, ccm-tools, ccm-devel, ccm-scripts, ccm-core (>= 6.3.0)
+Standards-Version: 3.6.1
+
+Package: ccm-cms
+Architecture: all
+Depends: debconf, java-virtual-machine-dummy | j2sdk1.4 | java-virtual-machine, ccm-tools, ccm-servlet-container, libservlet2.3-java, libpgjava, liblog4j1.2-java , ccm-core (>= 6.3.0)
+Description: APLAWS: Content Management System
+ This package contains the Red Hat CCM Content Management System application for APLAWS.
+ .
+ FIXME: We need a longer and more meaningful description here.
+
+Package: ccm-cms-doc
+Architecture: all
+Depends: ccm-tools
+Description: Documentation for ccm-cms
+ Documentation for ccm-cms. Provides the JavaDoc API documentation.
Added: trunk/ccm-cms/debian/copyright
===================================================================
--- trunk/ccm-cms/debian/copyright 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/copyright 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,15 @@
+This package was debianized by Berkan Eskikaya <be...@ru...> on
+Tue, 13 Apr 2004 19:03:14 +0100.
+
+It was downloaded from http://aplaws.sourceforge.net/
+
+Upstream Authors: Redhat UK.
+
+Copyright:
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'.
+
+
Added: trunk/ccm-cms/debian/postinst
===================================================================
--- trunk/ccm-cms/debian/postinst 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/postinst 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,108 @@
+#! /bin/sh
+# postinst script for ccm-cms
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postinst,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure|reconfigure)
+ # FIXME: we need to be sensitive to upgrade operations here.
+ # basically, if pkgversion = appversion, then the datamodel
+ # hasn't changed -- we just configure the package and don't
+ # touch the database; else, we need to also update the
+ # datamodel in the database.
+
+
+ ### get the settings for the operations below
+
+ ccm_set_env
+ db_get_ccm_settings ;# db_stop
+
+ get_pkgname_from_arg "$0"
+ ccm_package_name="$RET"
+ get_pkgversion_from_dpkg "$ccm_package_name"
+ ccm_package_version="$RET"
+
+
+ ### do the usual post-installion configuration
+
+ if [ ! -d "/etc/ccm" ]; then
+ db_message "ccm/shared/error_etc_ccm_missing_dir"
+ mkdir -p "/etc/ccm"
+ fi
+
+ ccm_update_ccm_classpath add $ccm_package_name $ccm_package_version
+ ccm_update_ccm_webapps add $ccm_package_name $ccm_package_version
+ ccm_update_file_attributes $ccm_package_name $ccm_package_version
+
+
+ ### try to set up the database if asked to do so
+
+ if [ "$pg_set_up_database_p" = "true" ]; then
+ pg_set_up_database
+ fi
+
+ ### try to load the application if asked to do so
+
+ if [ "$ccm_load_apps_at_install_p" = "true" -a -n "$JAVA_HOME" ]; then
+ ccm_load
+ fi
+
+ ### run the hostinit step
+
+ if [ -n "$JAVA_HOME" ]; then
+ tomcat_http_port=`echo $waf_web_server | cut -d':' -f2` || true
+ tomcat_shutdown_port=`expr $tomcat_http_port + 1` || true
+ ccm_host_init tomcat $tomcat_http_port $tomcat_shutdown_port
+ fi
+
+
+ ### don't give others the registry details [eg the database password] on a golden plate
+ # FIXME: this interferes with "ccm load" updating the registry. Need to find the right ownership.
+ # chmod -R o-rwx /etc/ccm/conf/registry || true
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Added: trunk/ccm-cms/debian/postrm
===================================================================
--- trunk/ccm-cms/debian/postrm 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/postrm 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,62 @@
+#! /bin/sh
+# postrm script for ccm-cms
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postrm,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+db_get_ccm_settings
+
+get_pkgname_from_arg "$0"
+ccm_package_name="$RET"
+get_pkgversion_from_dpkg "$ccm_package_name"
+ccm_package_version="$RET"
+
+if [ "$ccm_package_name" != "ccm-core" ]; then
+ exit 0 ;# nothing to do
+fi
+
+case "$1" in
+ purge-FIXME)
+ # FIXME: there are problems with this, so disabling for the moment.
+
+ # maybe drop the database
+ if [ "$dbase_host" = "localhost" ]; then
+
+ db_input high ccm/shared/pg_drop_database_at_purge_p || true
+ db_go
+ db_stop
+
+ if [ "$pg_drop_database_at_purge_p" = "true" ]; then
+ su - postgres -c "dropdb $dbase_name" 1>&2 || true
+ su - postgres -c "dropuser $dbase_user" 1>&2 || true
+ fi
+
+ fi
+
+ # FIXME: should we still remove /etc/ccm/conf/registry/registry.properties,
+ # even if we don't or fail to drop the database.
+ rm -rf /etc/ccm/conf/registry/*
+ ;;
+
+ *)
+ # Nothing to do here.
+ ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/ccm-cms/debian/prerm
===================================================================
--- trunk/ccm-cms/debian/prerm 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/prerm 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,60 @@
+#! /bin/sh
+# prerm script for ccm-cms
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: prerm,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/ccm-tools/lib/shellmodule
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+db_get_ccm_settings ; db_stop
+
+get_pkgname_from_arg "$0"
+ccm_package_name="$RET"
+get_pkgversion_from_dpkg "$ccm_package_name"
+ccm_package_version="$RET"
+
+case "$1" in
+ remove|purge|upgrade|deconfigure)
+
+ ccm_update_ccm_classpath remove $ccm_package_name $ccm_package_version
+ ccm_update_ccm_webapps remove $ccm_package_name $ccm_package_version
+ ;;
+
+ failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+if [ "$1" = "remove" -a "$ccm_package_name" = "ccm-core" -a -x "/etc/init.d/ccm" ]; then
+ invoke-rc.d ccm stop || true
+fi
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Added: trunk/ccm-cms/debian/rules
===================================================================
--- trunk/ccm-cms/debian/rules 2006-06-14 10:59:54 UTC (rev 1162)
+++ trunk/ccm-cms/debian/rules 2006-06-14 11:41:57 UTC (rev 1163)
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+# debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
+#
+# This version is for packages that are architecture independent.
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: rules,v 1.1.1.1 2004/11/12 09:30:00 fabrice Exp $
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build.xml:
+ dh_testdir
+ # Add here commands to configure the package.
+ @sh debian/ccm-config.sh
+
+build: build-stamp
+build-stamp: build.xml
+ dh_testdir
+
+ # Add here commands to compile the package.
+ @sh debian/ccm-build.sh
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ @sh debian/ccm-clean.sh
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/<packagename>.
+ @sh debian/ccm-install.sh $(CURDIR)/debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ @sh debian/ccm-disperse.sh debian/tmp
+# dh_install --sourcedir=debian/tmp
+# dh_installmenu
+ dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
..
|
|
From: <fa...@vh...> - 2006-06-14 11:04:24
|
Author: fabrice
Date: 2006-06-14 12:59:54 +0200 (Wed, 14 Jun 2006)
New Revision: 1162
Added:
trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql
trunk/ccm-cms/sql/ccm-cms/postgres/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql
Modified:
trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/insert-new-privileges.sql
trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.0.1-6.1.0.sql
trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.0.1-6.1.0.sql
Log:
speed up upgrade
Added: trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql 2006-06-14 10:47:06 UTC (rev 1161)
+++ trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql 2006-06-14 10:59:54 UTC (rev 1162)
@@ -0,0 +1,45 @@
+--
+-- Copyright (C) 2006 Runtime Collective Ltd. 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
+--
+-- $Id: denormalize-versioning.sql 285 2005-02-22 00:29:02Z sskracic $
+-- $DateTime: 2004/08/17 23:15:09 $
+
+
+
+
+-- this is slightly quicker than the original upgrade script, for large databases.
+-- quicker as in 13 seconds rather than 2+ days
+
+insert into acs_auditing (
+ object_id,
+ creation_user,
+ creation_date,
+ creation_ip,
+ modifying_user,
+ last_modified,
+ modifying_ip
+)
+select tt.itemId, t1.modifying_user, t1.timestamp, t1.modifying_ip, t2.modifying_user, t2.timestamp, t2.modifying_ip
+from vcx_txns t1, vcx_txns t2, (select min(oc.txn_id) as minId, max(oc.txn_id) as maxId, i.item_id as itemId
+ from vcx_obj_changes oc, cms_items i
+ where oc.obj_id in (select o.object_type || ';id:1:' || o.object_id
+ from acs_objects o
+ where o.object_id = i.item_id)
+ group by i.item_id) tt
+where t1.id = tt.minId
+and t2.id = tt.maxId;
+
Modified: trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/insert-new-privileges.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/insert-new-privileges.sql 2006-06-14 10:47:06 UTC (rev 1161)
+++ trunk/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.0.1-6.1.0/insert-new-privileges.sql 2006-06-14 10:59:54 UTC (rev 1162)
@@ -24,3 +24,5 @@
) values (
'cms_apply_alternate_workflows', 'Apply Alternate Workflows', 68, 'item'
);
+
+exec dnm_priv_utils.add_privilege('cms_apply_alternate_workflows');
Added: trunk/ccm-cms/sql/ccm-cms/postgres/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/postgres/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql 2006-06-14 10:47:06 UTC (rev 1161)
+++ trunk/ccm-cms/sql/ccm-cms/postgres/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql 2006-06-14 10:59:54 UTC (rev 1162)
@@ -0,0 +1,45 @@
+--
+-- Copyright (C) 2006 Runtime Collective Ltd. 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
+--
+-- $Id: denormalize-versioning.sql 285 2005-02-22 00:29:02Z sskracic $
+-- $DateTime: 2004/08/17 23:15:09 $
+
+
+
+
+-- this is slightly quicker than the original upgrade script, for large databases.
+-- quicker as in 13 seconds rather than 2+ days
+
+insert into acs_auditing (
+ object_id,
+ creation_user,
+ creation_date,
+ creation_ip,
+ modifying_user,
+ last_modified,
+ modifying_ip
+)
+select tt.itemId, t1.modifying_user, t1.timestamp, t1.modifying_ip, t2.modifying_user, t2.timestamp, t2.modifying_ip
+from vcx_txns t1, vcx_txns t2, (select min(oc.txn_id) as minId, max(oc.txn_id) as maxId, i.item_id as itemId
+ from vcx_obj_changes oc, cms_items i
+ where oc.obj_id in (select o.object_type || ';id:1:' || o.object_id
+ from acs_objects o
+ where o.object_id = i.item_id)
+ group by i.item_id) tt
+where t1.id = tt.minId
+and t2.id = tt.maxId;
+
Modified: trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.0.1-6.1.0.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.0.1-6.1.0.sql 2006-06-14 10:47:06 UTC (rev 1161)
+++ trunk/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.0.1-6.1.0.sql 2006-06-14 10:59:54 UTC (rev 1162)
@@ -20,7 +20,7 @@
PROMPT Red Hat Enterprise CMS 6.0.1 -> 6.1.0 Upgrade Script (Oracle)
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/denormalize-versioning.sql
+@@ ../oracle-se/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql
@@ ../oracle-se/upgrade/6.0.1-6.1.0/add-mpa-page-break.sql
@@ ../oracle-se/upgrade/6.0.1-6.1.0/alter-table-authoring_steps.sql
@@ ../oracle-se/upgrade/6.0.1-6.1.0/alter-table-cms_form_item.sql
Modified: trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.0.1-6.1.0.sql
===================================================================
--- trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.0.1-6.1.0.sql 2006-06-14 10:47:06 UTC (rev 1161)
+++ trunk/ccm-cms/sql/ccm-cms/upgrade/postgres-6.0.1-6.1.0.sql 2006-06-14 10:59:54 UTC (rev 1162)
@@ -24,7 +24,7 @@
alter table content_sections drop content_expiration_digest_id;
-\i ../postgres/upgrade/6.0.1-6.1.0/denormalize-versioning.sql
+\i ../postgres/upgrade/6.0.1-6.1.0/denormalize-versioning-quick.sql
\i ../postgres/upgrade/6.0.1-6.1.0/alter-table-authoring_steps.sql
\i ../postgres/upgrade/6.0.1-6.1.0/alter-table-cms_form_item.sql
\i ../postgres/upgrade/6.0.1-6.1.0/insert-new-privileges.sql
|
Author: fabrice Date: 2006-06-14 12:47:06 +0200 (Wed, 14 Jun 2006) New Revision: 1161 Added: trunk/ccm-bookmarks/ trunk/ccm-bookmarks/application.xml trunk/ccm-bookmarks/debian/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc.install trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/DEBIAN/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/DEBIAN/control trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/DEBIAN/md5sums trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/usr/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/usr/share/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/usr/share/doc/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/usr/share/doc/ccm-bookmarks-doc/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/usr/share/doc/ccm-bookmarks-doc/changelog.Debian.gz trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/usr/share/doc/ccm-bookmarks-doc/copyright trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/allclasses-frame.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/allclasses-noframe.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ApplicationAuthenticationListener.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/Bookmark.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/BookmarkApplication.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/BookmarkCollection.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/BookmarkDispatcher.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/class-use/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/class-use/ApplicationAuthenticationListener.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/class-use/Bookmark.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/class-use/BookmarkApplication.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/class-use/BookmarkCollection.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/class-use/BookmarkDispatcher.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/Initializer.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/class-use/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/class-use/Initializer.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/package-frame.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/package-summary.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/package-tree.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/installer/package-use.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/package-frame.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/package-summary.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/package-tree.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/package-use.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkBasePage.CurrentApplicationLabelPrinter.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkBasePage.CurrentApplicationLinkPrinter.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkBasePage.ParentApplicationLinkPrinter.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkBasePage.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkEditPane.DeleteForm.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkEditPane.EditBookmarkForm.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkEditPane.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/BookmarkPortlet.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkBasePage.CurrentApplicationLabelPrinter.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkBasePage.CurrentApplicationLinkPrinter.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkBasePage.ParentApplicationLinkPrinter.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkBasePage.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkEditPane.DeleteForm.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkEditPane.EditBookmarkForm.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkEditPane.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/class-use/BookmarkPortlet.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/package-frame.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/package-summary.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/package-tree.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/ui/package-use.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/GlobalizationUtil.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/class-use/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/class-use/GlobalizationUtil.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/package-frame.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/package-summary.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/package-tree.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/com/arsdigita/bookmarks/util/package-use.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/constant-values.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/deprecated-list.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/help-doc.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/index-all.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/index.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/overview-frame.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/overview-summary.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/overview-tree.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/package-list trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/packages.html trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/resources/ trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/resources/inherit.gif trunk/ccm-bookmarks/debian/ccm-bookmarks-doc/var/www/html/ccm-bookmarks-6.3.0/api/stylesheet.css trunk/ccm-bookmarks/debian/ccm-bookmarks.dirs trunk/ccm-bookmarks/debian/ccm-bookmarks.install trunk/ccm-bookmarks/debian/ccm-bookmarks.postrm.debhelper trunk/ccm-bookmarks/debian/ccm-bookmarks.substvars trunk/ccm-bookmarks/debian/ccm-bookmarks/ trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/ trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/config trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/control trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/md5sums trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/postinst trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/postrm trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/prerm trunk/ccm-bookmarks/debian/ccm-bookmarks/DEBIAN/templates trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/doc/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/doc/ccm-bookmarks/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/doc/ccm-bookmarks/changelog.Debian.gz trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/doc/ccm-bookmarks/copyright trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-pdl.jar trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-sql.jar trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0.jar trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/bookmarks/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/bookmarks/xsl/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/bookmarks/xsl/index.xsl trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/ trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks-portlet.xsl trunk/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks.xsl trunk/ccm-bookmarks/debian/ccm-build.sh trunk/ccm-bookmarks/debian/ccm-clean.sh trunk/ccm-bookmarks/debian/ccm-config.sh trunk/ccm-bookmarks/debian/ccm-disperse.sh trunk/ccm-bookmarks/debian/ccm-install.sh trunk/ccm-bookmarks/debian/ccm-settings-run.sh trunk/ccm-bookmarks/debian/ccm-settings.sh trunk/ccm-bookmarks/debian/changelog trunk/ccm-bookmarks/debian/compat trunk/ccm-bookmarks/debian/config trunk/ccm-bookmarks/debian/control trunk/ccm-bookmarks/debian/copyright trunk/ccm-bookmarks/debian/files trunk/ccm-bookmarks/debian/postinst trunk/ccm-bookmarks/debian/postrm trunk/ccm-bookmarks/debian/prerm trunk/ccm-bookmarks/debian/rules trunk/ccm-bookmarks/debian/templates trunk/ccm-bookmarks/doc/ trunk/ccm-bookmarks/etc/ trunk/ccm-bookmarks/etc/enterprise.init trunk/ccm-bookmarks/etc/servlet-declarations.xml trunk/ccm-bookmarks/etc/servlet-mappings.xml trunk/ccm-bookmarks/pdl/ trunk/ccm-bookmarks/pdl/com/ trunk/ccm-bookmarks/pdl/com/arsdigita/ trunk/ccm-bookmarks/pdl/com/arsdigita/bookmarks/ trunk/ccm-bookmarks/pdl/com/arsdigita/bookmarks/Bookmark.pdl trunk/ccm-bookmarks/pdl/com/arsdigita/bookmarks/Bookmark.pdl.DEPRECATED trunk/ccm-bookmarks/pdl/com/arsdigita/bookmarks/BookmarkPortlet.pdl trunk/ccm-bookmarks/sql/ trunk/ccm-bookmarks/sql/ccm-bookmarks/ trunk/ccm-bookmarks/sql/ccm-bookmarks/oracle-se-create.sql trunk/ccm-bookmarks/sql/ccm-bookmarks/postgres-create.sql trunk/ccm-bookmarks/src/ trunk/ccm-bookmarks/src/WEB-INF/ trunk/ccm-bookmarks/src/ccm-bookmarks.config trunk/ccm-bookmarks/src/ccm-bookmarks.load trunk/ccm-bookmarks/src/ccm-bookmarks.upgrade trunk/ccm-bookmarks/src/com/ trunk/ccm-bookmarks/src/com/arsdigita/ trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ApplicationAuthenticationListener.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/Bookmark.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/BookmarkApplication.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/BookmarkCollection.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/BookmarkDispatcher.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/installer/ trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/installer/Initializer.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/ trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkBasePage.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkEditPane.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkPortlet.java trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/ui/BookmarkResources.properties trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/util/ trunk/ccm-bookmarks/src/com/arsdigita/bookmarks/util/GlobalizationUtil.java trunk/ccm-bookmarks/test/ trunk/ccm-bookmarks/web/ trunk/ccm-bookmarks/web/__ccm__/ trunk/ccm-bookmarks/web/__ccm__/apps/ trunk/ccm-bookmarks/web/__ccm__/apps/bookmarks/ trunk/ccm-bookmarks/web/__ccm__/apps/bookmarks/xsl/ trunk/ccm-bookmarks/web/__ccm__/apps/bookmarks/xsl/index.xsl trunk/ccm-bookmarks/web/packages/ trunk/ccm-bookmarks/web/packages/bookmarks/ trunk/ccm-bookmarks/web/packages/bookmarks/xsl/ trunk/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks-portlet.xsl trunk/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl trunk/ccm-docmgr/ trunk/ccm-docmgr/application.xml trunk/ccm-docmgr/debian/ trunk/ccm-docmgr/debian/ccm-build.sh trunk/ccm-docmgr/debian/ccm-clean.sh trunk/ccm-docmgr/debian/ccm-config.sh trunk/ccm-docmgr/debian/ccm-disperse.sh trunk/ccm-docmgr/debian/ccm-docmgr-doc.install trunk/ccm-docmgr/debian/ccm-docmgr-doc/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/DEBIAN/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/DEBIAN/control trunk/ccm-docmgr/debian/ccm-docmgr-doc/DEBIAN/md5sums trunk/ccm-docmgr/debian/ccm-docmgr-doc/usr/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/usr/share/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/usr/share/doc/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/usr/share/doc/ccm-docmgr-doc/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/usr/share/doc/ccm-docmgr-doc/changelog.Debian.gz trunk/ccm-docmgr/debian/ccm-docmgr-doc/usr/share/doc/ccm-docmgr-doc/copyright trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/allclasses-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/allclasses-noframe.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocFolder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocFolderLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocLink.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocLinkLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocMgr.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocMgrConfig.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/Document.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocumentCategoryBrowserApplication.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocumentCollection.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/DocumentLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/LegacyCategoryBrowserApplication.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/Repository.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/Resource.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ResourceExistsException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/Util.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocFolder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocFolderLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocLink.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocLinkLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocMgr.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocMgrConfig.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/Document.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocumentCategoryBrowserApplication.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocumentCollection.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/DocumentLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/LegacyCategoryBrowserApplication.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/Repository.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/Resource.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/ResourceExistsException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/class-use/Util.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/DocumentAssetPage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/class-use/DocumentAssetPage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/class-use/MultilingualDocumentResolver.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/dispatcher/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/DocFolderInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/DocLinkInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/DocumentInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/Initializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/MimeIconInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/class-use/DocFolderInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/class-use/DocLinkInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/class-use/DocumentInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/class-use/Initializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/class-use/MimeIconInitializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/installer/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/IntermediaSearchResults.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/IntermediaSearcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/LuceneSearchResults.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/LuceneSearcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/SearchResult.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/SearchResults.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/SearchUtils.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/Searcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/IntermediaSearchResults.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/IntermediaSearcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/LuceneSearchResults.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/LuceneSearcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/SearchResult.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/SearchResults.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/SearchUtils.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/class-use/Searcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/search/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/BrowseFileInfoPropertiesPane.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/BrowseFileRevisionsTable.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/BrowseFolderEdit.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/CategoriesPrintListener.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/CategoryDocModelBuilder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/CategoryDocsNavigatorPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/CategoryItemsBrowser.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/CreateDocLinkSearchTable.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DCNDispatcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DMConstants.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DMDispatcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DMUtils.DateFormat.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DMUtils.FileSize.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DMUtils.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DocmgrBasePage.CurrentApplicationLabelPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DocmgrBasePage.CurrentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DocmgrBasePage.ParentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/DocmgrBasePage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/FileDimensionalNavbar.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/FileUploadForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/LegacyCategoryDocsNavigatorPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/PagingControlContainer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/RecentUpdatedDocsPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/SearchForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/SearchList.SearchResultDisplay.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/SearchList.SearchResultRenderer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/SearchList.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/SearchListModelBuilder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/SearchStringValidationListener.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/DocLinkPropertyForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/DocLinkStep.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/DocumentPropertiesStep.FileFormatter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/DocumentPropertiesStep.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/DocumentPropertyForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/FileDisplay.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/DocLinkPropertyForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/DocLinkStep.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/DocumentPropertiesStep.FileFormatter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/DocumentPropertiesStep.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/DocumentPropertyForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/class-use/FileDisplay.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/authoring/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/BrowseFileInfoPropertiesPane.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/BrowseFileRevisionsTable.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/BrowseFolderEdit.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/CategoriesPrintListener.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/CategoryDocModelBuilder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/CategoryDocsNavigatorPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/CategoryItemsBrowser.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/CreateDocLinkPane.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/CreateDocLinkSearchTable.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DCNDispatcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DMConstants.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DMDispatcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DMUtils.DateFormat.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DMUtils.FileSize.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DMUtils.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DocmgrBasePage.CurrentApplicationLabelPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DocmgrBasePage.CurrentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DocmgrBasePage.ParentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/DocmgrBasePage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/FileDimensionalNavbar.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/FileUploadForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/LegacyCategoryDocsNavigatorPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/PagingControlContainer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/RecentUpdatedDocsPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/SearchForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/SearchList.SearchResultDisplay.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/SearchList.SearchResultRenderer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/SearchList.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/SearchListModelBuilder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/class-use/SearchStringValidationListener.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/DocFolderNavbar.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/DocIndexPage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/class-use/DocFolderNavbar.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/class-use/DocIndexPage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/content/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/DocFolderAppCellRenderer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/DocFolderContentTreeRenderer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/DocFolderIterator.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/DocFolderTreeNode.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/DocFoldersContentTree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/DocFoldersContentTreeModel.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/RepositoryTreeModel.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/DocFolderAppCellRenderer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/DocFolderContentTreeRenderer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/DocFolderIterator.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/DocFolderTreeNode.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/DocFoldersContentTree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/DocFoldersContentTreeModel.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/class-use/RepositoryTreeModel.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/ui/tree/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/GlobalizationUtil.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/class-use/GlobalizationUtil.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/cms/docmgr/util/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ApplicationAuthenticationListener.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/Constants.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ContentTypeException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/DocBlobject.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/File.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/Folder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/InvalidMimeTypeFormatException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/InvalidNameException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/Lockable.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/MimeTypeXMLLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/Repository.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/Resource.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ResourceException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ResourceExistsException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ResourceImpl.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ResourceImplCollection.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ResourceNotEmptyException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/TypeChangeException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/Util.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ApplicationAuthenticationListener.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/Constants.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ContentTypeException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/DocBlobject.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/File.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/Folder.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/InvalidMimeTypeFormatException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/InvalidNameException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/Lockable.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/MimeTypeXMLLoader.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/Repository.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/Resource.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ResourceException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ResourceExistsException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ResourceImpl.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ResourceImplCollection.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/ResourceNotEmptyException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/TypeChangeException.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/class-use/Util.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/Initializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/class-use/Initializer.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/installer/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DMConstants.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DMDispatcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DMUtils.DateFormat.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DMUtils.FileSize.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DMUtils.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DocmgrBasePage.CurrentApplicationLabelPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DocmgrBasePage.CurrentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DocmgrBasePage.ParentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/DocmgrBasePage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/FileUploadForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/RecentUpdatedDocsPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DMConstants.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DMDispatcher.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DMUtils.DateFormat.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DMUtils.FileSize.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DMUtils.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DocmgrBasePage.CurrentApplicationLabelPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DocmgrBasePage.CurrentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DocmgrBasePage.ParentApplicationLinkPrinter.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/DocmgrBasePage.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/FileUploadForm.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/class-use/RecentUpdatedDocsPortlet.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/ui/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/GlobalizationUtil.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/class-use/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/class-use/GlobalizationUtil.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/package-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/package-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/package-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/com/arsdigita/docmgr/util/package-use.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/constant-values.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/deprecated-list.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/help-doc.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/index-all.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/index.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/overview-frame.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/overview-summary.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/overview-tree.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/package-list trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/packages.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/resources/ trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/resources/inherit.gif trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/serialized-form.html trunk/ccm-docmgr/debian/ccm-docmgr-doc/var/www/html/ccm-docmgr-6.3.0/api/stylesheet.css trunk/ccm-docmgr/debian/ccm-docmgr.dirs trunk/ccm-docmgr/debian/ccm-docmgr.install trunk/ccm-docmgr/debian/ccm-docmgr.postrm.debhelper trunk/ccm-docmgr/debian/ccm-docmgr.substvars trunk/ccm-docmgr/debian/ccm-docmgr/ trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/ trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/config trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/control trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/md5sums trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/postinst trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/postrm trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/prerm trunk/ccm-docmgr/debian/ccm-docmgr/DEBIAN/templates trunk/ccm-docmgr/debian/ccm-docmgr/usr/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/doc/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/doc/ccm-docmgr/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/doc/ccm-docmgr/changelog.Debian.gz trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/doc/ccm-docmgr/copyright trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-pdl.jar trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-sql.jar trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0.jar trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/cmsdocs/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/cmsdocs/xsl/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/cmsdocs/xsl/index.xsl trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/ trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-16.gif trunk/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/appl... [truncated message content] |
|
From: <ap...@vh...> - 2006-06-13 20:02:30
|
Author: apevec
Date: 2006-06-13 21:58:01 +0200 (Tue, 13 Jun 2006)
New Revision: 1160
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
fix filter
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-13 19:30:12 UTC (rev 1159)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-13 19:58:01 UTC (rev 1160)
@@ -490,7 +490,7 @@
Domain domain = Domain.retrieve(domainKey);
if (domain != null) {
DomainCollection terms = domain.getTerms();
- Filter f = terms.addFilter("upper(Term.NAME) = :name");
+ Filter f = terms.addFilter("upper("+Term.NAME+") = :name");
f.set("name", name.toUpperCase());
if (terms.next()) {
Term term = (Term) terms.getDomainObject();
|
|
From: <ap...@vh...> - 2006-06-13 19:34:50
|
Author: apevec
Date: 2006-06-13 21:30:12 +0200 (Tue, 13 Jun 2006)
New Revision: 1159
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
fix DublinCoreItem NPE
ignore case in findTerm
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-13 16:42:30 UTC (rev 1158)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-13 19:30:12 UTC (rev 1159)
@@ -450,17 +450,17 @@
}
private void assignKeywords() {
- if (item != null) {
+ if (item != null && !keywords.isEmpty()) {
DublinCoreItem dcItem = DublinCoreItem.findByOwner(item);
- // append into dcItem.getKeywords()
- // NOTE: "DC keywords" metadata is stored as a string, cannot tell which keywords are auto.
- // To support that, datamodel change to 1:N mapping table would be required.
- String dcKeywords = dcItem.getKeywords();
- if (dcKeywords != null) {
- StringTokenizer tok = new StringTokenizer(dcKeywords, ";");
- // merge old "DC keywords" into set of new ones
- while (tok.hasMoreTokens()) {
- keywords.add(tok.nextToken().trim());
+ if (dcItem != null) {
+ // preserve existing dcItem.getKeywords()
+ // NOTE: "DC keywords" metadata is stored as a string, cannot tell which keywords are auto.
+ String dcKeywords = dcItem.getKeywords();
+ if (dcKeywords != null) {
+ StringTokenizer tok = new StringTokenizer(dcKeywords, ";");
+ while (tok.hasMoreTokens()) {
+ keywords.add(tok.nextToken().trim());
+ }
}
}
StringBuffer buf = new StringBuffer();
@@ -470,13 +470,16 @@
buf.append(i.next());
}
for (; i.hasNext();) {
- buf.append(' ').append(';').append(i.next());
+ buf.append(';').append(' ').append(i.next());
}
- dcKeywords = buf.toString();
+ String dcKeywords = buf.toString();
if (isVerbose) {
out("ASSIGN DC keywords \""+dcKeywords+"\"");
}
if (persistChanges) {
+ if (dcItem == null) {
+ dcItem = DublinCoreItem.create(item);
+ }
dcItem.setKeywords(dcKeywords);
}
}
@@ -487,7 +490,8 @@
Domain domain = Domain.retrieve(domainKey);
if (domain != null) {
DomainCollection terms = domain.getTerms();
- terms.addEqualsFilter(Term.NAME, name);
+ Filter f = terms.addFilter("upper(Term.NAME) = :name");
+ f.set("name", name.toUpperCase());
if (terms.next()) {
Term term = (Term) terms.getDomainObject();
terms.close();
|
|
From: <ap...@vh...> - 2006-06-13 16:47:16
|
Author: apevec
Date: 2006-06-13 18:42:30 +0200 (Tue, 13 Jun 2006)
New Revision: 1158
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
Log:
w/o web context fallback to the primary language instance
Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java 2006-06-12 08:49:35 UTC (rev 1157)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java 2006-06-13 16:42:30 UTC (rev 1158)
@@ -877,10 +877,15 @@
// TODO: do something about this UCI (Unknown Content Item)...
// XXX sketchy getRequest
- final ContentItem resolved =
- ((ContentBundle) item).negotiate
- (Web.getRequest().getLocales());
-
+ HttpServletRequest req = Web.getRequest();
+ final ContentItem resolved;
+ if (req != null) {
+ resolved = ((ContentBundle) item)
+ .negotiate(req.getLocales());
+ } else {
+ // fallback to the primary instance when request is not available
+ resolved = ((ContentBundle) item).getPrimaryInstance();
+ }
if (s_log.isDebugEnabled()) {
s_log.debug("Resolved URL to item " + resolved);
}
|
|
From: <ap...@vh...> - 2006-06-12 08:53:59
|
Author: apevec
Date: 2006-06-12 10:49:35 +0200 (Mon, 12 Jun 2006)
New Revision: 1157
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
add paths explicitly
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-11 21:11:03 UTC (rev 1156)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-12 08:49:35 UTC (rev 1157)
@@ -364,6 +364,8 @@
Filter f = dc.addFilter("model.id IN :manualCats");
f.set("manualCats", manualCategories);
dc.addFilter("domain.key IN ('IPSV','LGCL')");
+ dc.addPath("domain.key");
+ dc.addPath("model.id");
while (dc.next()) {
String domainKey = (String)dc.get("domain.key");
if ("IPSV".equals(domainKey)) {
|
|
From: <ap...@vh...> - 2006-06-11 21:15:28
|
Author: apevec
Date: 2006-06-11 23:11:03 +0200 (Sun, 11 Jun 2006)
New Revision: 1156
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java
Log:
derive IPSV/LGCL from manually assigned LGCL/IPSV
expose useful code buried in ui.ItemCategoryPicker
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-10 20:33:39 UTC (rev 1155)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-11 21:11:03 UTC (rev 1156)
@@ -7,7 +7,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import java.util.StringTokenizer;
import javax.xml.parsers.ParserConfigurationException;
@@ -21,12 +20,11 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import com.arsdigita.aplaws.ui.ItemCategoryPicker;
import com.arsdigita.categorization.Category;
+import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.ContentPage;
import com.arsdigita.cms.ContentSection;
-import com.arsdigita.cms.ContentSectionCollection;
-import com.arsdigita.cms.ContentSectionConfig;
import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainCollection;
@@ -41,7 +39,7 @@
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.Session;
+import com.arsdigita.persistence.Filter;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.web.Application;
/**
@@ -115,14 +113,21 @@
String urlid;
String url;
ContentItem item;
+ ContentBundle bundle;
String scheme;
Collection keywords = new HashSet();
Collection terms = new HashSet();
+ Domain ipsv, lgcl, gcl, lgsl, lgdl;
public SearchlightHandler(boolean isDebug, boolean isVerbose, boolean persistChanges) {
this.isDebug = isDebug;
this.isVerbose = isVerbose;
this.persistChanges = persistChanges;
+ ipsv = Domain.retrieve("IPSV");
+ lgcl = Domain.retrieve("LGCL");
+ gcl = Domain.retrieve("GCL");
+ lgsl = Domain.retrieve("LGSL");
+ lgdl = Domain.retrieve("LGDL");
}
public void startDocument() throws SAXException {
@@ -148,6 +153,7 @@
urlid = null;
url = null;
item = null;
+ bundle = null;
} else if ("unformated_data".equals(qName)) {
keywords.clear();
terms.clear();
@@ -158,9 +164,10 @@
scheme = attributes.getValue("scheme");
} // if qName
}
- // XXX term@id is *NOT* Term.uniqueID, use category_date and retrieve terms by name
+ // XXX term@id is *NOT* Term.uniqueID, use unformated_data/category_data
+ // and retrieve terms by name
/* example from CAMDEN.xml
- * <tags>
+ <tags>
<terms>
<term score="40" thesarus="LGTL" id="9087">A to Z</term>
<term score="6" thesarus="LGCS" id="8030">Development control</term>
@@ -178,7 +185,7 @@
<category_data scheme="LGSL">Development Control</category_data>
<category_data scheme="IPSV">Domestic violence; Planning (town and country)</category_data>
</unformated_data>
- * </tags>
+ </tags>
*/
public void endElement(String uri, String localName, String qName)
throws SAXException {
@@ -330,11 +337,12 @@
private void assignTerms() {
if (item != null) {
+ bundle = (ContentBundle) item.getParent();
Collection manualCategories = new HashSet();
Collection oldAutoCategories = new HashSet();
Collection newAutoCategories = new LinkedList();
DataAssociationCursor cursor = ((DataAssociation)DomainServiceInterfaceExposer
- .get(item, "categories")).cursor();
+ .get(bundle, "categories")).cursor();
// cat_object_category_map.auto_p
// cursor.addEqualsFilter("link.isAuto", Boolean.FALSE);
while (cursor.next()) {
@@ -347,34 +355,39 @@
}
}
// assign all new auto-derived terms, unless it's already assigned
- // prefer manual IPSV/LGCL over auto IPSV, deriving GCL, LGSL, LGDL
+ // prefer manual IPSV/LGCL over auto IPSV
// check existing manual terms
- boolean foundIPSVLGCL = false;
+ Collection manualIPSV = new LinkedList();
+ Collection manualLGCL = new LinkedList();
if (!manualCategories.isEmpty()) {
DataCollection dc = SessionManager.getSession().retrieve(Term.BASE_DATA_OBJECT_TYPE);
- dc.addEqualsFilter("model.id", manualCategories);
+ Filter f = dc.addFilter("model.id IN :manualCats");
+ f.set("manualCats", manualCategories);
dc.addFilter("domain.key IN ('IPSV','LGCL')");
- while (!foundIPSVLGCL && dc.next()) {
- foundIPSVLGCL = true;
- if (isVerbose) {
- out("manual IPSV/LGCL found");
+ while (dc.next()) {
+ String domainKey = (String)dc.get("domain.key");
+ if ("IPSV".equals(domainKey)) {
+ manualIPSV.add(dc.get("model.id"));
+ } else if ("LGCL".equals(domainKey)) {
+ manualLGCL.add(dc.get("model.id"));
}
}
- dc.close();
}
- if (!foundIPSVLGCL) {
+ if (manualIPSV.isEmpty() && manualLGCL.isEmpty()) {
+ // neither IPSV nor LGCL were manually assigned
+ // free to auto assign everything
for (Iterator iter=terms.iterator();iter.hasNext();) {
Term t = (Term) iter.next();
BigDecimal categoryID = t.getModel().getID();
if ( !manualCategories.contains(categoryID)) {
if (!oldAutoCategories.contains(categoryID)) {
if (persistChanges) {
- t.addObject(item);
+ t.addObject(bundle);
}
newAutoCategories.add(categoryID); // to be marked isAuto
if (isVerbose) {
- out("ASSIGN " + t + " to "
- + item);
+ out("autoASSIGN " + t + " to "
+ + bundle);
}
} else {
oldAutoCategories.remove(categoryID);
@@ -390,33 +403,47 @@
for (Iterator iter=oldAutoCategories.iterator(); iter.hasNext(); ) {
Category category = new Category((BigDecimal) iter.next());
if (persistChanges) {
- category.removeChild(item);
+ category.removeChild(bundle);
}
if (isVerbose){
- out("removing oldAuto "+category+" from "+item);
+ out("removing oldAuto "+category+" from "+bundle);
}
}
if (!newAutoCategories.isEmpty()) {
- cursor = ((DataAssociation)DomainServiceInterfaceExposer
- .get(item, "categories")).cursor();
- cursor.addEqualsFilter("id", newAutoCategories);
+ cursor = ((DataAssociation) DomainServiceInterfaceExposer
+ .get(bundle, "categories")).cursor();
+ Filter f = cursor.addFilter("id IN :newAutoCats");
+ f.set("newAutoCats", newAutoCategories);
while (cursor.next()) {
Object categoryID = cursor.get("id");
if (persistChanges) {
DataObject link = cursor.getLink();
- link.set("isAuto",Boolean.TRUE);
+ link.set("isAuto", Boolean.TRUE);
}
if (isVerbose) {
- out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
+ out("isAuto=TRUE for new categoryID="
+ + categoryID + "/" + bundle);
}
+
}
}
} else {
- // TODO derive other domains from assigned terms using mappings
+ // derive empty LGCL or IPSV from the other manually
if (isVerbose) {
out("derive from manual LGCL/IPSV");
}
+ // only one manual* can be empty
+ if (manualLGCL.isEmpty()) {
+ // TODO move getRelatedTerms etc. out of UI code
+ Collection relatedLGCL = ItemCategoryPicker.getRelatedTerms(manualIPSV, lgcl);
+ ItemCategoryPicker.assignTerms(relatedLGCL, bundle);
+ }
+ if (manualIPSV.isEmpty()) {
+ Collection relatedIPSV = ItemCategoryPicker.getRelatedTerms(manualLGCL, ipsv);
+ ItemCategoryPicker.assignTerms(relatedIPSV, bundle);
+ }
}
+ // TODO assign related GCL, LGSL, LGDL - move that code out of UI (ItemCategoryPicker)
}
}
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java 2006-06-10 20:33:39 UTC (rev 1155)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java 2006-06-11 21:11:03 UTC (rev 1156)
@@ -19,12 +19,14 @@
package com.arsdigita.aplaws.ui;
import com.arsdigita.aplaws.Aplaws;
+import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
+import com.arsdigita.bebop.form.Widget;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.domain.DomainCollection;
@@ -36,6 +38,7 @@
import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ui.authoring.ItemCategoryForm;
+import java.util.Collection;
import java.util.List;
import java.util.LinkedList;
import java.util.Iterator;
@@ -49,7 +52,8 @@
private BigDecimalParameter m_root;
public ItemCategoryPicker(BigDecimalParameter root,
- StringParameter mode) {
+ StringParameter mode) {
+
m_form = new ItemCategoryForm(root, mode, new TermWidget(mode, this));
m_root = root;
@@ -57,6 +61,16 @@
m_form.addCompletionListener(new ItemCategoryFormCompletion());
}
+ public ItemCategoryPicker(BigDecimalParameter root,
+ StringParameter mode,
+ Widget widget) {
+ m_form = new ItemCategoryForm(root, mode, widget);
+ m_root = root;
+
+ add(m_form);
+ m_form.addCompletionListener(new ItemCategoryFormCompletion());
+ }
+
private class ItemCategoryFormCompletion implements ActionListener {
public void actionPerformed(ActionEvent ev) {
@@ -91,9 +105,9 @@
Domain aplawsNav = Domain.retrieve("APLAWS-NAV");
List lgclTerms = getCurrentCategories(domain, bundle);
- List lgslTerms = getRelatedTerms(lgclTerms, lgsl);
- List gclTerms = getRelatedTerms(lgclTerms, gcl);
- List aplawsNavTerms = null;
+ Collection lgslTerms = getRelatedTerms(lgclTerms, lgsl);
+ Collection gclTerms = getRelatedTerms(lgclTerms, gcl);
+ Collection aplawsNavTerms = null;
if (lgclOverrideAnav) {
aplawsNavTerms = getRelatedTerms(lgclTerms, aplawsNav);
}
@@ -126,7 +140,7 @@
// do LGSL -> LGCL -> GCL instead.
List lgslTerms = getCurrentCategories(lgsl, bundle);
- List lgclTerms = getRelatedTerms(lgslTerms, lgcl);
+ Collection lgclTerms = getRelatedTerms(lgslTerms, lgcl);
LinkedList lgclIDs = new LinkedList();
Iterator i = lgclTerms.iterator();
@@ -135,7 +149,7 @@
lgclIDs.add(term.getModel().getID());
}
- List gclTerms = getRelatedTerms(lgclIDs, gcl);
+ Collection gclTerms = getRelatedTerms(lgclIDs, gcl);
clearTerms(lgcl, bundle);
assignTerms(lgclTerms, bundle);
@@ -182,7 +196,8 @@
return current;
}
- protected List getRelatedTerms(List src,
+ // TODO move out of UI code
+ public static Collection getRelatedTerms(Collection src,
Domain domain) {
if (s_log.isDebugEnabled()) {
s_log.debug("Getting related terms to " + domain);
@@ -224,7 +239,8 @@
}
- protected void assignTerms(List terms,
+ // TODO move out of UI code
+ public static void assignTerms(Collection terms,
ContentBundle bundle) {
if (s_log.isDebugEnabled()) {
s_log.debug("Assigning terms to " + bundle);
|
|
From: <ap...@vh...> - 2006-06-10 20:38:03
|
Author: apevec
Date: 2006-06-10 22:33:39 +0200 (Sat, 10 Jun 2006)
New Revision: 1155
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
refactoring after Cintra feedback: term@id is *NOT* Term.uniqueID - retrieve terms by name from unformated_data/category_data
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-10 13:31:10 UTC (rev 1154)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-10 20:33:39 UTC (rev 1155)
@@ -29,6 +29,7 @@
import com.arsdigita.cms.ContentSectionConfig;
import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainServiceInterfaceExposer;
import com.arsdigita.london.cms.dublin.DublinCoreItem;
import com.arsdigita.london.navigation.Navigation;
@@ -59,7 +60,7 @@
private SAXParser parser;
public AutoCategorisation() {
- super("AutoCategorisation", "1.0", "FILENAME(Searchlight XML report) SCORE(minimal term score)");
+ super("AutoCategorisation", "1.0", "FILENAME(Searchlight XML report)");
getOptions().addOption
(OptionBuilder
.hasArg(false)
@@ -78,13 +79,12 @@
protected void doRun(CommandLine cmdLine) {
String[] args = cmdLine.getArgs();
- if (args.length == 2) {
+ if (args.length == 1) {
String filename = args[0];
- int minScore = Integer.parseInt(args[1]);
try {
boolean persistChanges = ! cmdLine.hasOption('t');
parser.parse(new InputSource(new FileReader(filename)),
- new SearchlightHandler(minScore, isDebug(), isVerbose(), persistChanges));
+ new SearchlightHandler(isDebug(), isVerbose(), persistChanges));
} catch (SAXException ex) {
throw new RuntimeException(ex);
} catch (IOException ex) {
@@ -115,15 +115,11 @@
String urlid;
String url;
ContentItem item;
- Term term;
- int score = 0;
- Collection terms = new LinkedList();
+ String scheme;
Collection keywords = new HashSet();
- boolean isKeyword;
- int minScore;
+ Collection terms = new HashSet();
- public SearchlightHandler(int minScore, boolean isDebug, boolean isVerbose, boolean persistChanges) {
- this.minScore = minScore;
+ public SearchlightHandler(boolean isDebug, boolean isVerbose, boolean persistChanges) {
this.isDebug = isDebug;
this.isVerbose = isVerbose;
this.persistChanges = persistChanges;
@@ -152,61 +148,37 @@
urlid = null;
url = null;
item = null;
- term = null;
- } else if ("terms".equals(qName)) {
- terms.clear();
- score = 0;
- } else if ("term".equals(qName)) {
- // <term score="40" thesarus="IPSV-EX" id="9586">Travel</term>
- if (item != null) {
- score = Integer.parseInt(attributes.getValue("score"));
- String domainKey = attributes.getValue("thesarus");
- Integer uniqueID = Integer.valueOf(attributes
- .getValue("id"));
- Domain domain = null;
- try {
- domain = Domain.retrieve(domainKey);
- } catch (DataObjectNotFoundException donfe) {
- if (isVerbose) {
- out("domain not found: " + domainKey);
- }
- }
- // take IPSV and LGCL only
- if (domain != null && ("IPSV".equals(domainKey) || "LGCL".equals(domainKey))) {
- try {
- term = domain.getTerm(uniqueID);
- } catch (DataObjectNotFoundException donfe) {
- if (isVerbose) {
- out("term not found: " + domainKey + '/' + uniqueID);
- }
- }
- }
- }
} else if ("unformated_data".equals(qName)) {
keywords.clear();
+ terms.clear();
+ scheme = null;
} else if ("keyword_data".equals(qName)) {
- String scheme = attributes.getValue("scheme");
- if ("IPSV".equals(scheme) || "LGCL".equals(scheme)) {
- isKeyword = true;
- } else {
- isKeyword = false;
- }
+ scheme = attributes.getValue("scheme");
+ } else if ("category_data".equals(qName)) {
+ scheme = attributes.getValue("scheme");
} // if qName
}
-/* <tags>
+ // XXX term@id is *NOT* Term.uniqueID, use category_date and retrieve terms by name
+/* example from CAMDEN.xml
+ * <tags>
<terms>
- <term score="40" thesarus="IPSV" id="6809">Information services</term>
- <term score="40" thesarus="IPSV" id="5546">Library and information services</term>
+ <term score="40" thesarus="LGTL" id="9087">A to Z</term>
+ <term score="6" thesarus="LGCS" id="8030">Development control</term>
+ <term score="6" thesarus="LGSL" id="10213">Development control</term>
+ <term score="6" thesarus="IPSV" id="12738">Development control</term>
+ <term score="6" thesarus="IPSV" id="11440">Domestic violence</term>
+ <term score="6" thesarus="IPSV" id="11695">Planning (town and country)</term>
</terms>
- <category><![CDATA[<meta name="eGMS.subject.category" scheme="IPSV" content="Library and information services" />]]></category>
- <keyword><![CDATA[<meta name="eGMS.subject.keyword" scheme="IPSV" content="Information services" />]]></keyword>
+ <category><![CDATA[<meta name="eGMS.subject.category" scheme="LGCS" content="Development Control" />]]><![CDATA[<meta name="eGMS.subject.category" scheme="LGSL" content="Development Control" />]]><![CDATA[<meta name="eGMS.subject.category" scheme="IPSV" content="Domestic violence; Planning (town and country)" />]]></category>
+ <keyword><![CDATA[<meta name="eGMS.subject.keyword" scheme="LGTL" content="A to Z" />]]><![CDATA[<meta name="eGMS.subject.keyword" scheme="IPSV" content="Development Control" />]]></keyword>
<unformated_data>
- <keyword_data scheme="IPSV-EX">Citizens Advice Bureaux; Citizen's Advice Bureaux</keyword_data>
- <keyword_data scheme="IPSV">Citizens Advice Bureaux; Citizen's Advice
-Bureaux; Advice centres; Parliament (European)</keyword_data>
- <category_data scheme="IPSV">Citizens Advice Bureaux; Citizen's Advice Bureaux; Advice agencies; European Parliament</category_data>
+ <keyword_data scheme="LGTL">A to Z</keyword_data>
+ <keyword_data scheme="IPSV">Development Control</keyword_data>
+ <category_data scheme="LGCS">Development Control</category_data>
+ <category_data scheme="LGSL">Development Control</category_data>
+ <category_data scheme="IPSV">Domestic violence; Planning (town and country)</category_data>
</unformated_data>
- </tags>
+ * </tags>
*/
public void endElement(String uri, String localName, String qName)
throws SAXException {
@@ -215,266 +187,293 @@
}
if ("urlid".equals(qName)) {
urlid = buffer.toString();
+ if (isVerbose) {
+ out("urlid "+urlid);
+ }
} else if ("urladdress".equals(qName)) {
- url = buffer.toString();
- // resolve url to the item
- // supported are Navigation and ContentSection URLs
- int ccmPrefix = url.indexOf(CCM_PREFIX);
- if (ccmPrefix > -1) {
- int appBegin = ccmPrefix + 5;
- int appEnd = url.indexOf('/', appBegin);
- if (appEnd > appBegin) {
- String appURL = url.substring(appBegin, appEnd);
- Application app = Application
- .retrieveApplicationForPath('/' + appURL + '/');
- if (app != null) {
- String appType = app.getApplicationType()
- .getApplicationObjectType();
- if (ContentSection.BASE_DATA_OBJECT_TYPE
- .equals(appType)) {
- // a Content Section URL detected, resolving
- // item path
- ContentSection cs = (ContentSection) app;
- ItemResolver resolver = cs.getItemResolver();
- if (resolver != null) {
- item = resolver.getItem(cs, url
- .substring(appEnd),
- ContentItem.LIVE);
- if (item != null) {
- item = item.getDraftVersion();
- } else {
- out("url not found: " + url);
- }
- } else {
- if (isVerbose) {
- out("invalid configuration: CS without resolver");
- }
+ findItem();
+ if (item != null && isVerbose) {
+ out("item " + item + " at " + url);
+ }
+ } else if ("keyword_data".equals(qName)) {
+ // merge all keywords
+ StringTokenizer tok = new StringTokenizer(buffer.toString(),
+ ";");
+ while (tok.hasMoreTokens()) {
+ keywords.add(tok.nextToken().trim());
+ }
+ } else if ("category_data".equals(qName)) {
+ // use only IPSV terms
+ if ("IPSV".equals(scheme)) {
+ StringTokenizer tok = new StringTokenizer(
+ buffer.toString(), ";");
+ while (tok.hasMoreTokens()) {
+ Term term = findTerm(scheme, tok.nextToken().trim());
+ if (term != null) {
+ terms.add(term);
+ }
+ }
+ }
+ } else if ("unformated_data".equals(qName)) {
+ assignKeywords();
+ assignTerms();
+ } // if qName
+ }
+
+ public void endDocument() throws SAXException {
+ if (isDebug) {
+ out("endDoc");
+ }
+ }
+
+ private void out(String line) {
+ System.out.println(line);
+ }
+
+ private void err(String line) {
+ System.err.println(line);
+ }
+
+ private void findItem() {
+ url = buffer.toString();
+ // resolve url to the item
+ // supported are Navigation and ContentSection URLs
+ int ccmPrefix = url.indexOf(CCM_PREFIX);
+ if (ccmPrefix > -1) {
+ int appBegin = ccmPrefix + 5;
+ int appEnd = url.indexOf('/', appBegin);
+ if (appEnd > appBegin) {
+ String appURL = url.substring(appBegin, appEnd);
+ Application app = Application
+ .retrieveApplicationForPath('/' + appURL + '/');
+ if (app != null) {
+ String appType = app.getApplicationType()
+ .getApplicationObjectType();
+ if (ContentSection.BASE_DATA_OBJECT_TYPE
+ .equals(appType)) {
+ // a Content Section URL detected, resolving
+ // item path
+ ContentSection cs = (ContentSection) app;
+ ItemResolver resolver = cs.getItemResolver();
+ if (resolver != null) {
+ int queryBegin = url.indexOf('?', appEnd);
+ if (queryBegin > appEnd) {
+ // MPA URLs can have ?page=N which confuses c.a.cms.d.MLIR
+ url = url.substring(0,queryBegin);
}
- } else if (Navigation.BASE_DATA_OBJECT_TYPE
- .equals(appType)) {
- // a Navigation URL detected, resolving category
- Navigation nav = (Navigation) app;
- Category cat = null;
- // categoryID=
- int catBegin = url.indexOf("categoryID=",
- appEnd);
- if (catBegin > appEnd) {
- BigDecimal catID = new BigDecimal(url
- .substring(catBegin + 11));
- cat = new Category(catID);
+ item = resolver.getItem(cs, url
+ .substring(appEnd),
+ ContentItem.LIVE);
+ if (item != null) {
+ item = item.getDraftVersion();
} else {
- // named cat path, resolve using default
- // context
- // XXX subsites?
- Category root = Category.getRootForObject(
- nav, null);
- Category[] cats = NavigationFileResolver
- .resolveCategory(root, url
- .substring(appEnd));
- if (cats != null && cats.length != 0) {
- cat = cats[cats.length - 1];
- } else {
- if (isVerbose) {
- out("category path not found: "+url);
- }
- }
+ out("live item not found for " + url);
}
- // category index item
- if (cat != null) {
- item = (ContentItem) cat.getIndexObject();
- }
} else {
if (isVerbose) {
- out("unsupported application: " + appType + " at " + url);
+ out("ContentSection without resolver");
}
}
+ } else if (Navigation.BASE_DATA_OBJECT_TYPE
+ .equals(appType)) {
+ // a Navigation URL detected, resolving category
+ Navigation nav = (Navigation) app;
+ Category cat = null;
+ // categoryID=
+ int catBegin = url.indexOf("categoryID=",
+ appEnd);
+ if (catBegin > appEnd) {
+ BigDecimal catID = new BigDecimal(url
+ .substring(catBegin + 11));
+ cat = new Category(catID);
+ } else {
+ // named cat path, resolve using
+ // default context XXX subsites?
+ Category root = Category.getRootForObject(
+ nav, null);
+ Category[] cats = NavigationFileResolver
+ .resolveCategory(root, url
+ .substring(appEnd));
+ if (cats != null && cats.length != 0) {
+ cat = cats[cats.length - 1];
+ } else {
+ if (isVerbose) {
+ out("category path not found " + url);
+ }
+ }
+ }
+ // category index item
+ if (cat != null) {
+ item = (ContentItem) cat.getIndexObject();
+ }
} else {
if (isVerbose) {
- out("application not found: " + url);
+ out("unsupported application " + appType + " at " + url);
}
}
} else {
if (isVerbose) {
- out("unsupported CCM url: " + url);
+ out("application not found " + url);
}
}
} else {
if (isVerbose) {
- out("unsupported url: " + url);
+ out("unsupported CCM url " + url);
}
}
- } else if ("terms".equals(qName)) {
- if (item != null) {
- Collection manualCategories = new HashSet();
- Collection oldAutoCategories = new HashSet();
- Collection newAutoCategories = new LinkedList();
- DataAssociationCursor cursor = ((DataAssociation)DomainServiceInterfaceExposer
- .get(item, "categories")).cursor();
- // cat_object_category_map.auto_p
- // cursor.addEqualsFilter("link.isAuto", Boolean.FALSE);
- while (cursor.next()) {
- Object categoryID = cursor.get("id");
- Boolean isAuto = (Boolean) cursor.getLinkProperty("isAuto");
- if (isAuto.booleanValue()) {
- oldAutoCategories.add(categoryID);
- } else {
- manualCategories.add(categoryID);
- }
+ } else {
+ if (isVerbose) {
+ out("unsupported url " + url);
+ }
+ }
+ }
+
+ private void assignTerms() {
+ if (item != null) {
+ Collection manualCategories = new HashSet();
+ Collection oldAutoCategories = new HashSet();
+ Collection newAutoCategories = new LinkedList();
+ DataAssociationCursor cursor = ((DataAssociation)DomainServiceInterfaceExposer
+ .get(item, "categories")).cursor();
+ // cat_object_category_map.auto_p
+ // cursor.addEqualsFilter("link.isAuto", Boolean.FALSE);
+ while (cursor.next()) {
+ Object categoryID = cursor.get("id");
+ Boolean isAuto = (Boolean) cursor.getLinkProperty("isAuto");
+ if (isAuto.booleanValue()) {
+ oldAutoCategories.add(categoryID);
+ } else {
+ manualCategories.add(categoryID);
}
- // assign all new auto-derived terms, unless it's already assigned
- // prefer manual IPSV/LGCL over auto IPSV/LGCL, deriving GCL, LGSL, LGDL
- // check existing manual terms
- boolean foundIPSVLGCL = false;
- if (!manualCategories.isEmpty()) {
- DataCollection dc = SessionManager.getSession().retrieve(Term.BASE_DATA_OBJECT_TYPE);
- dc.addEqualsFilter("model.id", manualCategories);
- dc.addFilter("domain.key IN ('IPSV','LGCL')");
- while (!foundIPSVLGCL && dc.next()) {
- foundIPSVLGCL = true;
- if (isVerbose) {
- out("manual IPSV/LGCL found");
- }
+ }
+ // assign all new auto-derived terms, unless it's already assigned
+ // prefer manual IPSV/LGCL over auto IPSV, deriving GCL, LGSL, LGDL
+ // check existing manual terms
+ boolean foundIPSVLGCL = false;
+ if (!manualCategories.isEmpty()) {
+ DataCollection dc = SessionManager.getSession().retrieve(Term.BASE_DATA_OBJECT_TYPE);
+ dc.addEqualsFilter("model.id", manualCategories);
+ dc.addFilter("domain.key IN ('IPSV','LGCL')");
+ while (!foundIPSVLGCL && dc.next()) {
+ foundIPSVLGCL = true;
+ if (isVerbose) {
+ out("manual IPSV/LGCL found");
}
- dc.close();
}
- if (!foundIPSVLGCL) {
- for (Iterator iter=terms.iterator();iter.hasNext();) {
- Term t = (Term) iter.next();
- BigDecimal categoryID = term.getModel().getID();
- if ( !manualCategories.contains(categoryID)) {
- if (!oldAutoCategories.contains(categoryID)) {
- if (persistChanges) {
- t.addObject(item);
- }
- newAutoCategories.add(categoryID); // to be marked isAuto
- if (isVerbose) {
- out("ASSIGN " + term + " to "
- + item);
- }
- } else {
- oldAutoCategories.remove(categoryID);
- if (isVerbose) {
- out("skip automatically assigned "+term);
- }
- }
- } else if (isVerbose){
- out("skip manually assigned "+term);
- }
- }
- // cleanup old auto-assigned terms
- for (Iterator iter=oldAutoCategories.iterator(); iter.hasNext(); ) {
- Category category = new Category((BigDecimal) iter.next());
- if (persistChanges) {
- category.removeChild(item);
- }
- if (isVerbose){
- out("removing oldAuto "+category+" from "+item);
- }
- }
- if (!newAutoCategories.isEmpty()) {
- cursor = ((DataAssociation)DomainServiceInterfaceExposer
- .get(item, "categories")).cursor();
- cursor.addEqualsFilter("id", newAutoCategories);
- while (cursor.next()) {
- Object categoryID = cursor.get("id");
+ dc.close();
+ }
+ if (!foundIPSVLGCL) {
+ for (Iterator iter=terms.iterator();iter.hasNext();) {
+ Term t = (Term) iter.next();
+ BigDecimal categoryID = t.getModel().getID();
+ if ( !manualCategories.contains(categoryID)) {
+ if (!oldAutoCategories.contains(categoryID)) {
if (persistChanges) {
- DataObject link = cursor.getLink();
- link.set("isAuto",Boolean.TRUE);
+ t.addObject(item);
}
+ newAutoCategories.add(categoryID); // to be marked isAuto
if (isVerbose) {
- out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
+ out("ASSIGN " + t + " to "
+ + item);
}
+ } else {
+ oldAutoCategories.remove(categoryID);
+ if (isVerbose) {
+ out("already auto assigned "+t);
+ }
}
+ } else if (isVerbose){
+ out("already manually assigned "+t);
}
- } else {
- // TODO derive other domains from assigned terms using mappings
- if (isVerbose) {
- out("derive from manual LGCL/IPSV");
+ }
+ // cleanup old auto-assigned terms
+ for (Iterator iter=oldAutoCategories.iterator(); iter.hasNext(); ) {
+ Category category = new Category((BigDecimal) iter.next());
+ if (persistChanges) {
+ category.removeChild(item);
}
+ if (isVerbose){
+ out("removing oldAuto "+category+" from "+item);
+ }
}
+ if (!newAutoCategories.isEmpty()) {
+ cursor = ((DataAssociation)DomainServiceInterfaceExposer
+ .get(item, "categories")).cursor();
+ cursor.addEqualsFilter("id", newAutoCategories);
+ while (cursor.next()) {
+ Object categoryID = cursor.get("id");
+ if (persistChanges) {
+ DataObject link = cursor.getLink();
+ link.set("isAuto",Boolean.TRUE);
+ }
+ if (isVerbose) {
+ out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
+ }
+ }
+ }
} else {
+ // TODO derive other domains from assigned terms using mappings
if (isVerbose) {
- out("skip terms, item not found");
+ out("derive from manual LGCL/IPSV");
}
}
- } else if ("term".equals(qName)) {
- // sanity check, compare term name found in MASmedia report
- // and what is loaded in the database
- String termNameFromXML = buffer.toString();
- if (term != null) {
- if (termNameFromXML.equals(term.getName())) {
- if (score >= minScore) {
- // defer assigning of the term till </terms>
- terms.add(term);
- } else if (isVerbose) {
- out("low score "+score+" for "+term.getName()+" "+term.getUniqueID());
- }
- } else if (isVerbose) {
- out("term names differ XML:"
- + termNameFromXML + " DB:"
- + term.getName());
- }
- term = null;
- } else if (isVerbose) {
- out("skipping term "
- + termNameFromXML);
- }
- keywords.clear();
- } else if ("keyword_data".equals(qName)) {
- if (isKeyword) {
- // store all keywords separately
- StringTokenizer tok = new StringTokenizer(buffer.toString(), ";");
+ }
+ }
+
+ private void assignKeywords() {
+ if (item != null) {
+ DublinCoreItem dcItem = DublinCoreItem.findByOwner(item);
+ // append into dcItem.getKeywords()
+ // NOTE: "DC keywords" metadata is stored as a string, cannot tell which keywords are auto.
+ // To support that, datamodel change to 1:N mapping table would be required.
+ String dcKeywords = dcItem.getKeywords();
+ if (dcKeywords != null) {
+ StringTokenizer tok = new StringTokenizer(dcKeywords, ";");
+ // merge old "DC keywords" into set of new ones
while (tok.hasMoreTokens()) {
keywords.add(tok.nextToken().trim());
}
}
- } else if ("unformated_data".equals(qName)) {
- if (item != null && item instanceof ContentPage) {
- ContentPage pageItem = (ContentPage) item;
- DublinCoreItem dcItem = DublinCoreItem.findByOwner(pageItem);
- // append into dcItem.getKeywords()
- // NOTE: "DC keywords" metadata is stored as a string, cannot tell which keywords are auto.
- // To support that, datamodel change to 1:N mapping table would be required.
- String dcKeywords = dcItem.getKeywords();
- if (dcKeywords != null) {
- StringTokenizer tok = new StringTokenizer(dcKeywords, ";");
- // merge old "DC keywords" into set of new ones
- while (tok.hasMoreTokens()) {
- keywords.add(tok.nextToken().trim());
- }
- }
- StringBuffer buf = new StringBuffer();
- // reconstruct "DC keywords" and store them
- Iterator i=keywords.iterator();
- if (i.hasNext()) {
- buf.append(i.next());
- }
- for (; i.hasNext();) {
- buf.append(' ').append(';').append(i.next());
- }
- dcKeywords = buf.toString();
- if (isVerbose) {
- out("ASSIGN DC keywords \""+dcKeywords+"\"");
- }
- if (persistChanges) {
- dcItem.setKeywords(dcKeywords);
- }
+ StringBuffer buf = new StringBuffer();
+ // reconstruct "DC keywords" and store them
+ Iterator i=keywords.iterator();
+ if (i.hasNext()) {
+ buf.append(i.next());
}
- } // if qName
- }
-
- public void endDocument() throws SAXException {
- if (isDebug) {
- out("endDoc");
+ for (; i.hasNext();) {
+ buf.append(' ').append(';').append(i.next());
+ }
+ dcKeywords = buf.toString();
+ if (isVerbose) {
+ out("ASSIGN DC keywords \""+dcKeywords+"\"");
+ }
+ if (persistChanges) {
+ dcItem.setKeywords(dcKeywords);
+ }
}
}
- private void out(String line) {
- System.out.println(line);
+ private Term findTerm(String domainKey, String name) {
+ try {
+ Domain domain = Domain.retrieve(domainKey);
+ if (domain != null) {
+ DomainCollection terms = domain.getTerms();
+ terms.addEqualsFilter(Term.NAME, name);
+ if (terms.next()) {
+ Term term = (Term) terms.getDomainObject();
+ terms.close();
+ return term;
+ } else if (isVerbose) {
+ out("term not found " + domainKey + '/' + name);
+ }
+ }
+ } catch (DataObjectNotFoundException donfe) {
+ if (isVerbose) {
+ out("domain not found " + domainKey);
+ }
+ }
+ return null;
}
- private void err(String line) {
- System.err.println(line);
- }
}
}
|
|
From: <ap...@vh...> - 2006-06-10 13:35:26
|
Author: apevec
Date: 2006-06-10 15:31:10 +0200 (Sat, 10 Jun 2006)
New Revision: 1154
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
fix for empty DC keywords
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-09 21:04:49 UTC (rev 1153)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-10 13:31:10 UTC (rev 1154)
@@ -435,10 +435,13 @@
// append into dcItem.getKeywords()
// NOTE: "DC keywords" metadata is stored as a string, cannot tell which keywords are auto.
// To support that, datamodel change to 1:N mapping table would be required.
- StringTokenizer tok = new StringTokenizer(dcItem.getKeywords(), ";");
- // merge old "DC keywords" into set of new ones
- while (tok.hasMoreTokens()) {
- keywords.add(tok.nextToken().trim());
+ String dcKeywords = dcItem.getKeywords();
+ if (dcKeywords != null) {
+ StringTokenizer tok = new StringTokenizer(dcKeywords, ";");
+ // merge old "DC keywords" into set of new ones
+ while (tok.hasMoreTokens()) {
+ keywords.add(tok.nextToken().trim());
+ }
}
StringBuffer buf = new StringBuffer();
// reconstruct "DC keywords" and store them
@@ -449,12 +452,12 @@
for (; i.hasNext();) {
buf.append(' ').append(';').append(i.next());
}
- String keywords = buf.toString();
+ dcKeywords = buf.toString();
if (isVerbose) {
- out("ASSIGN keywords \""+keywords+"\"");
+ out("ASSIGN DC keywords \""+dcKeywords+"\"");
}
if (persistChanges) {
- dcItem.setKeywords(keywords);
+ dcItem.setKeywords(dcKeywords);
}
}
} // if qName
|
|
From: <ap...@vh...> - 2006-06-09 21:09:06
|
Author: apevec
Date: 2006-06-09 23:04:49 +0200 (Fri, 09 Jun 2006)
New Revision: 1153
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
reformatting and minor fixes
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-09 16:08:05 UTC (rev 1152)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-09 21:04:49 UTC (rev 1153)
@@ -275,19 +275,17 @@
cat = cats[cats.length - 1];
} else {
if (isVerbose) {
- System.out
- .println("category path not found: "
- + url);
+ out("category path not found: "+url);
}
}
}
// category index item
- item = (ContentItem) cat.getIndexObject();
+ if (cat != null) {
+ item = (ContentItem) cat.getIndexObject();
+ }
} else {
if (isVerbose) {
- System.out
- .println("unsupported application: " + appType + " at "
- + url);
+ out("unsupported application: " + appType + " at " + url);
}
}
} else {
@@ -333,7 +331,7 @@
dc.addFilter("domain.key IN ('IPSV','LGCL')");
while (!foundIPSVLGCL && dc.next()) {
foundIPSVLGCL = true;
- if (isDebug) {
+ if (isVerbose) {
out("manual IPSV/LGCL found");
}
}
@@ -369,22 +367,24 @@
if (persistChanges) {
category.removeChild(item);
}
- if (isDebug){
+ if (isVerbose){
out("removing oldAuto "+category+" from "+item);
}
}
- cursor = ((DataAssociation)DomainServiceInterfaceExposer
- .get(item, "categories")).cursor();
- cursor.addEqualsFilter("id", newAutoCategories);
- while (cursor.next()) {
- Object categoryID = cursor.get("id");
- if (persistChanges) {
- DataObject link = cursor.getLink();
- link.set("isAuto",Boolean.TRUE);
+ if (!newAutoCategories.isEmpty()) {
+ cursor = ((DataAssociation)DomainServiceInterfaceExposer
+ .get(item, "categories")).cursor();
+ cursor.addEqualsFilter("id", newAutoCategories);
+ while (cursor.next()) {
+ Object categoryID = cursor.get("id");
+ if (persistChanges) {
+ DataObject link = cursor.getLink();
+ link.set("isAuto",Boolean.TRUE);
+ }
+ if (isVerbose) {
+ out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
+ }
}
- if (isDebug) {
- out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
- }
}
} else {
// TODO derive other domains from assigned terms using mappings
@@ -394,8 +394,7 @@
}
} else {
if (isVerbose) {
- System.out
- .println("skip terms, item not found");
+ out("skip terms, item not found");
}
}
} else if ("term".equals(qName)) {
@@ -411,10 +410,9 @@
out("low score "+score+" for "+term.getName()+" "+term.getUniqueID());
}
} else if (isVerbose) {
- System.out
- .println("term names differ XML:"
- + termNameFromXML + " DB:"
- + term.getName());
+ out("term names differ XML:"
+ + termNameFromXML + " DB:"
+ + term.getName());
}
term = null;
} else if (isVerbose) {
|
|
From: <ap...@vh...> - 2006-06-09 16:12:25
|
Author: apevec
Date: 2006-06-09 18:08:05 +0200 (Fri, 09 Jun 2006)
New Revision: 1152
Modified:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Log:
skip manually assigned LGCL/IPSV
Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-08 23:32:16 UTC (rev 1151)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-09 16:08:05 UTC (rev 1152)
@@ -326,15 +326,18 @@
// assign all new auto-derived terms, unless it's already assigned
// prefer manual IPSV/LGCL over auto IPSV/LGCL, deriving GCL, LGSL, LGDL
// check existing manual terms
- DataCollection dc = SessionManager.getSession().retrieve(Term.BASE_DATA_OBJECT_TYPE);
- dc.addEqualsFilter("model.id", manualCategories);
- dc.addFilter("domain.key IN ('IPSV','LGCL')");
boolean foundIPSVLGCL = false;
- while (dc.next()) {
- foundIPSVLGCL = true;
- if (isDebug) {
- out("manual IPSV/LGCL found");
+ if (!manualCategories.isEmpty()) {
+ DataCollection dc = SessionManager.getSession().retrieve(Term.BASE_DATA_OBJECT_TYPE);
+ dc.addEqualsFilter("model.id", manualCategories);
+ dc.addFilter("domain.key IN ('IPSV','LGCL')");
+ while (!foundIPSVLGCL && dc.next()) {
+ foundIPSVLGCL = true;
+ if (isDebug) {
+ out("manual IPSV/LGCL found");
+ }
}
+ dc.close();
}
if (!foundIPSVLGCL) {
for (Iterator iter=terms.iterator();iter.hasNext();) {
@@ -383,8 +386,12 @@
out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
}
}
+ } else {
+ // TODO derive other domains from assigned terms using mappings
+ if (isVerbose) {
+ out("derive from manual LGCL/IPSV");
+ }
}
- // TODO derive other domains from assigned terms using mappings
} else {
if (isVerbose) {
System.out
|
|
From: <ap...@vh...> - 2006-06-08 23:36:54
|
Author: apevec Date: 2006-06-09 01:32:16 +0200 (Fri, 09 Jun 2006) New Revision: 1151 Added: trunk/ccm-ldn-terms/doc/esd/xml-ipsv/domain-ipsv-2.00.xml trunk/ccm-ldn-terms/doc/esd/xml-ipsv/hierarchy-ipsv-2.00.xml trunk/ccm-ldn-terms/doc/esd/xml-ipsv/mapping-lgcl-1.04-ipsv-2.00.xml trunk/ccm-ldn-terms/doc/esd/xml-ipsv/mapping-lgsl-2.02-ipsv-2.00.xml trunk/ccm-ldn-terms/doc/esd/xml-ipsv/related-ipsv-2.00.xml trunk/ccm-ldn-terms/doc/esd/xml-ipsv/synonyms-ipsv-2.00.xml trunk/ccm-ldn-terms/doc/esd/xslt-1.04/Taxonomy2hierarchy.xsl trunk/ccm-ldn-terms/doc/esd/xslt-1.04/Taxonomy2synonyms.xsl Modified: trunk/ccm-ldn-terms/doc/esd/files-ipsv.txt Log: IPSV 2.0 Modified: trunk/ccm-ldn-terms/doc/esd/files-ipsv.txt =================================================================== --- trunk/ccm-ldn-terms/doc/esd/files-ipsv.txt 2006-06-07 22:08:17 UTC (rev 1150) +++ trunk/ccm-ldn-terms/doc/esd/files-ipsv.txt 2006-06-08 23:32:16 UTC (rev 1151) @@ -1,2 +1,4 @@ -http://www.esd.org.uk/standards/ipsv/1.00/ipsvhierarchy.xml,xml-ipsv/hierarchy-ipsv-1.00.xml,xslt-1.04/ItemsHierarchy2hierarchy.xsl -http://www.esd.org.uk/standards/ipsv/1.00/ipsvtermslist.xml,xml-ipsv/domain-ipsv-1.00.xml,xslt-1.04/ControlledList2domain.xsl +http://www.esd.org.uk/standards/ipsv/2.00/ipsv.xml,xml-ipsv/domain-ipsv-2.00.xml,xslt-1.04/ControlledList2domain.xsl +http://www.esd.org.uk/standards/ipsv/2.00/ipsv.xml,xml-ipsv/hierarchy-ipsv-2.00.xml,xslt-1.04/Taxonomy2hierarchy.xsl +http://www.esd.org.uk/standards/ipsv/2.00/ipsv.xml,xml-ipsv/synonyms-ipsv-2.00.xml,xslt-1.04/Taxonomy2synonyms.xsl +http://www.esd.org.uk/standards/ipsv/2.00/ipsvrelatedterms.xml,related-ipsv-2.00.xml,xslt-1.04/RelatedItems2related.xsl Added: trunk/ccm-ldn-terms/doc/esd/xml-ipsv/domain-ipsv-2.00.xml =================================================================== --- trunk/ccm-ldn-terms/doc/esd/xml-ipsv/domain-ipsv-2.00.xml 2006-06-07 22:08:17 UTC (rev 1150) +++ trunk/ccm-ldn-terms/doc/esd/xml-ipsv/domain-ipsv-2.00.xml 2006-06-08 23:32:16 UTC (rev 1151) @@ -0,0 +1,7926 @@ +<?xml version="1.0"?> +<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.esd.org.uk/standards/ipsv/2.00/ipsv.xml" key="IPSV" title="Integrated Public Service Vocabulary" version="2.00" released="2006-05-24"> + <terms:term id="1" name="Environmental monitoring" inAtoZ="true"/> + <terms:term id="2" name="Air quality monitoring" inAtoZ="false"/> + <terms:term id="4" name="Air pollution" inAtoZ="true"/> + <terms:term id="5" name="Water pollution" inAtoZ="true"/> + <terms:term id="6" name="Land pollution" inAtoZ="true"/> + <terms:term id="7" name="Effluents" inAtoZ="false"/> + <terms:term id="8" name="Toxic waste spillage" inAtoZ="false"/> + <terms:term id="9" name="Property (land)" inAtoZ="false"/> + <terms:term id="10" name="Local development plans" inAtoZ="true"/> + <terms:term id="11" name="Property planning (land or buildings)" inAtoZ="false"/> + <terms:term id="12" name="Planning applications" inAtoZ="true"/> + <terms:term id="13" name="Compulsory purchase" inAtoZ="true"/> + <terms:term id="15" name="Trees" inAtoZ="true"/> + <terms:term id="16" name="Sewage treatment and disposal" inAtoZ="false"/> + <terms:term id="17" name="Sewage disposal" inAtoZ="false"/> + <terms:term id="18" name="Septic tanks" inAtoZ="false"/> + <terms:term id="19" name="Cesspits" inAtoZ="false"/> + <terms:term id="20" name="Composting" inAtoZ="true"/> + <terms:term id="21" name="Dustbin collection" inAtoZ="true"/> + <terms:term id="22" name="Effluent treatment" inAtoZ="false"/> + <terms:term id="23" name="Recycling collection schemes" inAtoZ="false"/> + <terms:term id="24" name="Animal breeding (farm)" inAtoZ="false"/> + <terms:term id="25" name="Poultry farming" inAtoZ="false"/> + <terms:term id="26" name="Bee-keeping" inAtoZ="false"/> + <terms:term id="27" name="Intensive farming" inAtoZ="false"/> + <terms:term id="28" name="Arable farming" inAtoZ="false"/> + <terms:term id="29" name="Cereal production" inAtoZ="false"/> + <terms:term id="30" name="Wheat growing" inAtoZ="false"/> + <terms:term id="31" name="Toxic substances" inAtoZ="false"/> + <terms:term id="32" name="Poisons" inAtoZ="false"/> + <terms:term id="33" name="Wasp control" inAtoZ="true"/> + <terms:term id="34" name="Cockroaches" inAtoZ="true"/> + <terms:term id="35" name="Rat control" inAtoZ="false"/> + <terms:term id="36" name="Vermin control" inAtoZ="false"/> + <terms:term id="37" name="Business development" inAtoZ="true"/> + <terms:term id="38" name="Start-ups (business)" inAtoZ="false"/> + <terms:term id="39" name="Trading standards" inAtoZ="true"/> + <terms:term id="40" name="Licensing of businesses" inAtoZ="false"/> + <terms:term id="42" name="Markets" inAtoZ="true"/> + <terms:term id="44" name="Distribution of electricity" inAtoZ="false"/> + <terms:term id="45" name="Textile industry" inAtoZ="false"/> + <terms:term id="46" name="Metalworking industry" inAtoZ="false"/> + <terms:term id="47" name="Paper manufacturing" inAtoZ="false"/> + <terms:term id="48" name="Electrical appliance manufacture" inAtoZ="false"/> + <terms:term id="49" name="Furniture making" inAtoZ="false"/> + <terms:term id="50" name="Woodworking industry" inAtoZ="false"/> + <terms:term id="51" name="Companies" inAtoZ="false"/> + <terms:term id="53" name="Grass cutting (road verges)" inAtoZ="false"/> + <terms:term id="54" name="Free speech" inAtoZ="false"/> + <terms:term id="55" name="Property theft" inAtoZ="false"/> + <terms:term id="56" name="Parole" inAtoZ="false"/> + <terms:term id="57" name="Labour market" inAtoZ="false"/> + <terms:term id="58" name="Unemployment statistics" inAtoZ="false"/> + <terms:term id="59" name="Employment statistics" inAtoZ="false"/> + <terms:term id="60" name="Skill shortages (labour market)" inAtoZ="false"/> + <terms:term id="61" name="Inward investment" inAtoZ="false"/> + <terms:term id="62" name="Outward investment" inAtoZ="false"/> + <terms:term id="63" name="Rates (local tax for businesses)" inAtoZ="false"/> + <terms:term id="65" name="Local elections" inAtoZ="false"/> + <terms:term id="66" name="General elections" inAtoZ="false"/> + <terms:term id="67" name="Parish councils" inAtoZ="true"/> + <terms:term id="68" name="District councils" inAtoZ="false"/> + <terms:term id="69" name="Town councils" inAtoZ="false"/> + <terms:term id="70" name="County councils" inAtoZ="false"/> + <terms:term id="71" name="Mayors" inAtoZ="false"/> + <terms:term id="72" name="Maladministration" inAtoZ="false"/> + <terms:term id="73" name="Delays (public services)" inAtoZ="false"/> + <terms:term id="74" name="Complaints (public services)" inAtoZ="false"/> + <terms:term id="75" name="Incompetence (public services)" inAtoZ="false"/> + <terms:term id="76" name="Negligence (public services)" inAtoZ="false"/> + <terms:term id="77" name="Misinformation (public services)" inAtoZ="false"/> + <terms:term id="78" name="Misdirection (public services)" inAtoZ="false"/> + <terms:term id="79" name="Ombudsmen" inAtoZ="false"/> + <terms:term id="80" name="Commissions (public bodies)" inAtoZ="false"/> + <terms:term id="81" name="Cattle markets" inAtoZ="false"/> + <terms:term id="82" name="Animal markets" inAtoZ="false"/> + <terms:term id="83" name="Livestock industry" inAtoZ="false"/> + <terms:term id="84" name="Higher education" inAtoZ="false"/> + <terms:term id="85" name="Student finance" inAtoZ="false"/> + <terms:term id="86" name="Tuition fees (universities and colleges)" inAtoZ="false"/> + <terms:term id="88" name="Educational grants (students)" inAtoZ="false"/> + <terms:term id="89" name="Scholarships (students)" inAtoZ="false"/> + <terms:term id="90" name="Funding (students)" inAtoZ="false"/> + <terms:term id="91" name="A-levels and courses" inAtoZ="false"/> + <terms:term id="92" name="S-levels" inAtoZ="false"/> + <terms:term id="93" name="Higher grade qualifications" inAtoZ="false"/> + <terms:term id="94" name="SVQs and courses" inAtoZ="false"/> + <terms:term id="95" name="Scottish vocational qualifications (SVQs)" inAtoZ="false"/> + <terms:term id="96" name="School types" inAtoZ="false"/> + <terms:term id="97" name="Headteachers" inAtoZ="false"/> + <terms:term id="99" name="Schoolteachers" inAtoZ="false"/> + <terms:term id="100" name="Learning difficulties" inAtoZ="false"/> + <terms:term id="101" name="Standard grade qualifications" inAtoZ="false"/> + <terms:term id="102" name="Attendance allowance" inAtoZ="false"/> + <terms:term id="103" name="Disability allowance" inAtoZ="false"/> + <terms:term id="104" name="Allowances (welfare benefits)" inAtoZ="false"/> + <terms:term id="105" name="Disability living allowance" inAtoZ="false"/> + <terms:term id="106" name="Council tax benefit" inAtoZ="true"/> + <terms:term id="107" name="Housing benefit" inAtoZ="true"/> + <terms:term id="108" name="Incapacity benefit" inAtoZ="false"/> + <terms:term id="109" name="Income support" inAtoZ="true"/> + <terms:term id="110" name="Invalid care allowance" inAtoZ="false"/> + <terms:term id="111" name="Severe disablement allowance" inAtoZ="false"/> + <terms:term id="112" name="Travel concessions" inAtoZ="false"/> + <terms:term id="113" name="Visual impairment" inAtoZ="true"/> + <terms:term id="114" name="Sight impairment" inAtoZ="false"/> + <terms:term id="115" name="Partially sighted people" inAtoZ="false"/> + <terms:term id="116" name="Medicines" inAtoZ="false"/> + <terms:term id="117" name="Prescription drugs" inAtoZ="false"/> + <terms:term id="118" name="Over the counter drugs" inAtoZ="false"/> + <terms:term id="119" name="Drugs (prescription)" inAtoZ="false"/> + <terms:term id="120" name="Pharmaceuticals" inAtoZ="false"/> + <terms:term id="121" name="Drug abuse" inAtoZ="false"/> + <terms:term id="122" name="Drug addiction" inAtoZ="false"/> + <terms:term id="123" name="Recreational drug use" inAtoZ="false"/> + <terms:term id="124" name="Addiction (drugs)" inAtoZ="false"/> + <terms:term id="125" name="Addiction (smoking)" inAtoZ="false"/> + <terms:term id="126" name="Addiction (alcohol)" inAtoZ="false"/> + <terms:term id="128" name="Infectious diseases" inAtoZ="true"/> + <terms:term id="129" name="Contagious diseases (human)" inAtoZ="false"/> + <terms:term id="132" name="Infectious diseases (animal)" inAtoZ="false"/> + <terms:term id="133" name="Contagious diseases (animal)" inAtoZ="false"/> + <terms:term id="134" name="Asbestos" inAtoZ="true"/> + <terms:term id="135" name="Radioactive materials" inAtoZ="true"/> + <terms:term id="136" name="Hygiene" inAtoZ="true"/> + <terms:term id="137" name="Cleaning (hygiene)" inAtoZ="false"/> + <terms:term id="138" name="Washing (hygiene)" inAtoZ="false"/> + <terms:term id="139" name="Disinfection (hygiene)" inAtoZ="false"/> + <terms:term id="140" name="Child care" inAtoZ="true"/> + <terms:term id="141" name="Care for the elderly" inAtoZ="false"/> + <terms:term id="142" name="Care for the disabled" inAtoZ="false"/> + <terms:term id="143" name="Youth services" inAtoZ="true"/> + <terms:term id="144" name="Childcare" inAtoZ="false"/> + <terms:term id="146" name="Childminding" inAtoZ="true"/> + <terms:term id="148" name="Residential care (children)" inAtoZ="false"/> + <terms:term id="149" name="Nanny services" inAtoZ="false"/> + <terms:term id="151" name="Children's homes" inAtoZ="true"/> + <terms:term id="155" name="Playgroups" inAtoZ="false"/> + <terms:term id="156" name="Shopmobility" inAtoZ="true"/> + <terms:term id="157" name="Mobility for the disabled (transport)" inAtoZ="false"/> + <terms:term id="158" name="Access for disabled people" inAtoZ="true"/> + <terms:term id="159" name="Child protection" inAtoZ="true"/> + <terms:term id="161" name="Residential care (elderly people)" inAtoZ="false"/> + <terms:term id="162" name="Old people's homes" inAtoZ="true"/> + <terms:term id="163" name="Residential homes" inAtoZ="true"/> + <terms:term id="164" name="Social welfare services" inAtoZ="false"/> + <terms:term id="165" name="Respite care" inAtoZ="true"/> + <terms:term id="166" name="Day centres for the elderly" inAtoZ="false"/> + <terms:term id="167" name="Employers' responsibilities" inAtoZ="false"/> + <terms:term id="168" name="Industrial diseases" inAtoZ="false"/> + <terms:term id="169" name="Careers and career development" inAtoZ="false"/> + <terms:term id="170" name="Careers advice" inAtoZ="false"/> + <terms:term id="171" name="Army (UK)" inAtoZ="false"/> + <terms:term id="172" name="Air Force (UK)" inAtoZ="false"/> + <terms:term id="173" name="Navy (UK)" inAtoZ="false"/> + <terms:term id="174" name="UNHCR" inAtoZ="false"/> + <terms:term id="175" name="Arms (military)" inAtoZ="false"/> + <terms:term id="176" name="Armaments" inAtoZ="false"/> + <terms:term id="177" name="Military aircraft" inAtoZ="false"/> + <terms:term id="178" name="Aircraft (military)" inAtoZ="false"/> + <terms:term id="179" name="Naval vessels" inAtoZ="false"/> + <terms:term id="180" name="Warships" inAtoZ="false"/> + <terms:term id="181" name="Ships (Navy)" inAtoZ="false"/> + <terms:term id="186" name="Conflict (overseas)" inAtoZ="false"/> + <terms:term id="187" name="Conflict (industrial relations)" inAtoZ="false"/> + <terms:term id="188" name="Conflict (civil emergency)" inAtoZ="false"/> + <terms:term id="189" name="Conflict control (international)" inAtoZ="false"/> + <terms:term id="192" name="Arms (civilian use)" inAtoZ="false"/> + <terms:term id="193" name="Development aid" inAtoZ="false"/> + <terms:term id="194" name="Country parks" inAtoZ="true"/> + <terms:term id="195" name="Conservation (heritage)" inAtoZ="false"/> + <terms:term id="196" name="Opera" inAtoZ="false"/> + <terms:term id="197" name="Theatre" inAtoZ="false"/> + <terms:term id="198" name="Ballet" inAtoZ="false"/> + <terms:term id="199" name="Concerts" inAtoZ="false"/> + <terms:term id="200" name="Pop concerts" inAtoZ="false"/> + <terms:term id="201" name="Music" inAtoZ="true"/> + <terms:term id="202" name="Drama" inAtoZ="true"/> + <terms:term id="203" name="Dance" inAtoZ="true"/> + <terms:term id="204" name="Pantomime" inAtoZ="false"/> + <terms:term id="206" name="Movies" inAtoZ="false"/> + <terms:term id="207" name="Television" inAtoZ="false"/> + <terms:term id="208" name="Photography" inAtoZ="false"/> + <terms:term id="209" name="Holidays (tourism)" inAtoZ="false"/> + <terms:term id="210" name="Package holidays" inAtoZ="false"/> + <terms:term id="211" name="Holidays from work" inAtoZ="false"/> + <terms:term id="212" name="Grass cutting (garden maintenance)" inAtoZ="true"/> + <terms:term id="213" name="Street repairs" inAtoZ="false"/> + <terms:term id="214" name="Road works" inAtoZ="true"/> + <terms:term id="215" name="Speed limits" inAtoZ="true"/> + <terms:term id="216" name="Traffic calming" inAtoZ="true"/> + <terms:term id="217" name="Vehicle licences" inAtoZ="false"/> + <terms:term id="218" name="MOT certification" inAtoZ="false"/> + <terms:term id="219" name="Taxis" inAtoZ="false"/> + <terms:term id="220" name="Minicabs" inAtoZ="false"/> + <terms:term id="221" name="Bus services" inAtoZ="false"/> + <terms:term id="222" name="Coach services" inAtoZ="false"/> + <terms:term id="223" name="Occupational pensions" inAtoZ="false"/> + <terms:term id="224" name="Stakeholder pensions" inAtoZ="false"/> + <terms:term id="225" name="Claiming benefits" inAtoZ="false"/> + <terms:term id="226" name="House ownership" inAtoZ="false"/> + <terms:term id="227" name="Council housing" inAtoZ="true"/> + <terms:term id="228" name="Home ownership" inAtoZ="false"/> + <terms:term id="230" name="Property (housing)" inAtoZ="false"/> + <terms:term id="231" name="Tenancy (housing)" inAtoZ="false"/> + <terms:term id="232" name="Squatters" inAtoZ="false"/> + <terms:term id="233" name="Rented accommodation (private)" inAtoZ="false"/> + <terms:term id="234" name="Social exclusion" inAtoZ="false"/> + <terms:term id="235" name="Death" inAtoZ="true"/> + <terms:term id="236" name="Funerals" inAtoZ="false"/> + <terms:term id="237" name="Cremation" inAtoZ="true"/> + <terms:term id="238" name="Burials" inAtoZ="true"/> + <terms:term id="239" name="Weddings" inAtoZ="false"/> + <terms:term id="240" name="Registration (births)" inAtoZ="false"/> + <terms:term id="241" name="Management (public sector)" inAtoZ="false"/> + <terms:term id="242" name="Video recording industry" inAtoZ="false"/> + <terms:term id="243" name="Aircraft industry" inAtoZ="false"/> + <terms:term id="244" name="Natural gas extraction" inAtoZ="false"/> + <terms:term id="245" name="Deregulation" inAtoZ="false"/> + <terms:term id="246" name="Power supply (electricity)" inAtoZ="false"/> + <terms:term id="247" name="Atomic energy" inAtoZ="false"/> + <terms:term id="248" name="Enterprises (companies)" inAtoZ="false"/> + <terms:term id="249" name="Corporations" inAtoZ="false"/> + <terms:term id="252" name="Road safety" inAtoZ="true"/> + <terms:term id="253" name="Accidents (road)" inAtoZ="false"/> + <terms:term id="254" name="Crashes (road vehicles)" inAtoZ="false"/> + <terms:term id="255" name="Road accidents" inAtoZ="false"/> + <terms:term id="256" name="Air crashes" inAtoZ="false"/> + <terms:term id="257" name="Accidents (air travel)" inAtoZ="false"/> + <terms:term id="258" name="Safety (air transport)" inAtoZ="false"/> + <terms:term id="259" name="Aircraft (civilian)" inAtoZ="false"/> + <terms:term id="260" name="Safety (roads)" inAtoZ="false"/> + <terms:term id="261" name="Rail crashes" inAtoZ="false"/> + <terms:term id="262" name="Crashes (trains)" inAtoZ="false"/> + <terms:term id="263" name="Accidents (railways)" inAtoZ="false"/> + <terms:term id="264" name="Safety (rail transport)" inAtoZ="false"/> + <terms:term id="265" name="Crashes (aircraft)" inAtoZ="false"/> + <terms:term id="266" name="Cars" inAtoZ="false"/> + <terms:term id="267" name="Lorries" inAtoZ="false"/> + <terms:term id="268" name="Motorcycles" inAtoZ="false"/> + <terms:term id="269" name="Human rights" inAtoZ="false"/> + <terms:term id="270" name="Civil law" inAtoZ="false"/> + <terms:term id="271" name="Criminal law" inAtoZ="false"/> + <terms:term id="272" name="International law" inAtoZ="false"/> + <terms:term id="273" name="Confidentiality (data security)" inAtoZ="false"/> + <terms:term id="274" name="Confidentiality (personal data)" inAtoZ="false"/> + <terms:term id="275" name="Capital investment" inAtoZ="false"/> + <terms:term id="276" name="National economy (UK)" inAtoZ="false"/> + <terms:term id="277" name="Early years education" inAtoZ="false"/> + <terms:term id="278" name="Religious discrimination" inAtoZ="false"/> + <terms:term id="279" name="Job seeking" inAtoZ="false"/> + <terms:term id="280" name="Jobcentre Plus" inAtoZ="false"/> + <terms:term id="282" name="Diseases (occupational)" inAtoZ="false"/> + <terms:term id="283" name="Employment conditions" inAtoZ="false"/> + <terms:term id="285" name="Conduct at work" inAtoZ="false"/> + <terms:term id="286" name="Termination of employment" inAtoZ="false"/> + <terms:term id="287" name="Dismissal" inAtoZ="false"/> + <terms:term id="288" name="Leave from work" inAtoZ="false"/> + <terms:term id="289" name="Maternity leave" inAtoZ="false"/> + <terms:term id="290" name="Sick leave" inAtoZ="false"/> + <terms:term id="291" name="Absence from work" inAtoZ="false"/> + <terms:term id="292" name="Working week" inAtoZ="false"/> + <terms:term id="293" name="Unsocial hours of work" inAtoZ="false"/> + <terms:term id="294" name="Shiftwork" inAtoZ="false"/> + <terms:term id="295" name="Retirement terms" inAtoZ="false"/> + <terms:term id="296" name="Redundancy" inAtoZ="false"/> + <terms:term id="297" name="Physically disabled people" inAtoZ="false"/> + <terms:term id="298" name="Mentally disabled people" inAtoZ="false"/> + <terms:term id="299" name="Management (NHS)" inAtoZ="false"/> + <terms:term id="300" name="Complaints (consumer affairs)" inAtoZ="false"/> + <terms:term id="302" name="Public funding" inAtoZ="false"/> + <terms:term id="303" name="Grants" inAtoZ="false"/> + <terms:term id="304" name="Government grants" inAtoZ="false"/> + <terms:term id="305" name="Government loans" inAtoZ="false"/> + <terms:term id="306" name="Subsidies from government" inAtoZ="false"/> + <terms:term id="307" name="Funding (public sector)" inAtoZ="false"/> + <terms:term id="308" name="Compensation by the government" inAtoZ="false"/> + <terms:term id="309" name="Waste disposal" inAtoZ="true"/> + <terms:term id="310" name="Heavy goods vehicles" inAtoZ="false"/> + <terms:term id="311" name="School age employment" inAtoZ="false"/> + <terms:term id="312" name="ICT (information and communication technology)" inAtoZ="false"/> + <terms:term id="313" name="Information technology" inAtoZ="false"/> + <terms:term id="314" name="Habitat conservation" inAtoZ="false"/> + <terms:term id="315" name="Rodent control" inAtoZ="true"/> + <terms:term id="316" name="Flea control" inAtoZ="true"/> + <terms:term id="317" name="Property security" inAtoZ="false"/> + <terms:term id="318" name="IS (Income support)" inAtoZ="false"/> + <terms:term id="319" name="Jobseekers allowance" inAtoZ="false"/> + <terms:term id="320" name="JSA (Jobseekers allowance)" inAtoZ="false"/> + <terms:term id="321" name="AA (Attendance allowance)" inAtoZ="false"/> + <terms:term id="322" name="DLA (Disability living allowance)" inAtoZ="false"/> + <terms:term id="323" name="Child benefit" inAtoZ="false"/> + <terms:term id="324" name="CHB (Child benefit)" inAtoZ="false"/> + <terms:term id="325" name="Working family tax credit" inAtoZ="false"/> + <terms:term id="326" name="WFTC (Working family tax credit)" inAtoZ="false"/> + <terms:term id="327" name="Disabled persons tax credit" inAtoZ="false"/> + <terms:term id="328" name="DPTC (Disabled persons tax credit)" inAtoZ="false"/> + <terms:term id="329" name="Bereavement payment" inAtoZ="false"/> + <terms:term id="330" name="Degrees and courses" inAtoZ="false"/> + <terms:term id="331" name="Diplomas and courses" inAtoZ="false"/> + <terms:term id="332" name="Absence from school" inAtoZ="false"/> + <terms:term id="333" name="Qualifications (pre-16)" inAtoZ="false"/> + <terms:term id="334" name="Specialist schools" inAtoZ="false"/> + <terms:term id="335" name="Loans (students)" inAtoZ="false"/> + <terms:term id="336" name="Awards (student funding)" inAtoZ="false"/> + <terms:term id="337" name="Choice of school" inAtoZ="false"/> + <terms:term id="338" name="Armed services" inAtoZ="false"/> + <terms:term id="339" name="Joint Services (Defence)" inAtoZ="false"/> + <terms:term id="340" name="Private rented accommodation" inAtoZ="true"/> + <terms:term id="341" name="Social housing" inAtoZ="false"/> + <terms:term id="342" name="Housing repairs and renovation" inAtoZ="true"/> + <terms:term id="343" name="Housing associations" inAtoZ="true"/> + <terms:term id="344" name="Housing cooperatives" inAtoZ="false"/> + <terms:term id="345" name="Cooperatives (housing)" inAtoZ="false"/> + <terms:term id="347" name="Property purchase (home ownership)" inAtoZ="false"/> + <terms:term id="348" name="Repairs (housing)" inAtoZ="false"/> + <terms:term id="349" name="Renovation (housing)" inAtoZ="false"/> + <terms:term id="350" name="Maintenance (housing)" inAtoZ="false"/> + <terms:term id="351" name="Property maintenance (housing)" inAtoZ="false"/> + <terms:term id="352" name="Property maintenance (historic buildings)" inAtoZ="false"/> + <terms:term id="354" name="Development (planning applications)" inAtoZ="false"/> + <terms:term id="355" name="Housing development plans" inAtoZ="false"/> + <terms:term id="356" name="Best value" inAtoZ="true"/> + <terms:term id="358" name="Performance (public sector bodies)" inAtoZ="false"/> + <terms:term id="359" name="Illnesses" inAtoZ="false"/> + <terms:term id="360" name="Literature" inAtoZ="false"/> + <terms:term id="361" name="Writing" inAtoZ="false"/> + <terms:term id="362" name="Crafts" inAtoZ="true"/> + <terms:term id="363" name="Handicrafts" inAtoZ="false"/> + <terms:term id="364" name="Pottery" inAtoZ="false"/> + <terms:term id="365" name="Woodcrafts" inAtoZ="false"/> + <terms:term id="366" name="Needlecrafts" inAtoZ="false"/> + <terms:term id="367" name="Weaving" inAtoZ="false"/> + <terms:term id="368" name="Spinning" inAtoZ="false"/> + <terms:term id="369" name="Silversmithing" inAtoZ="false"/> + <terms:term id="370" name="Sewing" inAtoZ="false"/> + <terms:term id="371" name="Embroidery" inAtoZ="false"/> + <terms:term id="372" name="Poetry" inAtoZ="false"/> + <terms:term id="374" name="Birth registration" inAtoZ="false"/> + <terms:term id="375" name="Deaths registration" inAtoZ="false"/> + <terms:term id="376" name="School governance, management and finance" inAtoZ="false"/> + <terms:term id="378" name="Loans from government" inAtoZ="false"/> + <terms:term id="379" name="Learning-disabled people" inAtoZ="false"/> + <terms:term id="380" name="Dumb people" inAtoZ="false"/> + <terms:term id="381" name="Speech impaired people" inAtoZ="false"/> + <terms:term id="382" name="Fashion goods manufacturing" inAtoZ="false"/> + <terms:term id="384" name="Athletics" inAtoZ="false"/> + <terms:term id="385" name="Alcoholism" inAtoZ="false"/> + <terms:term id="386" name="Cloning technology" inAtoZ="false"/> + <terms:term id="387" name="Development (businesses)" inAtoZ="false"/> + <terms:term id="388" name="High courts" inAtoZ="false"/> + <terms:term id="389" name="Youth courts" inAtoZ="false"/> + <terms:term id="390" name="County courts" inAtoZ="false"/> + <terms:term id="391" name="Crown courts" inAtoZ="false"/> + <terms:term id="392" name="Courts of appeal" inAtoZ="false"/> + <terms:term id="393" name="Magistrates courts" inAtoZ="false"/> + <terms:term id="394" name="Small claims courts" inAtoZ="false"/> + <terms:term id="395" name="Guns (Armed services)" inAtoZ="false"/> + <terms:term id="396" name="OFSTED inspections" inAtoZ="false"/> + <terms:term id="397" name="Learndirect" inAtoZ="false"/> + <terms:term id="398" name="Learning opportunities for adults" inAtoZ="false"/> + <terms:term id="400" name="Finance" inAtoZ="false"/> + <terms:term id="401" name="Finance (public sector)" inAtoZ="false"/> + <terms:term id="402" name="Finance (personal)" inAtoZ="false"/> + <terms:term id="403" name="EMU (European Monetary Union)" inAtoZ="false"/> + <terms:term id="404" name="Boys" inAtoZ="false"/> + <terms:term id="405" name="Girls" inAtoZ="false"/> + <terms:term id="406" name="Infants" inAtoZ="false"/> + <terms:term id="407" name="Babies" inAtoZ="false"/> + <terms:term id="408" name="Bar services" inAtoZ="false"/> + <terms:term id="409" name="Bridleways" inAtoZ="true"/> + <terms:term id="410" name="FOI (Freedom of Information)" inAtoZ="false"/> + <terms:term id="411" name="Betting" inAtoZ="false"/> + <terms:term id="412" name="Hazards (occupational)" inAtoZ="false"/> + <terms:term id="414" name="House purchase" inAtoZ="false"/> + <terms:term id="415" name="Sleeping rough" inAtoZ="false"/> + <terms:term id="416" name="Labelling (hazardous substances)" inAtoZ="false"/> + <terms:term id="417" name="Sheep farming" inAtoZ="false"/> + <terms:term id="418" name="Cattle farming" inAtoZ="false"/> + <terms:term id="419" name="Pig farming" inAtoZ="false"/> + <terms:term id="420" name="Management (schools)" inAtoZ="false"/> + <terms:term id="421" name="Funding of schools" inAtoZ="false"/> + <terms:term id="422" name="Mutton" inAtoZ="false"/> + <terms:term id="423" name="Bacon" inAtoZ="false"/> + <terms:term id="424" name="Ham" inAtoZ="false"/> + <terms:term id="425" name="Veal" inAtoZ="false"/> + <terms:term id="426" name="Venison" inAtoZ="false"/> + <terms:term id="427" name="Training (military)" inAtoZ="false"/> + <terms:term id="428" name="Ice cream" inAtoZ="false"/> + <terms:term id="429" name="Yoghurt" inAtoZ="false"/> + <terms:term id="430" name="Orchestras" inAtoZ="false"/> + <terms:term id="431" name="Share dealing" inAtoZ="false"/> + <terms:term id="432" name="Headmasters" inAtoZ="false"/> + <terms:term id="433" name="Rubbish collection" inAtoZ="true"/> + <terms:term id="435" name="Studies and qualifications (post-16)" inAtoZ="true"/> + <terms:term id="436" name="GNVQs and courses" inAtoZ="false"/> + <terms:term id="437" name="National vocational qualifications (NVQs)" inAtoZ="false"/> + <terms:term id="438" name="NVQs and courses" inAtoZ="false"/> + <terms:term id="439" name="Education and skills" inAtoZ="true"/> + <terms:term id="440" name="Abandoned vehicles" inAtoZ="true"/> + <terms:term id="441" name="Road transport" inAtoZ="false"/> + <terms:term id="442" name="Abattoirs" inAtoZ="false"/> + <terms:term id="443" name="Meat and livestock industries" inAtoZ="false"/> + <terms:term id="444" name="Abortion" inAtoZ="false"/> + <terms:term id="445" name="Family planning" inAtoZ="false"/> + <terms:term id="446" name="Access to countryside" inAtoZ="false"/> + <terms:term id="447" name="Footpaths (rights of way)" inAtoZ="true"/> + <terms:term id="448" name="Right to roam" inAtoZ="false"/> + <terms:term id="449" name="Rights of way" inAtoZ="true"/> + <terms:term id="450" name="Countryside" inAtoZ="true"/> + <terms:term id="451" name="Access to public services" inAtoZ="false"/> + <terms:term id="453" name="Accidents (public)" inAtoZ="false"/> + <terms:term id="454" name="Civil emergencies" inAtoZ="false"/> + <terms:term id="455" name="Accidents at work" inAtoZ="true"/> + <terms:term id="456" name="Health and safety at work" inAtoZ="true"/> + <terms:term id="457" name="Accidents in the home" inAtoZ="false"/> + <terms:term id="458" name="Safety in the home" inAtoZ="false"/> + <terms:term id="459" name="Accommodation (housing)" inAtoZ="false"/> + <terms:term id="460" name="Housing" inAtoZ="true"/> + <terms:term id="461" name="Accommodation (holiday)" inAtoZ="false"/> + <terms:term id="462" name="Tourism" inAtoZ="true"/> + <terms:term id="463" name="Acquired immune deficiency syndrome" inAtoZ="false"/> + <terms:term id="464" name="AIDS and HIV" inAtoZ="false"/> + <terms:term id="465" name="Acquisitions (business)" inAtoZ="false"/> + <terms:term id="466" name="Market competition" inAtoZ="false"/> + <terms:term id="467" name="Action teams for jobs" inAtoZ="false"/> + <terms:term id="468" name="Unemployment and jobseeking" inAtoZ="false"/> + <terms:term id="469" name="Actual bodily harm" inAtoZ="false"/> + <terms:term id="470" name="Violence against the person" inAtoZ="false"/> + <terms:term id="471" name="Acute services (NHS)" inAtoZ="false"/> + <terms:term id="472" name="Secondary health care" inAtoZ="false"/> + <terms:term id="473" name="Administration (business)" inAtoZ="false"/> + <terms:term id="474" name="Business management" inAtoZ="false"/> + <terms:term id="475" name="Administration (public)" inAtoZ="false"/> + <terms:term id="476" name="Public administration" inAtoZ="false"/> + <terms:term id="477" name="Admissions (schools)" inAtoZ="false"/> + <terms:term id="478" name="Adolescents" inAtoZ="false"/> + <terms:term id="479" name="Young people" inAtoZ="false"/> + <terms:term id="480" name="Adoption" inAtoZ="true"/> + <terms:term id="481" name="Care" inAtoZ="true"/> + <terms:term id="482" name="Adult basic skills" inAtoZ="false"/> + <terms:term id="483" name="Adult and community education" inAtoZ="true"/> + <terms:term id="484" name="Adult learning and skills" inAtoZ="false"/> + <terms:term id="485" name="Advanced skills teachers" inAtoZ="false"/> + <terms:term id="486" name="Teachers and school staff" inAtoZ="false"/> + <terms:term id="487" name="Advertising" inAtoZ="true"/> + <terms:term id="488" name="Business practice and regulation" inAtoZ="false"/> + <terms:term id="489" name="Media and the press" inAtoZ="false"/> + <terms:term id="490" name="Communications industries" inAtoZ="false"/> + <terms:term id="491" name="Affirmative action (equal opportunities)" inAtoZ="false"/> + <terms:term id="492" name="Equal opportunities and diversity" inAtoZ="true"/> + <terms:term id="493" name="Aged people" inAtoZ="false"/> + <terms:term id="494" name="Older people" inAtoZ="false"/> + <terms:term id="495" name="Agricultural land" inAtoZ="false"/> + <terms:term id="496" name="Land and premises" inAtoZ="true"/> + <terms:term id="497" name="Agriculture" inAtoZ="false"/> + <terms:term id="498" name="Farming" inAtoZ="true"/> + <terms:term id="499" name="Environment" inAtoZ="true"/> + <terms:term id="500" name="Energy and fuel" inAtoZ="true"/> + <terms:term id="501" name="Environmental protection" inAtoZ="false"/> + <terms:term id="502" name="Fisheries and aquaculture" inAtoZ="false"/> + <terms:term id="503" name="Forestry" inAtoZ="false"/> + <terms:term id="504" name="Horticulture" inAtoZ="false"/> + <terms:term id="505" name="Plants, animals and wildlife" inAtoZ="false"/> + <terms:term id="506" name="Waste management" inAtoZ="true"/> + <terms:term id="507" name="Water resources" inAtoZ="false"/> + <terms:term id="508" name="Aid (charitable giving)" inAtoZ="false"/> + <terms:term id="509" name="Charities" inAtoZ="true"/> + <terms:term id="510" name="Aid (international)" inAtoZ="false"/> + <terms:term id="511" name="International development and aid" inAtoZ="false"/> + <terms:term id="512" name="HIV (human immunodeficiency virus)" inAtoZ="false"/> + <terms:term id="513" name="Human immunodeficiency virus" inAtoZ="false"/> + <terms:term id="514" name="Health" inAtoZ="true"/> + <terms:term id="515" name="Royal Air Force" inAtoZ="false"/> + <terms:term id="516" name="Armed forces" inAtoZ="false"/> + <terms:term id="517" name="Air transport" inAtoZ="false"/> + <terms:term id="518" name="Airports" inAtoZ="true"/> + <terms:term id="519" name="Aviation" inAtoZ="false"/> + <terms:term id="520" name="Low flying aircraft (civilian)" inAtoZ="false"/> + <terms:term id="521" name="Transport and infrastructure" inAtoZ="false"/> + <terms:term id="522" name="Alcohol use and abuse" inAtoZ="true"/> + <terms:term id="523" name="Addiction" inAtoZ="true"/> + <terms:term id="524" name="Drinks" inAtoZ="false"/> + <terms:term id="525" name="Alcohol-related crime" inAtoZ="false"/> + <terms:term id="526" name="Drug-related crime" inAtoZ="false"/> + <terms:term id="527" name="Alcoholic drinks" inAtoZ="false"/> + <terms:term id="528" name="Allotments" inAtoZ="true"/> + <terms:term id="529" name="Parks and gardens" inAtoZ="true"/> + <terms:term id="530" name="Ambulance services" inAtoZ="false"/> + <terms:term id="531" name="National Health Service (NHS)" inAtoZ="false"/> + <terms:term id="532" name="Emergencies" inAtoZ="false"/> + <terms:term id="533" name="Ancient monuments" inAtoZ="true"/> + <terms:term id="534" name="Heritage" inAtoZ="false"/> + <terms:term id="535" name="Ancillary health services staff" inAtoZ="false"/> + <terms:term id="536" name="Health and social care professionals" inAtoZ="false"/> + <terms:term id="537" name="Animal disease" inAtoZ="false"/> + <terms:term id="538" name="Animal health" inAtoZ="true"/> + <terms:term id="539" name="Animal experimentation" inAtoZ="false"/> + <terms:term id="540" name="Animal testing" inAtoZ="false"/> + <terms:term id="541" name="Vivisection (animals)" inAtoZ="false"/> + <terms:term id="542" name="Animal rights and welfare" inAtoZ="true"/> + <terms:term id="543" name="Ethical issues" inAtoZ="false"/> + <terms:term id="544" name="Research and development" inAtoZ="false"/> + <terms:term id="546" name="Brucellosis" inAtoZ="false"/> + <terms:term id="547" name="Classical swine fever" inAtoZ="false"/> + <terms:term id="548" name="Disease (animals)" inAtoZ="false"/> + <terms:term id="550" name="Pet Travel Scheme (PETS)" inAtoZ="false"/> + <terms:term id="552" name="Rabies" inAtoZ="false"/> + <terms:term id="553" name="Scrapie" inAtoZ="false"/> + <terms:term id="554" name="Swine fever" inAtoZ="false"/> + <terms:term id="555" name="Vaccines for animals" inAtoZ="false"/> + <terms:term id="556" name="Veterinary services" inAtoZ="false"/> + <terms:term id="557" name="Health, well-being and care" inAtoZ="false"/> + <terms:term id="558" name="Prion diseases" inAtoZ="false"/> + <terms:term id="559" name="Foot and mouth disease" inAtoZ="false"/> + <terms:term id="560" name="Tuberculosis" inAtoZ="false"/> + <terms:term id="561" name="Animal production" inAtoZ="false"/> + <terms:term id="562" name="Animal welfare" inAtoZ="false"/> + <terms:term id="563" name="Welfare (animals)" inAtoZ="false"/> + <terms:term id="564" name="Public order, justice and rights" inAtoZ="false"/> + <terms:term id="565" name="Hunting" inAtoZ="false"/> + <terms:term id="566" name="Annual leave" inAtoZ="false"/> + <terms:term id="567" name="Working hours, terms and conditions" inAtoZ="false"/> + <terms:term id="568" name="Antisocial behaviour and disorder" inAtoZ="false"/> + <terms:term id="571" name="Hooliganism" inAtoZ="false"/> + <terms:term id="572" name="Vandalism" inAtoZ="false"/> + <terms:term id="573" name="Crime" inAtoZ="true"/> + <terms:term id="574" name="Apprenticeships" inAtoZ="false"/> + <terms:term id="575" name="Archaeology" inAtoZ="true"/> + <terms:term id="576" name="Architecture" inAtoZ="true"/> + <terms:term id="578" name="Culture and creativity" inAtoZ="false"/> + <terms:term id="579" name="Building and construction" inAtoZ="false"/> + <terms:term id="580" name="Archives" inAtoZ="true"/> + <terms:term id="581" name="Libraries" inAtoZ="true"/> + <terms:term id="582" name="British Army" inAtoZ="false"/> + <terms:term id="583" name="Defence medical services" inAtoZ="false"/> + <terms:term id="584" name="Health care (Armed Forces)" inAtoZ="false"/> + <terms:term id="585" name="Joint Services (initiatives)" inAtoZ="false"/> + <terms:term id="586" name="Low flying aircraft (Armed Forces)" inAtoZ="false"/> + <terms:term id="587" name="Medical services (Armed Forces)" inAtoZ="false"/> + <terms:term id="588" name="Military training" inAtoZ="false"/> + <terms:term id="589" name="Royal Navy" inAtoZ="false"/> + <terms:term id="590" name="Reserves (Armed Forces)" inAtoZ="false"/> + <terms:term id="591" name="Service personnel (Armed Forces)" inAtoZ="false"/> + <terms:term id="592" name="Service recruitment (Armed Forces)" inAtoZ="false"/> + <terms:term id="593" name="Service resettlement (Armed Forces)" inAtoZ="false"/> + <terms:term id="594" name="Service welfare (Armed Forces)" inAtoZ="false"/> + <terms:term id="595" name="Veterans (Armed Forces)" inAtoZ="false"/> + <terms:term id="596" name="War widows" inAtoZ="false"/> + <terms:term id="597" name="Defence" inAtoZ="false"/> + <terms:term id="598" name="Arms control" inAtoZ="false"/> + <terms:term id="599" name="Arms proliferation" inAtoZ="false"/> + <terms:term id="600" name="Cluster bombs (clearance and control)" inAtoZ="false"/> + <terms:term id="601" name="Disarmament" inAtoZ="false"/> + <terms:term id="602" name="Land mines (clearance and control)" inAtoZ="false"/> + <terms:term id="603" name="Proliferation (arms)" inAtoZ="false"/> + <terms:term id="604" name="Weapons control (military)" inAtoZ="false"/> + <terms:term id="605" name="Weapons of mass destruction (control)" inAtoZ="false"/> + <terms:term id="606" name="Defence policy" inAtoZ="false"/> + <terms:term id="607" name="Firearms" inAtoZ="false"/> + <terms:term id="608" name="Army ranges" inAtoZ="false"/> + <terms:term id="609" name="Defence land and buildings" inAtoZ="false"/> + <terms:term id="610" name="Arranged marriages" inAtoZ="false"/> + <terms:term id="611" name="Marriage and cohabitation" inAtoZ="true"/> + <terms:term id="612" name="Arson" inAtoZ="false"/> + <terms:term id="613" name="Fire" inAtoZ="false"/> + <terms:term id="614" name="Art galleries" inAtoZ="false"/> + <terms:term id="615" name="Museums and galleries" inAtoZ="true"/> + <terms:term id="616" name="Leisure and culture" inAtoZ="true"/> + <terms:term id="617" name="Millennium projects" inAtoZ="false"/> + <terms:term id="618" name="Performing arts" inAtoZ="false"/> + <terms:term id="619" name="Visual arts" inAtoZ="false"/> + <terms:term id="620" name="Assault" inAtoZ="false"/> + <terms:term id="621" name="Asylum" inAtoZ="false"/> + <terms:term id="622" name="Immigration and nationality" inAtoZ="true"/> + <terms:term id="623" name="Atomic Weapons Establishment" inAtoZ="false"/> + <terms:term id="624" name="Automotive industry" inAtoZ="false"/> + <terms:term id="625" name="Motor industry" inAtoZ="false"/> + <terms:term id="626" name="Baby foods" inAtoZ="false"/> + <terms:term id="627" name="Infant foods" inAtoZ="false"/> + <terms:term id="628" name="Food and drink" inAtoZ="false"/> + <terms:term id="629" name="Bank holidays" inAtoZ="false"/> + <terms:term id="630" name="Banking" inAtoZ="false"/> + <terms:term id="631" name="Financial service industries" inAtoZ="false"/> + <terms:term id="632" name="Curriculum and qualifications (pre-16)" inAtoZ="true"/> + <terms:term id="633" name="School performance and standards" inAtoZ="true"/> + <terms:term id="634" name="Beef" inAtoZ="false"/> + <terms:term id="635" name="Meat" inAtoZ="false"/> + <terms:term id="636" name="Beef industry" inAtoZ="false"/> + <terms:term id="637" name="Beer" inAtoZ="false"/> + <terms:term id="638" name="Benefits" inAtoZ="true"/> + <terms:term id="639" name="Social security payments" inAtoZ="false"/> + <terms:term id="640" name="Welfare benefits" inAtoZ="false"/> + <terms:term id="641" name="Welfare reform" inAtoZ="false"/> + <terms:term id="642" name="Life in the community" inAtoZ="true"/> + <terms:term id="643" name="Pensions" inAtoZ="false"/> + <terms:term id="644" name="Living standards and income levels" inAtoZ="false"/> + <terms:term id="645" name="Poverty" inAtoZ="false"/> + <terms:term id="646" name="Beverages" inAtoZ="false"/> + <terms:term id="647" name="Bilateral relations (international)" inAtoZ="false"/> + <terms:term id="648" name="International relations" inAtoZ="false"/> + <terms:term id="649" name="Biological warfare and defence" inAtoZ="false"/> + <terms:term id="650" name="Biotechnology" inAtoZ="false"/> + <terms:term id="651" name="Genetic engineering" inAtoZ="false"/> + <terms:term id="652" name="Science, technology and innovation" inAtoZ="false"/> + <terms:term id="653" name="Genetically modified food and crops" inAtoZ="false"/> + <terms:term id="654" name="Birth control" inAtoZ="false"/> + <terms:term id="655" name="Birthday honours" inAtoZ="false"/> + <terms:term id="656" name="Honours system" inAtoZ="false"/> + <terms:term id="657" name="Births (numbers)" inAtoZ="false"/> + <terms:term id="658" name="Population and migration" inAtoZ="true"/> + <terms:term id="659" name="Blair, Tony" inAtoZ="false"/> + <terms:term id="660" name="Prime Minister" inAtoZ="false"/> + <terms:term id="661" name="Blind people" inAtoZ="true"/> + <terms:term id="662" name="Disabled people" inAtoZ="false"/> + <terms:term id="663" name="Bovine spongiform encephalopathy" inAtoZ="false"/> + <terms:term id="664" name="Bovine tuberculosis" inAtoZ="false"/> + <terms:term id="665" name="Breast cancer screening" inAtoZ="false"/> + <terms:term id="666" name="Preventive medicine" inAtoZ="false"/> + <terms:term id="668" name="Broadcasting (radio)" inAtoZ="false"/> + <terms:term id="669" name="Broadcasting (television)" inAtoZ="false"/> + <terms:term id="670" name="Brownfield sites" inAtoZ="false"/> + <terms:term id="671" name="Urban communities" inAtoZ="false"/> + <terms:term id="672" name="CJD (Creutzfeldt-Jakob disease)" inAtoZ="false"/> + <terms:term id="673" name="Creutzfeldt-Jakob disease" inAtoZ="false"/> + <terms:term id="674" name="Mad cow disease" inAtoZ="false"/> + <terms:term id="675" name="New variant CJD" inAtoZ="false"/> + <terms:term id="676" name="nvCJD" inAtoZ="false"/> + <terms:term id="677" name="Transmissible spongiform encephalopathies" inAtoZ="false"/> + <terms:term id="678" name="TSEs (Transmissible spongiform encephalopathies)" inAtoZ="false"/> + <terms:term id="679" name="vCJD" inAtoZ="false"/> + <terms:term id="680" name="BSI standards" inAtoZ="false"/> + <terms:term id="681" name="Standards and specifications" inAtoZ="false"/> + <terms:term id="682" name="Budget (UK)" inAtoZ="false"/> + <terms:term id="683" name="Public finance" inAtoZ="false"/> + <terms:term id="684" name="Construction industry" inAtoZ="false"/> + <terms:term id="685" name="Business sectors" inAtoZ="true"/> + <terms:term id="686" name="Building regulations" inAtoZ="true"/> + <terms:term id="687" name="Bullying at school" inAtoZ="true"/> + <terms:term id="688" name="School welfare, behaviour and attendance" inAtoZ="false"/> + <terms:term id="689" name="Burglary" inAtoZ="false"/> + <terms:term id="690" name="Theft and burglary" inAtoZ="false"/> + <terms:term id="691" name="Bus stops and shelters" inAtoZ="true"/> + <terms:term id="692" name="Business and industry" inAtoZ="true"/> + <terms:term id="693" name="Consumer affairs" inAtoZ="false"/> + <terms:term id="694" name="International trade" inAtoZ="false"/> + <terms:term id="695" name="Small businesses" inAtoZ="true"/> + <terms:term id="696" name="Business crime" inAtoZ="false"/> + <terms:term id="697" name="Fraud" inAtoZ="false"/> + <terms:term id="698" name="Business intelligence" inAtoZ="false"/> + <terms:term id="699" name="Intelligence (information)" inAtoZ="false"/> + <terms:term id="700" name="Management (business)" inAtoZ="false"/> + <terms:term id="701" name="Company law" inAtoZ="false"/> + <terms:term id="702" name="Competitiveness" inAtoZ="false"/> + <terms:term id="703" name="e-Commerce" inAtoZ="false"/> + <terms:term id="704" name="Regulation and deregulation" inAtoZ="false"/> + <terms:term id="705" name="Distribution and service industries" inAtoZ="false"/> + <terms:term id="706" name="Manufacturing" inAtoZ="false"/> + <terms:term id="707" name="Mineral extraction, mining, quarrying" inAtoZ="true"/> + <terms:term id="708" name="Butter" inAtoZ="false"/> + <terms:term id="709" name="Milk and dairy products" inAtoZ="false"/> + <terms:term id="710" name="Cabinet" inAtoZ="false"/> + <terms:term id="711" name="Central government" inAtoZ="true"/> + <terms:term id="712" name="Cabinet Ministers" inAtoZ="false"/> + <terms:term id="713" name="Ministers" inAtoZ="false"/> + <terms:term id="714" name="Canals" inAtoZ="false"/> + <terms:term id="715" name="Waterways" inAtoZ="false"/> + <terms:term id="716" name="Cancer" inAtoZ="false"/> + <terms:term id="717" name="Cancer screening" inAtoZ="false"/> + <terms:term id="718" name="Canoeing" inAtoZ="false"/> + <terms:term id="719" name="Water sports" inAtoZ="false"/> + <terms:term id="720" name="CAP (Common Agricultural Policy)" inAtoZ="false"/> + <terms:term id="721" name="Common Agricultural Policy" inAtoZ="false"/> + <terms:term id="722" name="Capital and financial markets" inAtoZ="false"/> + <terms:term id="723" name="Financial markets" inAtoZ="false"/> + <terms:term id="724" name="Stock exchange" inAtoZ="false"/> + <terms:term id="725" name="Stocks and shares" inAtoZ="false"/> + <terms:term id="726" name="Economics and finance" inAtoZ="false"/> + <terms:term id="727" name="Euro and EMU" inAtoZ="false"/> + <terms:term id="728" name="Capital gains tax" inAtoZ="false"/> + <terms:term id="729" name="Tax" inAtoZ="false"/> + <terms:term id="730" name="Car manufacture" inAtoZ="false"/> + <terms:term id="731" name="Car parks" inAtoZ="true"/> + <terms:term id="733" name="Cardiovascular diseases" inAtoZ="false"/> + <terms:term id="734" name="Care in the community services" inAtoZ="false"/> + <terms:term id="735" name="Children's care services" inAtoZ="false"/> + <terms:term id="736" name="Community care" inAtoZ="true"/> + <terms:term id="737" name="Disability services" inAtoZ="false"/> + <terms:term id="738" name="Foster care" inAtoZ="false"/> + <terms:term id="740" name="Home care services" inAtoZ="false"/> + <terms:term id="741" name="Institutional care" inAtoZ="false"/> + <terms:term id="742" name="Services for the elderly" inAtoZ="false"/> + <terms:term id="743" name="Social care" inAtoZ="false"/> + <terms:term id="744" name="Social services" inAtoZ="true"/> + <terms:term id="745" name="Dentists" inAtoZ="false"/> + <terms:term id="746" name="Doctors" inAtoZ="false"/> + <terms:term id="747" name="Medical consultants" inAtoZ="false"/> + <terms:term id="748" name="Medical profession" inAtoZ="false"/> + <terms:term id="749" name="Nurses" inAtoZ="false"/> + <terms:term id="750" name="NHS management" inAtoZ="false"/> + <terms:term id="752" name="Cargo transport" inAtoZ="false"/> + <terms:term id="753" name="Freight transport" inAtoZ="false"/> + <terms:term id="754" name="Catch limits (fishing)" inAtoZ="false"/> + <terms:term id="755" name="Catering services" inAtoZ="false"/> + <terms:term id="756" name="Food and drink services" inAtoZ="false"/> + <terms:term id="757" name="Censorship" inAtoZ="false"/> + <terms:term id="758" name="Information and communication" inAtoZ="false"/> + <terms:term id="759" name="Censuses" inAtoZ="false"/> + <terms:term id="760" name="Government, politics and public administration" inAtoZ="false"/> + <terms:term id="761" name="Executive agencies" inAtoZ="false"/> + <terms:term id="762" name="Government departments" inAtoZ="true"/> + <terms:term id="763" name="Volunteering" inAtoZ="true"/> + <terms:term id="764" name="Cheese" inAtoZ="false"/> + <terms:term id="765" name="Chemical industry" inAtoZ="false"/> + <terms:term id="766" name="Chemical warfare and defence" inAtoZ="false"/> + <terms:term id="767" name="Chicken meat" inAtoZ="false"/> + <terms:term id="768" name="Children" inAtoZ="false"/> + <terms:term id="769" name="Families" inAtoZ="false"/> + <terms:term id="770" name="Churches (places of worship)" inAtoZ="false"/> + <terms:term id="771" name="Religion" inAtoZ="false"/> + <terms:term id="772" name="Churches (heritage)" inAtoZ="false"/> + <terms:term id="773" name="Cities" inAtoZ="false"/> + <terms:term id="774" name="Citizenship education" inAtoZ="false"/> + <terms:term id="775" name="Civil and human rights" inAtoZ="false"/> + <terms:term id="776" name="Religious rights" inAtoZ="false"/> + <terms:term id="777" name="Rights (civil)" inAtoZ="false"/> + <terms:term id="778" name="Rights (human)" inAtoZ="false"/> + <terms:term id="779" name="Disasters (public)" inAtoZ="false"/> + <terms:term id="781" name="Earthquakes" inAtoZ="false"/> + <terms:term id="782" name="Emergencies (public)" inAtoZ="false"/> + <terms:term id="783" name="Famine" inAtoZ="false"/> + <terms:term id="785" name="Riots" inAtoZ="false"/> + <terms:term id="786" name="Seismic disasters" inAtoZ="false"/> + <terms:term id="787" name="Volcanic eruptions" inAtoZ="false"/> + <terms:term id="788" name="Flooding" inAtoZ="true"/> + <terms:term id="789" name="Civil justice system" inAtoZ="false"/> + <terms:term id="790" name="Justice system" inAtoZ="false"/> + <terms:term id="791" name="Civil Service" inAtoZ="false"/> + <terms:term id="792" name="Class sizes" inAtoZ="false"/> + <terms:term id="793" name="Climate and weather" inAtoZ="false"/> + <terms:term id="794" name="Drought" inAtoZ="false"/> + <terms:term id="795" name="Global warming" inAtoZ="false"/> + <terms:term id="796" name="Greenhouse effect (atmospheric)" inAtoZ="false"/> + <terms:term id="797" name="Rainfall" inAtoZ="false"/> + <terms:term id="798" name="Weather" inAtoZ="false"/> + <terms:term id="799" name="Clinical services (NHS)" inAtoZ="false"/> + <terms:term id="800" name="Clinics (private)" inAtoZ="false"/> + <terms:term id="801" name="Private hospitals" inAtoZ="false"/> + <terms:term id="802" name="Clocking in" inAtoZ="false"/> + <terms:term id="803" name="Coal" inAtoZ="false"/> + <terms:term id="804" name="Fossil fuels" inAtoZ="false"/> + <terms:term id="805" name="Coal mining" inAtoZ="false"/> + <terms:term id="806" name="Coastal erosion and protection" inAtoZ="true"/> + <terms:term id="807" name="Coastguard services" inAtoZ="false"/> + <terms:term id="808" name="Cohabitation" inAtoZ="false"/> + <terms:term id="809" name="Commerce (international)" inAtoZ="false"/> + <terms:term id="810" name="Commerce (retail trade)" inAtoZ="false"/> + <terms:term id="811" name="Retail trade" inAtoZ="false"/> + <terms:term id="812" name="European Union" inAtoZ="false"/> + <terms:term id="813" name="Common Fisheries Policy" inAtoZ="false"/> + <terms:term id="814" name="Commonwealth" inAtoZ="false"/> + <terms:term id="815" name="International organisations" inAtoZ="false"/> + <terms:term id="816" name="Films and film making" inAtoZ="false"/> + <terms:term id="817" name="Printing industry" inAtoZ="false"/> + <terms:term id="818" name="Publishing industry" inAtoZ="false"/> + <terms:term id="819" name="Sound recording industry" inAtoZ="false"/> + <terms:term id="820" name="Telecommunications industry" inAtoZ="false"/> + <terms:term id="821" name="Electronics industry" inAtoZ="false"/> + <terms:term id="822" name="Information and communication technology" inAtoZ="false"/> + <terms:term id="823" name="Internet" inAtoZ="false"/> + <terms:term id="824" name="Postal services" inAtoZ="false"/> + <terms:term id="825" name="Telephone services" inAtoZ="false"/> + <terms:term id="826" name="Communications systems (Defence)" inAtoZ="false"/> + <terms:term id="827" name="Defence equipment and supplies" inAtoZ="false"/> + <terms:term id="828" name="Community learning" inAtoZ="false"/> + <terms:term id="829" name="Computers" inAtoZ="false"/> + <terms:term id="831" name="Conservation (energy)" inAtoZ="false"/> + <terms:term id="832" name="Energy conservation" inAtoZ="true"/> + <terms:term id="833" name="Conservation (nature)" inAtoZ="false"/> + <terms:term id="834" name="Nature conservation" inAtoZ="true"/> + <terms:term id="835" name="Conservative Party" inAtoZ="false"/> + <terms:term id="836" name="Political parties" inAtoZ="true"/> + <terms:term id="837" name="Consignia" inAtoZ="false"/> + <terms:term id="838" name="Constituencies" inAtoZ="true"/> + <terms:term id="839" name="Democracy and elections" inAtoZ="true"/> + <terms:term id="840" name="Constitution" inAtoZ="false"/> + <terms:term id="841" name="Devolved government" inAtoZ="false"/> + <terms:term id="842" name="Monarchy" inAtoZ="false"/> + <terms:term id="843" name="National Assembly for Wales" inAtoZ="false"/> + <terms:term id="844" name="Northern Ireland Assembly" inAtoZ="false"/> + <terms:term id="845" name="Scottish Parliament" inAtoZ="false"/> + <terms:term id="846" name="UK Parliament" inAtoZ="true"/> + <terms:term id="847" name="Consulates" inAtoZ="false"/> + <terms:term id="848" name="Embassies and consulates" inAtoZ="false"/> + <terms:term id="849" name="Consumer law" inAtoZ="false"/> + <terms:term id="850" name="Consumer protection" inAtoZ="true"/> + <terms:term id="851" name="Shopping" inAtoZ="false"/> + <terms:term id="852" name="Utilities" inAtoZ="false"/> + <terms:term id="853" name="Contract of employment" inAtoZ="false"/> + <terms:term id="854" name="Copyright" inAtoZ="false"/> + <terms:term id="855" name="Intellectual property" inAtoZ="false"/> + <terms:term id="856" name="Copyright law" inAtoZ="false"/> + <terms:term id="857" name="Coronary heart disease" inAtoZ="false"/> + <terms:term id="858" name="Coroners" inAtoZ="true"/> + <terms:term id="859" name="Judiciary" inAtoZ="false"/> + <terms:term id="860" name="Corporation tax" inAtoZ="false"/> + <terms:term id="861" name="Corruption" inAtoZ="false"/> + <terms:term id="862" name="Council tax" inAtoZ="true"/> + <terms:term id="863" name="Local taxes" inAtoZ="false"/> + <terms:term id="864" name="Hedgerows" inAtoZ="false"/> + <terms:term id="865" name="Rural communities" inAtoZ="false"/> + <terms:term id="866" name="Rural development" inAtoZ="false"/> + <terms:term id="867" name="Courier services" inAtoZ="false"/> + <terms:term id="868" name="Distribution services" inAtoZ="false"/> + <terms:term id="869" name="Courts of law" inAtoZ="false"/> + <terms:term id="870" name="Jury system" inAtoZ="false"/> + <terms:term id="872" name="Crime prevention" inAtoZ="true"/> + <terms:term id="873" name="Crime reduction" inAtoZ="false"/> + <terms:term id="874" name="Domestic violence" inAtoZ="true"/> + <terms:term id="875" name="Murder" inAtoZ="false"/> + <terms:term id="876" name="Offenders" inAtoZ="false"/> + <terms:term id="877" name="Organised crime and terrorism" inAtoZ="false"/> + <terms:term id="878" name="Racially motivated crime" inAtoZ="false"/> + <terms:term id="879" name="Sex offences" inAtoZ="false"/> + <terms:term id="880" name="Smuggling" inAtoZ="false"/> + <terms:term id="881" name="Vehicle crime" inAtoZ="false"/> + <terms:term id="882" name="Victims of crime" inAtoZ="false"/> + <terms:term id="883" name="War crimes" inAtoZ="false"/> + <terms:term id="884" name="Extradition" inAtoZ="false"/> + <terms:term id="885" name="Law" inAtoZ="false"/> + <terms:term id="886" name="Security" inAtoZ="false"/> + <terms:term id="887" name="Criminal justice system" inAtoZ="false"/> + <terms:term id="888" name="Criminals" inAtoZ="false"/> + <terms:term id="889" name="Crop diseases" inAtoZ="false"/> + <terms:term id="890" name="Plant health" inAtoZ="false"/> + <terms:term id="891" name="Crops" inAtoZ="false"/> + <terms:term id="892" name="Crown" inAtoZ="false"/> + <terms:term id="893" name="Customs levies" inAtoZ="false"/> + <terms:term id="894" name="Levies (customs)" inAtoZ="false"/> + <terms:term id="895" name="Cycling" inAtoZ="true"/> + <terms:term id="896" name="Sports and recreation" inAtoZ="true"/> + <terms:term id="898" name="Dairy farming" inAtoZ="false"/> + <terms:term id="899" name="Dairy products" inAtoZ="false"/> + <terms:term id="900" name="Data protection" inAtoZ="false"/> + <terms:term id="901" name="Privacy and data protection" inAtoZ="true"/> + <terms:term id="902" name="Data security" inAtoZ="false"/> + <terms:term id="903" name="e-Security" inAtoZ="false"/> + <terms:term id="904" name="Hacking (computers)" inAtoZ="false"/> + <terms:term id="905" name="Information security" inAtoZ="false"/> + <terms:term id="906" name="Leaks (information)" inAtoZ="false"/> + <terms:term id="907" name="Deaf people" inAtoZ="false"/> + <terms:term id="908" name="Death duties" inAtoZ="false"/> + <terms:term id="909" name="Deaths (numbers)" inAtoZ="false"/> + <terms:term id="910" name="Deer hunting" inAtoZ="false"/> + <terms:term id="911" name="International affairs and defence" inAtoZ="false"/> + <terms:term id="912" name="Defence agencies" inAtoZ="false"/> + <terms:term id="913" name="Military operations" inAtoZ="false"/> + <terms:term id="914" name="Defence alliances and organisations" inAtoZ="false"/> + <terms:term id="915" name="NATO" inAtoZ="false"/> + <terms:term id="916" name="Defence procurement" inAtoZ="false"/> + <terms:term id="917" name="Information systems (Defence)" inAtoZ="false"/> + <terms:term id="918" name="Military equipment" inAtoZ="false"/> + <terms:term id="919" name="Munitions" inAtoZ="false"/> + <terms:term id="920" name="Procurement (Defence)" inAtoZ="false"/> + <terms:term id="921" name="Rifles (Defence)" inAtoZ="false"/> + <terms:term id="923" name="Weapon systems" inAtoZ="false"/> + <terms:term id="924" name="Weapons (Defence)" inAtoZ="false"/> + <terms:term id="925" name="Defence industries" inAtoZ="false"/> + <terms:term id="926" name="Defence estates" inAtoZ="false"/> + <terms:term id="927" name="National Missile Defence" inAtoZ="false"/> + <terms:term id="928" name="Nuclear defence and warfare" inAtoZ="false"/> + <terms:term id="929" name="Dental health" inAtoZ="false"/> + <terms:term id="930" name="Detention centres (immigration)" inAtoZ="false"/> + <terms:term id="931" name="Immigration detention centres" inAtoZ="false"/> + <terms:term id="932" name="Detention centres (youth)" inAtoZ="false"/> + <terms:term id="933" name="Prisons" inAtoZ="true"/> + <terms:term id="934" name="Devolved administrations" inAtoZ="false"/> + <terms:term id="935" name="Handicapped people" inAtoZ="false"/> + <terms:term id="936" name="Paraplegics" inAtoZ="false"/> + <terms:term id="937" name="People" inAtoZ="false"/> + <terms:term id="938" name="Discipline at school" inAtoZ="false"/> + <terms:term id="940" name... [truncated message content] |
|
From: <ap...@vh...> - 2006-06-07 22:12:34
|
Author: apevec
Date: 2006-06-08 00:08:17 +0200 (Thu, 08 Jun 2006)
New Revision: 1150
Added:
trunk/ccm-core/sql/ccm-core/default/upgrade/6.2.0-6.3.1/auto-categorization.sql
Log:
sql upgrade script for isAuto flag
Added: trunk/ccm-core/sql/ccm-core/default/upgrade/6.2.0-6.3.1/auto-categorization.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/default/upgrade/6.2.0-6.3.1/auto-categorization.sql 2006-06-07 21:57:40 UTC (rev 1149)
+++ trunk/ccm-core/sql/ccm-core/default/upgrade/6.2.0-6.3.1/auto-categorization.sql 2006-06-07 22:08:17 UTC (rev 1150)
@@ -0,0 +1,3 @@
+alter table cat_object_category_map add auto_p char(1) default '0'
+ constraint cat_obj_map_auto_p_ck
+ check (auto_p in ('0','1')) ;
|
|
From: <ap...@vh...> - 2006-06-07 22:02:11
|
Author: apevec
Date: 2006-06-07 23:57:40 +0200 (Wed, 07 Jun 2006)
New Revision: 1149
Added:
trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
Modified:
trunk/ccm-core/pdl/com/arsdigita/categorization/Category.pdl
trunk/ccm-core/sql/ccm-core/default/categorization/table-cat_object_category_map.sql
trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.2.0-6.3.1.sql
trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.2.0-6.3.1.sql
trunk/ccm-ldn-aplaws/application.xml
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
Log:
CLI auto-categorisation using Cintra's searchLight index
NOTE: data model change, isAuto flag added to cat/obj mapping
Modified: trunk/ccm-core/pdl/com/arsdigita/categorization/Category.pdl
===================================================================
--- trunk/ccm-core/pdl/com/arsdigita/categorization/Category.pdl 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-core/pdl/com/arsdigita/categorization/Category.pdl 2006-06-07 21:57:40 UTC (rev 1149)
@@ -67,6 +67,7 @@
to cat_object_category_map.category_id,
join cat_object_category_map.object_id
to acs_objects.object_id;
+ Boolean[0..1] isAuto = cat_object_category_map.auto_p CHAR(1);
Boolean[0..1] isDefault = cat_object_category_map.default_p CHAR(1);
Boolean[0..1] isIndex = cat_object_category_map.index_p CHAR(1);
BigDecimal[0..1] sortKey = cat_object_category_map.sort_key;
Modified: trunk/ccm-core/sql/ccm-core/default/categorization/table-cat_object_category_map.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/default/categorization/table-cat_object_category_map.sql 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-core/sql/ccm-core/default/categorization/table-cat_object_category_map.sql 2006-06-07 21:57:40 UTC (rev 1149)
@@ -32,6 +32,9 @@
index_p char(1)
constraint cat_obj_map_index_p_ck
check(index_p in ('0','1')),
+ auto_p char(1) default '0'
+ constraint cat_obj_map_auto_p_ck
+ check(auto_p in ('0','1')),
sort_key integer,
constraint cat_obj_cat_map_ckone
check(not category_id = object_id),
Modified: trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.2.0-6.3.1.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.2.0-6.3.1.sql 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-core/sql/ccm-core/upgrade/oracle-se-6.2.0-6.3.1.sql 2006-06-07 21:57:40 UTC (rev 1149)
@@ -1 +1,2 @@
@@ ../default/upgrade/6.2.0-6.3.1/preferred-categories.sql
+@@ ../default/upgrade/6.2.0-6.3.1/auto-categorization.sql
Modified: trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.2.0-6.3.1.sql
===================================================================
--- trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.2.0-6.3.1.sql 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.2.0-6.3.1.sql 2006-06-07 21:57:40 UTC (rev 1149)
@@ -1 +1,7 @@
+begin;
\i ../default/upgrade/6.2.0-6.3.1/preferred-categories.sql
+\i ../default/upgrade/6.2.0-6.3.1/auto-categorization.sql
+create or replace function last_day(date) returns date as 'select
+cast(date_trunc(''month'', $1) + ''1 month''::interval as date) - 1'
+language sql;
+commit;
Modified: trunk/ccm-ldn-aplaws/application.xml
===================================================================
--- trunk/ccm-ldn-aplaws/application.xml 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-ldn-aplaws/application.xml 2006-06-07 21:57:40 UTC (rev 1149)
@@ -11,6 +11,7 @@
<ccm:requires name="ccm-ldn-subsite" version="6.2.0" relation="ge"/>
<ccm:requires name="ccm-ldn-portal" version="6.2.0" relation="ge"/>
<ccm:requires name="ccm-ldn-terms" version="6.2.0" relation="ge"/>
+ <ccm:requires name="ccm-ldn-dublin" version="6.2.0" relation="ge"/>
<ccm:requires name="ccm-ldn-navigation" version="6.2.0" relation="ge"/>
<ccm:requires name="ccm-cms-types-article" version="6.2.0" relation="ge"/>
</ccm:dependencies>
Added: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java 2006-06-07 21:57:40 UTC (rev 1149)
@@ -0,0 +1,472 @@
+package com.arsdigita.aplaws;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.OptionBuilder;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import com.arsdigita.categorization.Category;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentPage;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.cms.ContentSectionCollection;
+import com.arsdigita.cms.ContentSectionConfig;
+import com.arsdigita.cms.dispatcher.ItemResolver;
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.domain.DomainServiceInterfaceExposer;
+import com.arsdigita.london.cms.dublin.DublinCoreItem;
+import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.london.navigation.NavigationFileResolver;
+import com.arsdigita.london.terms.Domain;
+import com.arsdigita.london.terms.Term;
+import com.arsdigita.london.util.Program;
+import com.arsdigita.persistence.DataAssociation;
+import com.arsdigita.persistence.DataAssociationCursor;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.DataObject;
+import com.arsdigita.persistence.Session;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.web.Application;
+/**
+ * Command line tool to automatically assign terms.
+ *
+ * Input is a MASmedia Searchlight Indexer report XML file.
+ * This service is available for registered users
+ * at http://demo.masprovider.com/searchLight/
+ *
+ * @author ap...@re...
+ */
+public class AutoCategorisation extends Program {
+
+ private static final String CCM_PREFIX = "/ccm/";
+
+ private SAXParser parser;
+
+ public AutoCategorisation() {
+ super("AutoCategorisation", "1.0", "FILENAME(Searchlight XML report) SCORE(minimal term score)");
+ getOptions().addOption
+ (OptionBuilder
+ .hasArg(false)
+ .withLongOpt("test")
+ .withDescription("Test only")
+ .create('t'));
+
+ try {
+ parser = SAXParserFactory.newInstance().newSAXParser();
+ } catch (ParserConfigurationException pce) {
+ throw new RuntimeException("SAX parser configuration error", pce);
+ } catch (SAXException se) {
+ throw new RuntimeException("SAX parser error", se);
+ }
+ }
+
+ protected void doRun(CommandLine cmdLine) {
+ String[] args = cmdLine.getArgs();
+ if (args.length == 2) {
+ String filename = args[0];
+ int minScore = Integer.parseInt(args[1]);
+ try {
+ boolean persistChanges = ! cmdLine.hasOption('t');
+ parser.parse(new InputSource(new FileReader(filename)),
+ new SearchlightHandler(minScore, isDebug(), isVerbose(), persistChanges));
+ } catch (SAXException ex) {
+ throw new RuntimeException(ex);
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ } else {
+ help(System.err);
+ System.exit(1);
+ }
+ }
+
+ public static void main(String[] args) {
+ new AutoCategorisation().run(args);
+ }
+
+ /**
+ * Parse the XML site report from MASmedia Searchlight Indexer.
+ *
+ * @author apevec
+ *
+ */
+ private static class SearchlightHandler extends DefaultHandler {
+
+ boolean isDebug;
+ boolean isVerbose;
+ boolean persistChanges;
+ StringBuffer buffer;
+ String urlid;
+ String url;
+ ContentItem item;
+ Term term;
+ int score = 0;
+ Collection terms = new LinkedList();
+ Collection keywords = new HashSet();
+ boolean isKeyword;
+ int minScore;
+
+ public SearchlightHandler(int minScore, boolean isDebug, boolean isVerbose, boolean persistChanges) {
+ this.minScore = minScore;
+ this.isDebug = isDebug;
+ this.isVerbose = isVerbose;
+ this.persistChanges = persistChanges;
+ }
+
+ public void startDocument() throws SAXException {
+ if (isDebug) {
+ out("startDoc");
+ }
+ }
+
+ public void characters(char[] ch, int start, int len)
+ throws SAXException {
+ for (int i = 0; i < len; i++) {
+ buffer.append(ch[start + i]);
+ }
+ }
+
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) throws SAXException {
+ if (isDebug) {
+ out("startElement " + qName);
+ }
+ buffer = new StringBuffer();
+ if ("url".equals(qName)) {
+ urlid = null;
+ url = null;
+ item = null;
+ term = null;
+ } else if ("terms".equals(qName)) {
+ terms.clear();
+ score = 0;
+ } else if ("term".equals(qName)) {
+ // <term score="40" thesarus="IPSV-EX" id="9586">Travel</term>
+ if (item != null) {
+ score = Integer.parseInt(attributes.getValue("score"));
+ String domainKey = attributes.getValue("thesarus");
+ Integer uniqueID = Integer.valueOf(attributes
+ .getValue("id"));
+ Domain domain = null;
+ try {
+ domain = Domain.retrieve(domainKey);
+ } catch (DataObjectNotFoundException donfe) {
+ if (isVerbose) {
+ out("domain not found: " + domainKey);
+ }
+ }
+ // take IPSV and LGCL only
+ if (domain != null && ("IPSV".equals(domainKey) || "LGCL".equals(domainKey))) {
+ try {
+ term = domain.getTerm(uniqueID);
+ } catch (DataObjectNotFoundException donfe) {
+ if (isVerbose) {
+ out("term not found: " + domainKey + '/' + uniqueID);
+ }
+ }
+ }
+ }
+ } else if ("unformated_data".equals(qName)) {
+ keywords.clear();
+ } else if ("keyword_data".equals(qName)) {
+ String scheme = attributes.getValue("scheme");
+ if ("IPSV".equals(scheme) || "LGCL".equals(scheme)) {
+ isKeyword = true;
+ } else {
+ isKeyword = false;
+ }
+ } // if qName
+ }
+/* <tags>
+ <terms>
+ <term score="40" thesarus="IPSV" id="6809">Information services</term>
+ <term score="40" thesarus="IPSV" id="5546">Library and information services</term>
+ </terms>
+ <category><![CDATA[<meta name="eGMS.subject.category" scheme="IPSV" content="Library and information services" />]]></category>
+ <keyword><![CDATA[<meta name="eGMS.subject.keyword" scheme="IPSV" content="Information services" />]]></keyword>
+ <unformated_data>
+ <keyword_data scheme="IPSV-EX">Citizens Advice Bureaux; Citizen's Advice Bureaux</keyword_data>
+ <keyword_data scheme="IPSV">Citizens Advice Bureaux; Citizen's Advice
+Bureaux; Advice centres; Parliament (European)</keyword_data>
+ <category_data scheme="IPSV">Citizens Advice Bureaux; Citizen's Advice Bureaux; Advice agencies; European Parliament</category_data>
+ </unformated_data>
+ </tags>
+ */
+ public void endElement(String uri, String localName, String qName)
+ throws SAXException {
+ if (isDebug) {
+ out("endElement " + qName);
+ }
+ if ("urlid".equals(qName)) {
+ urlid = buffer.toString();
+ } else if ("urladdress".equals(qName)) {
+ url = buffer.toString();
+ // resolve url to the item
+ // supported are Navigation and ContentSection URLs
+ int ccmPrefix = url.indexOf(CCM_PREFIX);
+ if (ccmPrefix > -1) {
+ int appBegin = ccmPrefix + 5;
+ int appEnd = url.indexOf('/', appBegin);
+ if (appEnd > appBegin) {
+ String appURL = url.substring(appBegin, appEnd);
+ Application app = Application
+ .retrieveApplicationForPath('/' + appURL + '/');
+ if (app != null) {
+ String appType = app.getApplicationType()
+ .getApplicationObjectType();
+ if (ContentSection.BASE_DATA_OBJECT_TYPE
+ .equals(appType)) {
+ // a Content Section URL detected, resolving
+ // item path
+ ContentSection cs = (ContentSection) app;
+ ItemResolver resolver = cs.getItemResolver();
+ if (resolver != null) {
+ item = resolver.getItem(cs, url
+ .substring(appEnd),
+ ContentItem.LIVE);
+ if (item != null) {
+ item = item.getDraftVersion();
+ } else {
+ out("url not found: " + url);
+ }
+ } else {
+ if (isVerbose) {
+ out("invalid configuration: CS without resolver");
+ }
+ }
+ } else if (Navigation.BASE_DATA_OBJECT_TYPE
+ .equals(appType)) {
+ // a Navigation URL detected, resolving category
+ Navigation nav = (Navigation) app;
+ Category cat = null;
+ // categoryID=
+ int catBegin = url.indexOf("categoryID=",
+ appEnd);
+ if (catBegin > appEnd) {
+ BigDecimal catID = new BigDecimal(url
+ .substring(catBegin + 11));
+ cat = new Category(catID);
+ } else {
+ // named cat path, resolve using default
+ // context
+ // XXX subsites?
+ Category root = Category.getRootForObject(
+ nav, null);
+ Category[] cats = NavigationFileResolver
+ .resolveCategory(root, url
+ .substring(appEnd));
+ if (cats != null && cats.length != 0) {
+ cat = cats[cats.length - 1];
+ } else {
+ if (isVerbose) {
+ System.out
+ .println("category path not found: "
+ + url);
+ }
+ }
+ }
+ // category index item
+ item = (ContentItem) cat.getIndexObject();
+ } else {
+ if (isVerbose) {
+ System.out
+ .println("unsupported application: " + appType + " at "
+ + url);
+ }
+ }
+ } else {
+ if (isVerbose) {
+ out("application not found: " + url);
+ }
+ }
+ } else {
+ if (isVerbose) {
+ out("unsupported CCM url: " + url);
+ }
+ }
+ } else {
+ if (isVerbose) {
+ out("unsupported url: " + url);
+ }
+ }
+ } else if ("terms".equals(qName)) {
+ if (item != null) {
+ Collection manualCategories = new HashSet();
+ Collection oldAutoCategories = new HashSet();
+ Collection newAutoCategories = new LinkedList();
+ DataAssociationCursor cursor = ((DataAssociation)DomainServiceInterfaceExposer
+ .get(item, "categories")).cursor();
+ // cat_object_category_map.auto_p
+ // cursor.addEqualsFilter("link.isAuto", Boolean.FALSE);
+ while (cursor.next()) {
+ Object categoryID = cursor.get("id");
+ Boolean isAuto = (Boolean) cursor.getLinkProperty("isAuto");
+ if (isAuto.booleanValue()) {
+ oldAutoCategories.add(categoryID);
+ } else {
+ manualCategories.add(categoryID);
+ }
+ }
+ // assign all new auto-derived terms, unless it's already assigned
+ // prefer manual IPSV/LGCL over auto IPSV/LGCL, deriving GCL, LGSL, LGDL
+ // check existing manual terms
+ DataCollection dc = SessionManager.getSession().retrieve(Term.BASE_DATA_OBJECT_TYPE);
+ dc.addEqualsFilter("model.id", manualCategories);
+ dc.addFilter("domain.key IN ('IPSV','LGCL')");
+ boolean foundIPSVLGCL = false;
+ while (dc.next()) {
+ foundIPSVLGCL = true;
+ if (isDebug) {
+ out("manual IPSV/LGCL found");
+ }
+ }
+ if (!foundIPSVLGCL) {
+ for (Iterator iter=terms.iterator();iter.hasNext();) {
+ Term t = (Term) iter.next();
+ BigDecimal categoryID = term.getModel().getID();
+ if ( !manualCategories.contains(categoryID)) {
+ if (!oldAutoCategories.contains(categoryID)) {
+ if (persistChanges) {
+ t.addObject(item);
+ }
+ newAutoCategories.add(categoryID); // to be marked isAuto
+ if (isVerbose) {
+ out("ASSIGN " + term + " to "
+ + item);
+ }
+ } else {
+ oldAutoCategories.remove(categoryID);
+ if (isVerbose) {
+ out("skip automatically assigned "+term);
+ }
+ }
+ } else if (isVerbose){
+ out("skip manually assigned "+term);
+ }
+ }
+ // cleanup old auto-assigned terms
+ for (Iterator iter=oldAutoCategories.iterator(); iter.hasNext(); ) {
+ Category category = new Category((BigDecimal) iter.next());
+ if (persistChanges) {
+ category.removeChild(item);
+ }
+ if (isDebug){
+ out("removing oldAuto "+category+" from "+item);
+ }
+ }
+ cursor = ((DataAssociation)DomainServiceInterfaceExposer
+ .get(item, "categories")).cursor();
+ cursor.addEqualsFilter("id", newAutoCategories);
+ while (cursor.next()) {
+ Object categoryID = cursor.get("id");
+ if (persistChanges) {
+ DataObject link = cursor.getLink();
+ link.set("isAuto",Boolean.TRUE);
+ }
+ if (isDebug) {
+ out("isAuto=TRUE for new categoryID="+categoryID+"/"+item);
+ }
+ }
+ }
+ // TODO derive other domains from assigned terms using mappings
+ } else {
+ if (isVerbose) {
+ System.out
+ .println("skip terms, item not found");
+ }
+ }
+ } else if ("term".equals(qName)) {
+ // sanity check, compare term name found in MASmedia report
+ // and what is loaded in the database
+ String termNameFromXML = buffer.toString();
+ if (term != null) {
+ if (termNameFromXML.equals(term.getName())) {
+ if (score >= minScore) {
+ // defer assigning of the term till </terms>
+ terms.add(term);
+ } else if (isVerbose) {
+ out("low score "+score+" for "+term.getName()+" "+term.getUniqueID());
+ }
+ } else if (isVerbose) {
+ System.out
+ .println("term names differ XML:"
+ + termNameFromXML + " DB:"
+ + term.getName());
+ }
+ term = null;
+ } else if (isVerbose) {
+ out("skipping term "
+ + termNameFromXML);
+ }
+ keywords.clear();
+ } else if ("keyword_data".equals(qName)) {
+ if (isKeyword) {
+ // store all keywords separately
+ StringTokenizer tok = new StringTokenizer(buffer.toString(), ";");
+ while (tok.hasMoreTokens()) {
+ keywords.add(tok.nextToken().trim());
+ }
+ }
+ } else if ("unformated_data".equals(qName)) {
+ if (item != null && item instanceof ContentPage) {
+ ContentPage pageItem = (ContentPage) item;
+ DublinCoreItem dcItem = DublinCoreItem.findByOwner(pageItem);
+ // append into dcItem.getKeywords()
+ // NOTE: "DC keywords" metadata is stored as a string, cannot tell which keywords are auto.
+ // To support that, datamodel change to 1:N mapping table would be required.
+ StringTokenizer tok = new StringTokenizer(dcItem.getKeywords(), ";");
+ // merge old "DC keywords" into set of new ones
+ while (tok.hasMoreTokens()) {
+ keywords.add(tok.nextToken().trim());
+ }
+ StringBuffer buf = new StringBuffer();
+ // reconstruct "DC keywords" and store them
+ Iterator i=keywords.iterator();
+ if (i.hasNext()) {
+ buf.append(i.next());
+ }
+ for (; i.hasNext();) {
+ buf.append(' ').append(';').append(i.next());
+ }
+ String keywords = buf.toString();
+ if (isVerbose) {
+ out("ASSIGN keywords \""+keywords+"\"");
+ }
+ if (persistChanges) {
+ dcItem.setKeywords(keywords);
+ }
+ }
+ } // if qName
+ }
+
+ public void endDocument() throws SAXException {
+ if (isDebug) {
+ out("endDoc");
+ }
+ }
+
+ private void out(String line) {
+ System.out.println(line);
+ }
+
+ private void err(String line) {
+ System.err.println(line);
+ }
+ }
+}
Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java 2006-06-04 14:28:17 UTC (rev 1148)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java 2006-06-07 21:57:40 UTC (rev 1149)
@@ -241,7 +241,7 @@
return root;
}
- private Category[] resolveCategory(Category root,
+ public static Category[] resolveCategory(Category root,
String path) {
String[] bits = StringUtils.split(path, '/');
|
Author: sshinde Date: 2006-06-04 16:28:17 +0200 (Sun, 04 Jun 2006) New Revision: 1148 Added: contrib/ccm-ldn-camden-wordxml/ contrib/ccm-ldn-camden-wordxml/release/ contrib/ccm-ldn-camden-wordxml/trunk/ contrib/ccm-ldn-camden-wordxml/trunk/application.xml contrib/ccm-ldn-camden-wordxml/trunk/pdl/ contrib/ccm-ldn-camden-wordxml/trunk/pdl/com/ contrib/ccm-ldn-camden-wordxml/trunk/pdl/com/arsdigita/ contrib/ccm-ldn-camden-wordxml/trunk/pdl/com/arsdigita/camden/ contrib/ccm-ldn-camden-wordxml/trunk/pdl/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-wordxml/trunk/pdl/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-wordxml/trunk/pdl/com/arsdigita/camden/cms/contenttypes/Wordxml.pdl contrib/ccm-ldn-camden-wordxml/trunk/sql/ contrib/ccm-ldn-camden-wordxml/trunk/sql/ccm-ldn-camden-wordxml/ contrib/ccm-ldn-camden-wordxml/trunk/sql/ccm-ldn-camden-wordxml/oracle-se-create.sql contrib/ccm-ldn-camden-wordxml/trunk/sql/ccm-ldn-camden-wordxml/oracle-se/ contrib/ccm-ldn-camden-wordxml/trunk/sql/ccm-ldn-camden-wordxml/postgres-create.sql contrib/ccm-ldn-camden-wordxml/trunk/sql/ccm-ldn-camden-wordxml/upgrade/ contrib/ccm-ldn-camden-wordxml/trunk/src/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/com/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/com/arsdigita/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/com/arsdigita/camden/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/Wordxml.xml contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/traversal-adapters/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/traversal-adapters/com/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ contrib/ccm-ldn-camden-wordxml/trunk/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Wordxml.xml contrib/ccm-ldn-camden-wordxml/trunk/src/ccm-ldn-camden-wordxml.config contrib/ccm-ldn-camden-wordxml/trunk/src/ccm-ldn-camden-wordxml.load contrib/ccm-ldn-camden-wordxml/trunk/src/ccm-ldn-camden-wordxml.upgrade contrib/ccm-ldn-camden-wordxml/trunk/src/com/ contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/ contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/ contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/ contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/ contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/Wordxml.java contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/WordxmlConfig_parameter.properties contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/WordxmlFileProcessor.java contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/WordxmlImage.java contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/WordxmlInitializer.java contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/WordxmlLoader.java contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/WordxmlResources.java contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ contrib/ccm-ldn-camden-wordxml/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/WordxmlFileEdit.java contrib/ccm-ldn-camden-wordxml/trunk/web/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/dtd/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/dtd/camden.dtd contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/AUTHORS contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/BUGS contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/COPYING contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/INSTALL contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/NEWS contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/README contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/RELEASE-NOTES.html contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/RELEASE-NOTES.pdf contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/RELEASE-NOTES.txt contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/RELEASE-NOTES.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/TODO contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/VERSION contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/catalog.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/af.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/am.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ar.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/autoidx-ng.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/az.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/bg.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/bn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/bs.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ca.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/common.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/cs.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/cy.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/da.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/de.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/el.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/en.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/es.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/et.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/eu.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/fa.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/fi.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/fr.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ga.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/gentext.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/gu.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/he.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/hi.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/hr.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/hu.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/id.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/it.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ja.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/kn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ko.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/l10n.dtd contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/l10n.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/l10n.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/la.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/labels.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/lt.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/mn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/nl.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/nn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/no.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/olink.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/or.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/pa.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/pi.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/pl.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/pt.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/pt_br.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/refentry.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ro.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ru.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/sk.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/sl.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/sq.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/sr.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/sr_Latn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/subtitles.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/sv.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/ta.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/table.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/targetdatabase.dtd contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/targets.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/th.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/titles.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/tl.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/tr.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/uk.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/vi.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/xh.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/zh_cn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/common/zh_tw.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/eclipse/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/eclipse/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/eclipse/eclipse.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/CVS.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/Callout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/ColumnScanEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/ColumnUpdateEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/CopyEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/FormatCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/FormatGraphicCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/FormatTextCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/FormatUnicodeCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/ImageIntrinsics.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/LineCountEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/NumberLinesEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/Table.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/Text.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/TextFactory.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/UnwrapLinks.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/UnwrapLinksEmitter.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/Verbatim.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/Windows1252.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon643/com/nwalsh/saxon/package.html contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon644.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon65.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon651.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon652.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/saxon653.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/CVS.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/Callout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/FormatCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/FormatDingbatCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/FormatGraphicCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/FormatTextCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/FormatUnicodeCallout.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/Func.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/ImageIntrinsics.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/Params.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/Table.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/Text.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/Verbatim.java contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan2/com/nwalsh/xalan/package.html contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/extensions/xalan25.jar contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/admon.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/autoidx-ng.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/autoidx.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/autotoc.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/axf.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/biblio.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/block.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/callout.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/component.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/division.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/docbook.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/docbookng.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/ebnf.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/fo-patch-for-fop.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/fo-rtf.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/fo.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/footnote.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/fop.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/formal.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/glossary.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/graphics.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/htmltbl.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/index.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/info.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/inline.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/keywords.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/lists.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/math.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/pagesetup.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/param.ent contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/param.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/param.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/param.xweb contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/passivetex.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/pdf2index contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/pi.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/profile-docbook.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/qandaset.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/refentry.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/sections.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/synop.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/table.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/task.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/titlepage.templates.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/titlepage.templates.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/titlepage.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/toc.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/verbatim.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/xep.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/fo/xref.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/admon.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/annotations.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/autoidx-ng.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/autoidx.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/autotoc.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/biblio.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/block.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/callout.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/changebars.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/chunk-code.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/chunk-common.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/chunk.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/chunker.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/chunkfast.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/chunktoc.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/component.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/division.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/docbook.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/docbookng.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/ebnf.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/footnote.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/formal.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/glossary.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/graphics.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/html-rtf.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/html.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/htmltbl.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/index.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/info.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/inline.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/keywords.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/lists.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/maketoc.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/manifest.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/math.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/oldchunker.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/onechunk.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/param.ent contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/param.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/param.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/param.xweb contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/pi.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/profile-chunk-code.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/profile-chunk.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/profile-docbook.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/profile-onechunk.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/qandaset.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/refentry.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/sections.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/synop.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/table.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/task.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/titlepage.templates.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/titlepage.templates.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/titlepage.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/toc.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/verbatim.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/html/xref.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/htmlhelp/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/htmlhelp/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/htmlhelp/htmlhelp-common.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/htmlhelp/htmlhelp.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/htmlhelp/profile-htmlhelp-common.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/htmlhelp/profile-htmlhelp.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/blank.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/1.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/1.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/10.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/10.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/11.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/11.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/12.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/12.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/13.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/13.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/14.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/14.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/15.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/15.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/2.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/2.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/3.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/3.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/4.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/4.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/5.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/5.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/6.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/6.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/7.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/7.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/8.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/8.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/9.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/9.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/callouts/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/caution.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/caution.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/caution.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/caution.tif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/draft.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/home.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/home.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/home.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/important.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/important.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/important.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/important.tif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/next.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/next.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/next.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/note.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/note.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/note.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/note.tif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/prev.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/prev.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/prev.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/tip.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/tip.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/tip.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/tip.tif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/toc-blank.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/toc-minus.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/toc-plus.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/up.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/up.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/up.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/warning.gif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/warning.png contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/warning.svg contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/images/warning.tif contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/install.sh contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/javahelp/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/javahelp/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/javahelp/javahelp.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/javahelp/profile-javahelp.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/lib/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/lib/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/lib/lib.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/lib/lib.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/lib/lib.xweb contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/ChangeLog.20020917 contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/README contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/block.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/charmap.groff.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/docbook.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/info.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/inline.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/links.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/lists.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/other.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/param.ent contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/param.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/param.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/param.xweb contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/refentry.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/stripns.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/synop.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/manpages/utility.xsl contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/ contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/ChangeLog contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/abstract.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/abstract.title.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admon.graphics.extension.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admon.graphics.path.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admon.graphics.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admon.style.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admon.textlabel.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admonition.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/admonition.title.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/alignment.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/annotate.toc.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/annotation.css.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/annotation.graphic.close.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/annotation.graphic.open.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/annotation.js.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/annotation.support.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/appendix.autolabel.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/arbortext.extensions.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/article.appendix.title.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/author.othername.in.middle.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/autotoc.label.separator.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/axf.extensions.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/base.dir.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/biblioentry.item.separator.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/bibliography.collection.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/bibliography.numbered.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/blockquote.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.end.indent.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.font.family.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.font.master.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.font.size.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.margin.bottom.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.margin.top.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/body.start.indent.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/bridgehead.in.toc.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.defaultcolumn.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.graphics.extension.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.graphics.number.limit.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.graphics.path.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.graphics.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.list.table.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.unicode.font.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.unicode.number.limit.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.unicode.start.character.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callout.unicode.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/callouts.extension.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chapter.autolabel.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.first.sections.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.quietly.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.section.depth.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.sections.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.separate.lots.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.toc.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunk.tocs.and.lots.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.cdata-section-elements.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.doctype-public.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.doctype-system.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.encoding.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.indent.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.media-type.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.method.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.omit-xml-declaration.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/chunker.output.standalone.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/citerefentry.link.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/collect.xref.targets.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.count.back.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.count.body.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.count.front.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.count.index.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.count.lot.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.count.titlepage.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.gap.back.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.gap.body.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.gap.front.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.gap.index.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.gap.lot.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/column.gap.titlepage.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/compact.list.item.spacing.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/component.label.includes.part.label.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/component.title.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/css.decoration.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/current.docid.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/default.float.class.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/default.image.width.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/default.table.frame.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/default.table.width.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/default.units.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/dingbat.font.family.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/double.sided.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/draft.mode.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/draft.watermark.image.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/ebnf.assignment.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/ebnf.statement.terminator.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/ebnf.table.bgcolor.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/ebnf.table.border.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/eclipse.autolabel.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/eclipse.plugin.id.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/eclipse.plugin.name.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/eclipse.plugin.provider.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/emphasis.propagates.style.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/entry.propagates.style.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/equation.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/example.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/figure.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/firstterm.only.link.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footer.column.widths.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footer.content.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footer.rule.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footers.on.blank.pages.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footnote.font.size.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footnote.mark.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footnote.number.format.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footnote.number.symbols.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footnote.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/footnote.sep.leader.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/fop.extensions.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/formal.object.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/formal.procedures.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/formal.title.placement.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/formal.title.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/funcsynopsis.decoration.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/funcsynopsis.style.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/funcsynopsis.tabular.threshold.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/function.parens.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.id.attributes.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.index.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.legalnotice.link.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.manifest.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.meta.abstract.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.revhistory.link.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.section.toc.level.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/generate.toc.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glossary.as.blocks.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glossary.collection.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glossentry.show.acronym.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glosslist.as.blocks.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glossterm.auto.link.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glossterm.separation.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/glossterm.width.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/graphic.default.extension.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/graphical.admonition.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/graphicsize.extension.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/graphicsize.use.img.src.path.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/header.column.widths.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/header.content.properties.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/header.rule.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/headers.on.blank.pages.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/html.base.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/html.cellpadding.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/html.cellspacing.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/params/html.cleanup.xml contrib/ccm-ldn-camden-wordxml/trunk/web/packages/wordxml/xsl/docbook-xsl-1.69.1/param... [truncated message content] |
|
From: <ssk...@vh...> - 2006-06-02 12:54:55
|
Author: sskracic
Date: 2006-06-02 14:50:31 +0200 (Fri, 02 Jun 2006)
New Revision: 1147
Modified:
releases/1.0.3/ccm-cms/application.xml
releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java
Log:
Integrated r1093 (no need for context=live in stable links) from trunk.
Modified: releases/1.0.3/ccm-cms/application.xml
===================================================================
--- releases/1.0.3/ccm-cms/application.xml 2006-06-02 10:51:23 UTC (rev 1146)
+++ releases/1.0.3/ccm-cms/application.xml 2006-06-02 12:50:31 UTC (rev 1147)
@@ -3,7 +3,7 @@
name="ccm-cms"
prettyName="Red Hat CCM Content Management System"
version="6.2.0"
- release="7"
+ release="8"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
Modified: releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java
===================================================================
--- releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java 2006-06-02 10:51:23 UTC (rev 1146)
+++ releases/1.0.3/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java 2006-06-02 12:50:31 UTC (rev 1147)
@@ -165,7 +165,7 @@
// URL
Element linkElement = new Element("cms:linkSummary",CMS.CMS_XML_NS);
- linkElement.addAttribute("url","/redirect?oid=" + URLEncoder.encode(item.getDraftVersion().getOID().toString()) + "&context=" + ContentItem.LIVE);
+ linkElement.addAttribute("url","/redirect?oid=" + URLEncoder.encode(item.getDraftVersion().getOID().toString()));
// WORKFLOW
Element workflowElement = new Element("cms:workflowSummary",CMS.CMS_XML_NS);
|
|
From: <ssk...@vh...> - 2006-06-02 10:55:35
|
Author: sskracic
Date: 2006-06-02 12:51:23 +0200 (Fri, 02 Jun 2006)
New Revision: 1146
Modified:
trunk/ccm-ldn-rss/application.xml
trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java
Log:
RSSService.java modified to output full URL, fix provided by folks at LBC.
Modified: trunk/ccm-ldn-rss/application.xml
===================================================================
--- trunk/ccm-ldn-rss/application.xml 2006-05-26 09:53:21 UTC (rev 1145)
+++ trunk/ccm-ldn-rss/application.xml 2006-06-02 10:51:23 UTC (rev 1146)
@@ -3,7 +3,7 @@
name="ccm-ldn-rss"
prettyName="RSS"
version="6.3.0"
- release="3">
+ release="4">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>
Modified: trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java
===================================================================
--- trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java 2006-05-26 09:53:21 UTC (rev 1145)
+++ trunk/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java 2006-06-02 10:51:23 UTC (rev 1146)
@@ -66,6 +66,8 @@
private static org.apache.log4j.Logger s_log =
org.apache.log4j.Logger.getLogger(RSSService.class);
+ private static final String serverURL = URL.root().getServerURI();
+
/**
* Generates an RSS channel for a specified category and and all of its Articles.
*/
@@ -139,7 +141,7 @@
}
Element channelLink = new Element("link", rssNS);
- channelLink.setText(URLService.locate(cat.getOID()));
+ channelLink.setText(serverURL.concat(URLService.locate(cat.getOID())));
channel.addContent(channelLink);
Element channelDescription = new Element("description", rssNS);
@@ -194,7 +196,7 @@
title = item.getDisplayName();
}
- String itemURL = URLService.locate(item.getOID());
+ String itemURL = serverURL.concat(URLService.locate(item.getOID()));
s_log.debug("item is live");
|
|
From: <ssk...@vh...> - 2006-05-26 09:57:12
|
Author: sskracic
Date: 2006-05-26 11:53:21 +0200 (Fri, 26 May 2006)
New Revision: 1145
Modified:
trunk/tools/misc/build-all.sh
Log:
Instead of last repository revision, RPMs are tagged with the
last changed revision for the particular component.
Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh 2006-05-24 09:55:54 UTC (rev 1144)
+++ trunk/tools/misc/build-all.sh 2006-05-26 09:53:21 UTC (rev 1145)
@@ -196,7 +196,7 @@
# Gets svn revision for app whose tree starts in current dir.
function get_svn_revision {
SVN_REVISION=""
- revision=$(svn info . | grep ^Revision | cut '-d ' -f2)
+ revision=$(svn info . | grep -i '^last changed rev' | cut '-d ' -f4)
ccm_app=$(pwd | sed 's!.*/!!')
if [ -z "$revision" ]; then
echo "Could not find the most recent svn revision number for $ccm_app"
|
|
From: <ap...@vh...> - 2006-05-24 09:59:40
|
Author: apevec
Date: 2006-05-24 11:55:54 +0200 (Wed, 24 May 2006)
New Revision: 1144
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java
Log:
redirect to the draft produces 404 by default,
thise can be switched off by com.arsdigita.cms.unpublished_not_found=false
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java 2006-05-22 22:07:59 UTC (rev 1143)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java 2006-05-24 09:55:54 UTC (rev 1144)
@@ -101,6 +101,7 @@
private final Parameter m_soonExpiredTimespanMonths;
private final Parameter m_soonExpiredTimespanDays;
private final Parameter m_defaultTaskAlerts;
+ private final Parameter m_unpublishedNotFound;
/**
* Do not instantiate this class directly.
@@ -261,6 +262,10 @@
("com.arsdigita.cms.soon_expired_timespan_months",
Parameter.REQUIRED, new Integer(0));
+ m_unpublishedNotFound = new BooleanParameter
+ ("com.arsdigita.cms.unpublished_not_found",
+ Parameter.REQUIRED, new Boolean(true));
+
register(m_templateRootPath);
register(m_defaultItemTemplatePath);
register(m_defaultFolderTemplatePath);
@@ -293,6 +298,7 @@
register(m_soonExpiredTimespanMonths);
register(m_soonExpiredTimespanDays);
register(m_defaultTaskAlerts);
+ register(m_unpublishedNotFound);
loadInfo();
}
@@ -428,6 +434,10 @@
public final String[] getDefaultTaskAlerts() {
return (String[]) get(m_defaultTaskAlerts);
}
+
+ public final boolean isUnpublishedNotFound() {
+ return ((Boolean) get(m_unpublishedNotFound)).booleanValue();
+ }
private class SpecificClassParameter extends ClassParameter {
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties 2006-05-22 22:07:59 UTC (rev 1143)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties 2006-05-24 09:55:54 UTC (rev 1144)
@@ -158,3 +158,7 @@
com.arsdigita.cms.default_task_alerts.example=Authoring:enable:finish:rollback,Approval:enable:finish:rollback,Deploy:enable:finish:rollback
com.arsdigita.cms.default_task_alerts.format=[string,string,string]
+com.arsdigita.cms.unpublished_not_found.title=Unpublished Not Found
+com.arsdigita.cms.unpublished_not_found.purpose=Does a redirect to the unpublished item generate not found error?
+com.arsdigita.cms.unpublished_not_found.example=true
+com.arsdigita.cms.unpublished_not_found.format=[boolean]
Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java 2006-05-22 22:07:59 UTC (rev 1143)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java 2006-05-24 09:55:54 UTC (rev 1144)
@@ -18,32 +18,27 @@
*/
package com.arsdigita.cms.dispatcher;
+import org.apache.log4j.Logger;
+
+import com.arsdigita.categorization.Category;
import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentSection;
-
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.domain.DomainServiceInterfaceExposer;
import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.kernel.NoValidURLException;
import com.arsdigita.kernel.URLFinder;
import com.arsdigita.kernel.URLFinderNotFoundException;
import com.arsdigita.kernel.URLService;
-import com.arsdigita.kernel.NoValidURLException;
-
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.domain.DomainServiceInterfaceExposer;
-import com.arsdigita.domain.DataObjectNotFoundException;
-
-import com.arsdigita.categorization.Category;
-
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.OID;
-
-import com.arsdigita.web.URL;
import com.arsdigita.web.ParameterMap;
+import com.arsdigita.web.URL;
import com.arsdigita.web.Web;
-import org.apache.log4j.Logger;
-
public class ItemURLFinder implements URLFinder {
private static final Logger s_log = Logger.getLogger(ItemURLFinder.class);
@@ -168,8 +163,9 @@
}
}
} else { // DRAFT context
- // public users should get 404 when item gets unpublished
- if (!Web.getUserContext().isLoggedIn()) {
+ // public users get 404 when item gets unpublished
+ // if com.arsdigita.cms.unpublished_not_found=true
+ if (ContentSection.getConfig().isUnpublishedNotFound() && !Web.getUserContext().isLoggedIn()) {
throw new NoValidURLException("user must be logged-in to get draft");
} else {
// force the switch to draft version at this point
|
|
From: <ap...@vh...> - 2006-05-22 22:11:38
|
Author: apevec
Date: 2006-05-23 00:07:59 +0200 (Tue, 23 May 2006)
New Revision: 1143
Modified:
trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java
Log:
make CategoryExporter usable with Terms importer tool
Modified: trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java
===================================================================
--- trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java 2006-05-22 21:29:35 UTC (rev 1142)
+++ trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java 2006-05-22 22:07:59 UTC (rev 1143)
@@ -122,12 +122,13 @@
Category cat = (Category)cats.getDomainObject();
int id = idMap.size() + 1;
idMap.put(cat, new Integer(id));
-
- Element term = domain.newChildElement("terms:term",
- TERMS_XML_NS);
- term.addAttribute("id", new Integer(id).toString());
- term.addAttribute("name", cat.getName());
- term.addAttribute("inAtoZ", "false");
+ if (!cat.equals(root)) {
+ Element term = domain.newChildElement("terms:term",
+ TERMS_XML_NS);
+ term.addAttribute("id", new Integer(id).toString());
+ term.addAttribute("name", cat.getName());
+ term.addAttribute("inAtoZ", "false");
+ }
}
save(domain,
@@ -200,10 +201,11 @@
dstTerm.addAttribute("id", idMap.get(dstCat).toString());
if (dstCat.getDefaultParentCategory().equals(srcCat)) {
- src.addAttribute("isDefault", "true");
+ dst.addAttribute("isDefault", "true");
} else {
- src.addAttribute("isDefault", "false");
+ dst.addAttribute("isDefault", "false");
}
+ dst.addAttribute("isPreferred", "true");
}
private void exportItems(Category root,
|
18 messages has been excluded from this view by a project administrator.
