Menu
▾
▴
[Aplaws-commit] r1171 - in trunk/ccm-ldn-navigation: . debian src/com/arsdigita/london/navigation src/com/arsdigita/london/navigation/cms src/com/arsdigita/london/navigation/ui src/com/arsdigita/london/navigation/ui/category web/packages/navigation/templates
|
From: <fa...@vh...> - 2006-06-14 13:59:25
|
Author: fabrice
Date: 2006-06-14 15:54:39 +0200 (Wed, 14 Jun 2006)
New Revision: 1171
Added:
trunk/ccm-ldn-navigation/debian/
trunk/ccm-ldn-navigation/debian/ccm-build.sh
trunk/ccm-ldn-navigation/debian/ccm-clean.sh
trunk/ccm-ldn-navigation/debian/ccm-config.sh
trunk/ccm-ldn-navigation/debian/ccm-disperse.sh
trunk/ccm-ldn-navigation/debian/ccm-install.sh
trunk/ccm-ldn-navigation/debian/ccm-ldn-navigation.dirs
trunk/ccm-ldn-navigation/debian/ccm-settings-run.sh
trunk/ccm-ldn-navigation/debian/ccm-settings.sh
trunk/ccm-ldn-navigation/debian/changelog
trunk/ccm-ldn-navigation/debian/compat
trunk/ccm-ldn-navigation/debian/config
trunk/ccm-ldn-navigation/debian/control
trunk/ccm-ldn-navigation/debian/copyright
trunk/ccm-ldn-navigation/debian/postinst
trunk/ccm-ldn-navigation/debian/postrm
trunk/ccm-ldn-navigation/debian/prerm
trunk/ccm-ldn-navigation/debian/rules
trunk/ccm-ldn-navigation/debian/templates
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/CategoryWidget.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItemExtraXML.java
trunk/ccm-ldn-navigation/web/packages/navigation/templates/category-list.jsp
Modified:
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationFileResolver.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Hierarchy.java
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/Menu.java
trunk/ccm-ldn-navigation/web/packages/navigation/templates/default.jsp
Log:
* isSelected attribute on Tree
* give a 404 on category.jsp if the category is disabled
* ability to set MPA/SiteProxy as index items
* debian files
Added: trunk/ccm-ldn-navigation/debian/ccm-build.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-build.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-build.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation/debian/ccm-clean.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-clean.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-clean.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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:14 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-ldn-navigation/debian/ccm-config.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-config.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-config.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation/debian/ccm-disperse.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-disperse.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-disperse.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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:14 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-ldn-navigation/debian/ccm-install.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-install.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-install.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation/debian/ccm-ldn-navigation.dirs
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-ldn-navigation.dirs 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-ldn-navigation.dirs 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1 @@
+usr/share/java/ccm-ldn-navigation-6.3.0
Added: trunk/ccm-ldn-navigation/debian/ccm-settings-run.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-settings-run.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-settings-run.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation/debian/ccm-settings-run.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-ldn-navigation/debian/ccm-settings.sh
===================================================================
--- trunk/ccm-ldn-navigation/debian/ccm-settings.sh 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/ccm-settings.sh 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation
+version=6.3.0
+appname=ccm-ldn-navigation
+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-ldn-navigation/debian/changelog
===================================================================
--- trunk/ccm-ldn-navigation/debian/changelog 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/changelog 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,169 @@
+ccm-ldn-navigation (6.3.0-7) unstable; urgency=low
+
+ * #21362 give a 404 for category.jsp?categoryID=XXX where XXX is a disabled
+ category
+
+ -- My <my...@fi...> Wed, 14 Jun 2006 09:58:01 +0000
+
+ccm-ldn-navigation (6.3.0-6) unstable; urgency=low
+
+ * Fix 21135 - where a category has more than one parent, only show
+ isSelected="true" for the correct branch
+
+ -- Erik Erskine <er...@ru...> Mon, 13 Mar 2006 16:52:10 +0000
+
+ccm-ldn-navigation (6.3.0-5) unstable; urgency=low
+
+ * Cancelling previous
+
+ -- My <my...@fi...> Fri, 3 Mar 2006 13:47:39 +0000
+
+ccm-ldn-navigation (6.3.0-4) unstable; urgency=low
+
+ * New nav classes from UNDP
+
+ -- My <my...@fi...> Fri, 3 Mar 2006 12:22:28 +0000
+
+ccm-ldn-navigation (6.3.0-3) unstable; urgency=low
+
+ * Added page and new class to create XML category summary
+
+ -- James Burt <ja...@ru...> Fri, 27 Jan 2006 12:34:27 +0000
+
+ccm-ldn-navigation (6.3.0-2) unstable; urgency=low
+
+ * RedHat patches
+
+ -- My <my...@fi...> Fri, 30 Dec 2005 08:53:09 +0000
+
+ccm-ldn-navigation (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:52:01 +0000
+
+ccm-ldn-navigation (6.2.0-1) unstable; urgency=low
+
+ * Automatic update of version number from 1.4.5 to 6.2.0
+
+ -- Runtime Collective Ltd. <in...@ru...> Mon, 10 Oct 2005 12:30:12 +0000
+
+ccm-ldn-navigation (1.4.5-8) unstable; urgency=low
+
+ * Filter for catID first in DataCollDef to speed up joins
+
+ -- My <my...@fi...> Wed, 5 Oct 2005 11:11:48 +0000
+
+ccm-ldn-navigation (1.4.5-7) unstable; urgency=low
+
+ * Refactoring MPA/SiteProxy as index item patch, adding 404s for invalid
+ category hits
+
+ -- My <my...@fi...> Thu, 28 Jul 2005 12:27:06 +0000
+
+ccm-ldn-navigation (1.4.5-6) unstable; urgency=low
+
+ * Scan all content types in ExtraXML component
+
+ -- My <my...@fi...> Mon, 4 Jul 2005 14:21:51 +0000
+
+ccm-ldn-navigation (1.4.5-5) unstable; urgency=low
+
+ * SiteProxy as index items
+
+ -- My <my...@fi...> Fri, 24 Jun 2005 09:21:11 +0000
+
+ccm-ldn-navigation (1.4.5-4) unstable; urgency=low
+
+ * MPAs as index items
+
+ -- My <my...@fi...> Thu, 23 Jun 2005 15:37:36 +0000
+
+ccm-ldn-navigation (1.4.5-3) unstable; urgency=low
+
+ * Investigating #17703
+
+ -- My <my...@fi...> Thu, 12 May 2005 15:59:16 +0000
+
+ccm-ldn-navigation (1.4.5-2) unstable; urgency=low
+
+ * Integrated one fix from official Aplaws
+
+ -- Fabrice Retkowsky <fa...@ru...> Wed, 20 Apr 2005 10:42:46 +0100
+
+ccm-ldn-navigation (1.4.5-1) unstable; urgency=low
+
+ * Automatic update of version number from 1.4.4 to 1.4.5
+
+ -- Runtime Collective Ltd. <in...@ru...> Thu, 31 Mar 2005 11:59:55 +0000
+
+ccm-ldn-navigation (1.4.4-1) unstable; urgency=low
+
+ * For qa
+
+ -- Fabrice Retkowsky <fabrice@Utopia> Fri, 4 Mar 2005 17:12:10 -0800
+
+ccm-ldn-navigation (1.4.3-8) unstable; urgency=low
+
+ * OPtion for CategoryMenu to display grand-children categories, ticket 16648
+
+ -- Fabrice Retkowsky <fabrice@Utopia> Fri, 4 Mar 2005 17:12:10 -0800
+
+ccm-ldn-navigation (1.4.3-7) unstable; urgency=low
+
+ * Fixed the previous fix, 16648
+
+ -- Watford Project <wa...@ch...> Thu, 3 Mar 2005 17:38:02 +0000
+
+ccm-ldn-navigation (1.4.3-6) unstable; urgency=low
+
+ * Option for CategoryMenu to display nephew categories of the current one,
+ ticket 16648
+
+ -- Watford Project <wa...@ch...> Wed, 23 Feb 2005 18:31:19 +0000
+
+ccm-ldn-navigation (1.4.3-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 15:26:22 +0000
+
+ccm-ldn-navigation (1.4.3-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-ldn-navigation (1.4.3-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-ldn-navigation (1.4.3-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-ldn-navigation (1.4.3-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Berkan Eskikaya <be...@ru...> Fri, 24 Apr 2004 12:27:56 +0100
Added: trunk/ccm-ldn-navigation/debian/compat
===================================================================
--- trunk/ccm-ldn-navigation/debian/compat 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/compat 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1 @@
+4
Added: trunk/ccm-ldn-navigation/debian/config
===================================================================
--- trunk/ccm-ldn-navigation/debian/config 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/config 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: config,v 1.1.1.1 2004/11/12 09:30:14 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-ldn-navigation/debian/control
===================================================================
--- trunk/ccm-ldn-navigation/debian/control 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/control 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,21 @@
+Source: ccm-ldn-navigation
+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-cms, ccm-core, ccm-ldn-terms, ccm-ldn-util
+Standards-Version: 3.6.1
+
+Package: ccm-ldn-navigation
+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, ccm-ldn-util
+Description: APLAWS: Navigation application for building the navigation structure through published items.
+ This package contains the Navigation application for APLAWS.
+ .
+ FIXME: We need a longer and more meaningful description here.
+
+Package: ccm-ldn-navigation-doc
+Architecture: all
+Depends: ccm-tools
+Description: Documentation for ccm-ldn-navigation
+ Documentation for ccm-ldn-navigation. Provides the JavaDoc API documentation.
Added: trunk/ccm-ldn-navigation/debian/copyright
===================================================================
--- trunk/ccm-ldn-navigation/debian/copyright 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/copyright 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation/debian/postinst
===================================================================
--- trunk/ccm-ldn-navigation/debian/postinst 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/postinst 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,112 @@
+#! /bin/sh
+# postinst script for ccm-ldn-navigation
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postinst,v 1.1.1.1 2004/11/12 09:30:14 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-ldn-navigation/debian/postrm
===================================================================
--- trunk/ccm-ldn-navigation/debian/postrm 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/postrm 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,62 @@
+#! /bin/sh
+# postrm script for ccm-ldn-navigation
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: postrm,v 1.1.1.1 2004/11/12 09:30:14 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-ldn-navigation/debian/prerm
===================================================================
--- trunk/ccm-ldn-navigation/debian/prerm 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/prerm 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,60 @@
+#! /bin/sh
+# prerm script for ccm-ldn-navigation
+#
+# see: dh_installdeb(1)
+#
+# Author: Berkan Eskikaya <be...@ru...>, 2004
+#
+# $Id: prerm,v 1.1.1.1 2004/11/12 09:30:14 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-ldn-navigation/debian/rules
===================================================================
--- trunk/ccm-ldn-navigation/debian/rules 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/rules 2006-06-14 13:54:39 UTC (rev 1171)
@@ -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-ldn-navigation/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/ccm-ldn-navigation/debian/templates
===================================================================
--- trunk/ccm-ldn-navigation/debian/templates 2006-06-14 13:46:02 UTC (rev 1170)
+++ trunk/ccm-ldn-navigation/debian/templates 2006-06-14 13:54:39 UTC (rev 1171)
@@ -0,0 +1,207 @@
+Template: ccm/debconf/version
+Type: string
+Default: $Id: templates,v 1.1.1.1 2004/11/12 09:30:14 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:14 fabrice Exp $
+
+Template: ccm/package_name
+Type: string
+Default: ccm-ldn-navigation
+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:
..
|
