Menu
▾
▴
[Aplaws-commit] r1167 - in trunk/ccm-core: . debian pdl/com/arsdigita/categorization pdl/com/arsdigita/kernel pdl/com/arsdigita/versioning sql/ccm-core/default/categorization sql/ccm-core/default/kernel sql/ccm-core/default/upgrade sql/ccm-core/oracle-se/upgrade sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0 sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1 sql/ccm-core/oracle-se/upgrade/6.3.1-6.3.2 sql/ccm-core/postgres/upgrade sql/ccm-core/postgres/upgrade/6.3.0-6.3.1 sql/ccm-core/postgres/upgrade/6.3.1-6.3.2 sql/ccm-core/upgrade src src/com/arsdigita/bebop src/com/arsdigita/categorization src/com/arsdigita/dispatcher src/com/arsdigita/domain src/com/arsdigita/kernel src/com/arsdigita/kernel/security src/com/arsdigita/mimetypes src/com/arsdigita/packaging src/com/arsdigita/search src/com/arsdigita/search/ui src/com/arsdigita/templating src/com/arsdigita/ui/admin src/com/arsdigita/ui/login src/com/arsdigita/xml src/com/arsdigita/xml/formatters src/com/redhat/persistence/engine/rdbms web web/! assets/htmlarea web/assets/htmlarea/config web/assets/htmlarea/plugins/SpellChecker web/assets/htmlarea/plugins/SpellChecker/lang web/assets/htmlarea/popups web/packages/bebop/xsl
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. +# .. |
