[Pkg-symfony-commits] [SCM] Propel repository to pkg-symfony project branch, master, updated. a4bdfe12d2e228d673e0e48e6405415224b80fd6

John Arevalo johnarevalo at gmail.com
Sun Apr 4 18:59:19 UTC 2010


The following commit has been merged in the master branch:
commit a4bdfe12d2e228d673e0e48e6405415224b80fd6
Author: John Arevalo <johnarevalo at gmail.com>
Date:   Sun Apr 4 13:58:33 2010 -0500

    deleted unused and build files. Changed creation symlinks to use dh_link task.changed absolute path in debian/rules file

diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index a76b62a..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-1.4-1
diff --git a/.pc/debian-changes-1.4-1/generator/bin/propel-gen b/.pc/debian-changes-1.4-1/generator/bin/propel-gen
deleted file mode 100755
index 11c929f..0000000
--- a/.pc/debian-changes-1.4-1/generator/bin/propel-gen
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Shell wrapper for Propel generator
-# $Id$
-#
-# This script will do the following:
-# - check for PHING_COMMAND env, if found, use it.
-#   - if not found assume php is on the path
-# - check for PROPEL_GEN_HOME evn, if found use it
-#   - if not look for it
-
-if [ -z "$PROPEL_GEN_HOME" ] ; then
-
-  # echo "WARNING: PROPEL_GEN_HOME environment not set. Attempting to guess."
-
-  # try to find Propel
-  if [ -d /opt/propel/generator ] ; then 
-    PROPEL_GEN_HOME=/opt/propel/generator
-  fi
-
-  if [ -d "${HOME}/opt/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="${HOME}/opt/propel/generator"
-  fi
-
-  if [ -d "/usr/local/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="/usr/local/propel/generator"
-  fi
-
-  if [ -d "${HOME}/usr/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="${HOME}/usr/propel/generator"
-  fi
-  
-  ## resolve links - $0 may be a link to phing's home
-  PRG="$0"
-  progname=`basename "$0"`
-  saveddir=`pwd`
-
-  # need this for relative symlinks
-  dirname_prg=`dirname "$PRG"`
-  cd "$dirname_prg"
-  
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-	PRG="$link"
-    else
-	PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-  
-  PROPEL_GEN_HOME=`dirname "$PRG"`/..
-
-  cd "$saveddir"
-
-  # make it fully qualified
-  PROPEL_GEN_HOME=`cd "$PROPEL_GEN_HOME" && pwd`
-  
-  # make it available in PHP via getenv("PROPEL_GEN_HOME")
-  export PROPEL_GEN_HOME
-fi
-
-if (test -z "$PHING_COMMAND") ; then
-	# echo "WARNING: PHING_COMMAND environment not set. (Assuming phing on PATH)"
-	export PHING_COMMAND="phing"
-fi
-
-$PHING_COMMAND -f $PROPEL_GEN_HOME/build.xml -Dusing.propel-gen=true -Dproject.dir=$*
diff --git a/debian/emacsen-install.ex b/debian/emacsen-install.ex
deleted file mode 100644
index 24b48c3..0000000
--- a/debian/emacsen-install.ex
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/propel
-
-# Written by Jim Van Zandt <jrv at debian.org>, borrowing heavily
-# from the install scripts for gettext by Santiago Vila
-# <sanvila at ctv.es> and octave by Dirk Eddelbuettel <edd at debian.org>.
-
-FLAVOR=$1
-PACKAGE=propel
-
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-#    SITEFLAG="-no-site-file"
-#else
-#    SITEFLAG="--no-site-file"
-#fi
-FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-# Install-info-altdir does not actually exist.
-# Maybe somebody will write it.
-if test -x /usr/sbin/install-info-altdir; then
-    echo install/${PACKAGE}: install Info links for ${FLAVOR}
-    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
-fi
-
-install -m 755 -d ${ELCDIR}
-cd ${ELDIR}
-FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
-cd ${ELCDIR}
-
-cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
-
-exit 0
diff --git a/debian/emacsen-remove.ex b/debian/emacsen-remove.ex
deleted file mode 100644
index 1cbe655..0000000
--- a/debian/emacsen-remove.ex
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/propel
-
-FLAVOR=$1
-PACKAGE=propel
-
-if [ ${FLAVOR} != emacs ]; then
-    if test -x /usr/sbin/install-info-altdir; then
-        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/propel.info.gz
-    fi
-
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff --git a/debian/emacsen-startup.ex b/debian/emacsen-startup.ex
deleted file mode 100644
index 813526a..0000000
--- a/debian/emacsen-startup.ex
+++ /dev/null
@@ -1,25 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50propel.el
-;; for the Debian propel package
-;;
-;; Originally contributed by Nils Naumann <naumann at unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd at debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv at debian.org>
-
-;; The propel package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...).  The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/propel")))
-;; If package-dir does not exist, the propel package must have
-;; removed but not purged, and we should skip the setup.
-  (when (file-directory-p package-dir)
-    (setq load-path (cons package-dir load-path))
-    (autoload 'propel-mode "propel-mode"
-      "Major mode for editing propel files." t)
-    (add-to-list 'auto-mode-alist '("\\.propel$" . propel-mode))))
-
diff --git a/debian/init.d.ex b/debian/init.d.ex
deleted file mode 100644
index b184fc5..0000000
--- a/debian/init.d.ex
+++ /dev/null
@@ -1,157 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian
-#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#               Further changes by Javier Fernandez-Sanguino <jfs at debian.org>
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/propel
-NAME=propel
-DESC=propel
-
-test -x $DAEMON || exit 0
-
-LOGDIR=/var/log/propel
-PIDFILE=/var/run/$NAME.pid
-DODTIME=1                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-# Include propel defaults if available
-if [ -f /etc/default/propel ] ; then
-    . /etc/default/propel
-fi
-
-set -e
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected child?
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $LABEL (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
-}
-
-case "$1" in
-  start)
-        echo -n "Starting $DESC: "
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-            --exec $DAEMON -- $DAEMON_OPTS
-        if running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-        ;;
-  stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-            --exec $DAEMON
-        echo "$NAME."
-        ;;
-  force-stop)
-        echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-        ;;
-  #reload)
-        #
-        # If the daemon can reload its config files on the fly
-        # for example by sending it SIGHUP, do it here.
-        #
-        # If the daemon responds to changes in its config file
-        # directly anyway, make this a do-nothing entry.
-        #
-        # echo "Reloading $DESC configuration files."
-        # start-stop-daemon --stop --signal 1 --quiet --pidfile \
-        #       /var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-        #
-        # If the "reload" option is implemented, move the "force-reload"
-        # option to the "reload" entry above. If not, "force-reload" is
-        # just the same as "restart" except that it does nothing if the
-        # daemon isn't already running.
-        # check wether $DAEMON is running. If so, restart
-        start-stop-daemon --stop --test --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON \
-            && $0 restart \
-            || exit 0
-        ;;
-  restart)
-    echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON
-        [ -n "$DODTIME" ] && sleep $DODTIME
-        start-stop-daemon --start --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-        echo "$NAME."
-        ;;
-  status)
-    echo -n "$LABEL is "
-    if running ;  then
-        echo "running"
-    else
-        echo " not running."
-        exit 1
-    fi
-    ;;
-  *)
-    N=/etc/init.d/$NAME
-    # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-    echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/debian/init.d.lsb.ex b/debian/init.d.lsb.ex
deleted file mode 100644
index 4ec515b..0000000
--- a/debian/init.d.lsb.ex
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/bin/sh
-#
-# Example init.d script with LSB support.
-#
-# Please read this init.d carefully and modify the sections to
-# adjust it to the program you want to run.
-#
-# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs at debian.org>
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL;  if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-#
-### BEGIN INIT INFO
-# Provides:          propel
-# Required-Start:    $network $local_fs
-# Required-Stop:
-# Should-Start:      $named
-# Should-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: <Enter a short description of the sortware>
-# Description:       <Enter a long description of the software>
-#                    <...>
-#                    <...>
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/sbin/propel # Introduce the server's location here
-NAME=propel             # Introduce the short server's name here
-DESC=propel             # Introduce a short description here
-LOGDIR=/var/log/propel  # Log directory to use
-
-PIDFILE=/var/run/$NAME.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-# Default options, these can be overriden by the information
-# at /etc/default/$NAME
-DAEMON_OPTS=""          # Additional options given to the server
-
-DIETIME=10              # Time to wait for the server to die, in seconds
-                        # If this value is set too low you might not
-                        # let some servers to die gracefully and
-                        # 'restart' will not work
-
-#STARTTIME=2             # Time to wait for the server to start, in seconds
-                        # If this value is set each time the server is
-                        # started (on start or restart) the script will
-                        # stall to try to determine if it is running
-                        # If it is not set and the server takes time
-                        # to setup a pid file the log message might
-                        # be a false positive (says it did not start
-                        # when it actually did)
-
-LOGFILE=$LOGDIR/$NAME.log  # Server logfile
-#DAEMONUSER=propel   # Users to run the daemons as. If this value
-                        # is set start-stop-daemon will chuid the server
-
-# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
-    . /etc/default/$NAME
-fi
-
-# Use this if you want the user to explicitly set 'RUN' in
-# /etc/default/
-#if [ "x$RUN" != "xyes" ] ; then
-#    log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
-#    log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
-#    exit 0
-#fi
-
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -n "$DAEMONUSER" ] ; then
-    if getent passwd | grep -q "^$DAEMONUSER:"; then
-        # Obtain the uid and gid
-        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
-        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
-    else
-        log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
-        exit 0
-    fi
-fi
-
-
-set -e
-
-running_pid() {
-# Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected server
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running() {
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-start_server() {
-# Start the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
-            start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
-            errcode=$?
-        else
-# if we are using a daemonuser then change the user id
-            start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                        --chuid $DAEMONUSER \
-                        --exec $DAEMON -- $DAEMON_OPTS
-            errcode=$?
-        fi
-        return $errcode
-}
-
-stop_server() {
-# Stop the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
-            killproc -p $PIDFILE $DAEMON
-            errcode=$?
-        else
-# if we are using a daemonuser then look for process that match
-            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --user $DAEMONUSER \
-                        --exec $DAEMON
-            errcode=$?
-        fi
-
-        return $errcode
-}
-
-reload_server() {
-    [ ! -f "$PIDFILE" ] && return 1
-    pid=pidofproc $PIDFILE # This is the daemon's pid
-    # Send a SIGHUP
-    kill -1 $pid
-    return $?
-}
-
-force_stop() {
-# Force the process to die killing it manually
-    [ ! -e "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        sleep "$DIETIME"s
-        if running ; then
-            kill -9 $pid
-            sleep "$DIETIME"s
-            if running ; then
-                echo "Cannot kill $NAME (pid=$pid)!"
-                exit 0
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-}
-
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC " "$NAME"
-        # Check if it's running first
-        if running ;  then
-            log_progress_msg "apparently already running"
-            log_end_msg 0
-            exit 0
-        fi
-        if start_server ; then
-            # NOTE: Some servers might die some time after they start,
-            # this code will detect this issue if STARTTIME is set
-            # to a reasonable value
-            [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
-            if  running ;  then
-                # It's ok, the server started and is running
-                log_end_msg 0
-            else
-                # It is not running after we did start
-                log_end_msg 1
-            fi
-        else
-            # Either we could not start it
-            log_end_msg 1
-        fi
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        if running ; then
-            # Only stop the server if we see it running
-            errcode=0
-            stop_server || errcode=$?
-            log_end_msg $errcode
-        else
-            # If it's not running don't do anything
-            log_progress_msg "apparently not running"
-            log_end_msg 0
-            exit 0
-        fi
-        ;;
-  force-stop)
-        # First try to stop gracefully the program
-        $0 stop
-        if running; then
-            # If it's still running try to kill it more forcefully
-            log_daemon_msg "Stopping (force) $DESC" "$NAME"
-            errcode=0
-            force_stop || errcode=$?
-            log_end_msg $errcode
-        fi
-        ;;
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        errcode=0
-        stop_server || errcode=$?
-        # Wait some sensible amount, some server need this
-        [ -n "$DIETIME" ] && sleep $DIETIME
-        start_server || errcode=$?
-        [ -n "$STARTTIME" ] && sleep $STARTTIME
-        running || errcode=$?
-        log_end_msg $errcode
-        ;;
-  status)
-
-        log_daemon_msg "Checking status of $DESC" "$NAME"
-        if running ;  then
-            log_progress_msg "running"
-            log_end_msg 0
-        else
-            log_progress_msg "apparently not running"
-            log_end_msg 1
-            exit 0
-        fi
-        ;;
-  # Use this if the daemon cannot reload
-  reload)
-        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
-        log_warning_msg "cannot re-read the config file (use restart)."
-        ;;
-  # And this if it cann
-  #reload)
-          #
-          # If the daemon can reload its config files on the fly
-          # for example by sending it SIGHUP, do it here.
-          #
-          # If the daemon responds to changes in its config file
-          # directly anyway, make this a do-nothing entry.
-          #
-          # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-          # if running ; then
-          #    reload_server
-          #    if ! running ;  then
-          # Process died after we tried to reload
-          #       log_progress_msg "died on reload"
-          #       log_end_msg 1
-          #       exit 0
-          #    fi
-          # else
-          #    log_progress_msg "server is not running"
-          #    log_end_msg 1
-          #    exit 0
-          # fi
-                                                                                    #;;
-
-  *)
-        N=/etc/init.d/$NAME
-        echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/debian/docs b/debian/links
similarity index 100%
copy from debian/docs
copy to debian/links
diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex
deleted file mode 100644
index 310c8f8..0000000
--- a/debian/manpage.1.ex
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PROPEL SECTION "April  1, 2010"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-propel \- program to do something
-.SH SYNOPSIS
-.B propel
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B propel
-and
-.B bar
-commands.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBpropel\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-propel was written by <upstream author>.
-.PP
-This manual page was written by John Arevalo <johnarevalo at gmail.com>,
-for the Debian project (and may be used by others).
diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex
deleted file mode 100644
index b38260b..0000000
--- a/debian/manpage.sgml.ex
+++ /dev/null
@@ -1,154 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>April  1, 2010</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>johnarevalo at gmail.com</email>">
-  <!ENTITY dhusername  "John Arevalo">
-  <!ENTITY dhucpackage "<refentrytitle>PROPEL</refentrytitle>">
-  <!ENTITY dhpackage   "propel">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (and may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any
-      later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex
deleted file mode 100644
index 7cac1e9..0000000
--- a/debian/manpage.xml.ex
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-
-<!--
-
-`xsltproc -''-nonet \
-          -''-param man.charmap.use.subset "0" \
-          -''-param make.year.ranges "1" \
-          -''-param make.single.year.ranges "1" \
-          /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
-          manpage.xml'
-
-A manual page <package>.<section> will be generated. You may view the
-manual page with: nroff -man <package>.<section> | less'. A typical entry
-in a Makefile or Makefile.am is:
-
-DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
-
-manpage.1: manpage.xml
-        $(XP) $(DB2MAN) $<
-
-The xsltproc binary is found in the xsltproc package. The XSL files are in
-docbook-xsl. A description of the parameters you can use can be found in the
-docbook-xsl-doc-* packages. Please remember that if you create the nroff
-version in one of the debian/rules file targets (such as build), you will need
-to include xsltproc and docbook-xsl in your Build-Depends control field.
-Alternatively use the xmlto command/package. That will also automatically
-pull in xsltproc and docbook-xsl.
-
-Notes for using docbook2x: docbook2x-man does not automatically create the
-AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as
-<refsect1> ... </refsect1>.
-
-To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections
-read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be
-found in the docbook-xsl-doc-html package.
-
-Validation can be done using: `xmllint -''-noout -''-valid manpage.xml`
-
-General documentation about man-pages and man-page-formatting:
-man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "FIRSTNAME">
-  <!ENTITY dhsurname   "SURNAME">
-  <!-- dhusername could also be set to "&dhfirstname; &dhsurname;". -->
-  <!ENTITY dhusername  "John Arevalo">
-  <!ENTITY dhemail     "johnarevalo at gmail.com">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1) and
-       http://www.tldp.org/HOWTO/Man-Page/q2.html. -->
-  <!ENTITY dhsection   "SECTION">
-  <!-- TITLE should be something like "User commands" or similar (see
-       http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
-  <!ENTITY dhtitle     "propel User Manual">
-  <!ENTITY dhucpackage "PROPEL">
-  <!ENTITY dhpackage   "propel">
-]>
-
-<refentry>
-  <refentryinfo>
-    <title>&dhtitle;</title>
-    <productname>&dhpackage;</productname>
-    <authorgroup>
-      <author>
-       <firstname>&dhfirstname;</firstname>
-        <surname>&dhsurname;</surname>
-        <contrib>Wrote this manpage for the Debian system.</contrib>
-        <address>
-          <email>&dhemail;</email>
-        </address>
-      </author>
-    </authorgroup>
-    <copyright>
-      <year>2007</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    <legalnotice>
-      <para>This manual page was written for the Debian system
-        (and may be used by others).</para>
-      <para>Permission is granted to copy, distribute and/or modify this
-        document under the terms of the GNU General Public License,
-        Version 2 or (at your option) any later version published by
-        the Free Software Foundation.</para>
-      <para>On Debian systems, the complete text of the GNU General Public
-        License can be found in
-        <filename>/usr/share/common-licenses/GPL</filename>.</para>
-    </legalnotice>
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>&dhucpackage;</refentrytitle>
-    <manvolnum>&dhsection;</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <!-- These are several examples, how syntaxes could look -->
-      <arg choice="plain"><option>-e <replaceable>this</replaceable></option></arg>
-      <arg choice="opt"><option>--example=<parameter>that</parameter></option></arg>
-      <arg choice="opt">
-        <group choice="req">
-          <arg choice="plain"><option>-e</option></arg>
-          <arg choice="plain"><option>--example</option></arg>
-        </group>
-        <replaceable class="option">this</replaceable>
-      </arg>
-      <arg choice="opt">
-        <group choice="req">
-          <arg choice="plain"><option>-e</option></arg>
-          <arg choice="plain"><option>--example</option></arg>
-        </group>
-        <group choice="req">
-          <arg choice="plain"><replaceable>this</replaceable></arg>
-          <arg choice="plain"><replaceable>that</replaceable></arg>
-        </group>
-      </arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <!-- Normally the help and version options make the programs stop
-           right after outputting the requested information. -->
-      <group choice="opt">
-        <arg choice="plain">
-          <group choice="req">
-            <arg choice="plain"><option>-h</option></arg>
-            <arg choice="plain"><option>--help</option></arg>
-          </group>
-        </arg>
-        <arg choice="plain">
-          <group choice="req">
-            <arg choice="plain"><option>-v</option></arg>
-            <arg choice="plain"><option>--version</option></arg>
-          </group>
-        </arg>
-      </group>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1 id="description">
-    <title>DESCRIPTION</title>
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-    <para>This manual page was written for the Debian distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the GNU <citerefentry>
-        <refentrytitle>info</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry> format; see below.</para>
-    <para><command>&dhpackage;</command> is a program that...</para>
-  </refsect1>
-  <refsect1 id="options">
-    <title>OPTIONS</title>
-    <para>The program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <citerefentry>
-        <refentrytitle>info</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry> files.</para>
-    <variablelist>
-      <!-- Use the variablelist.term.separator and the
-           variablelist.term.break.after parameters to
-           control the term elements. -->
-      <varlistentry>
-        <term><option>-e <replaceable>this</replaceable></option></term>
-        <term><option>--example=<replaceable>that</replaceable></option></term>
-        <listitem>
-          <para>Does this and that.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option></term>
-        <term><option>--help</option></term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option></term>
-        <term><option>--version</option></term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1 id="files">
-    <title>FILES</title>
-    <variablelist>
-      <varlistentry>
-        <term><filename>/etc/foo.conf</filename></term>
-        <listitem>
-          <para>The system-wide configuration file to control the
-            behaviour of <application>&dhpackage;</application>. See
-            <citerefentry>
-              <refentrytitle>foo.conf</refentrytitle>
-              <manvolnum>5</manvolnum>
-            </citerefentry> for further details.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><filename>${HOME}/.foo.conf</filename></term>
-        <listitem>
-          <para>The per-user configuration file to control the
-             behaviour of <application>&dhpackage;</application>. See
-             <citerefentry>
-               <refentrytitle>foo.conf</refentrytitle>
-               <manvolnum>5</manvolnum>
-             </citerefentry> for further details.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1 id="environment">
-    <title>ENVIONMENT</title>
-    <variablelist>
-      <varlistentry>
-        <term><envar>FOO_CONF</envar></term>
-        <listitem>
-          <para>If used, the defined file is used as configuration
-            file (see also <xref linkend="files"/>).</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1 id="diagnostics">
-    <title>DIAGNOSTICS</title>
-    <para>The following diagnostics may be issued
-      on <filename class="devicefile">stderr</filename>:</para>
-    <variablelist>
-      <varlistentry>
-        <term><errortext>Bad configuration file. Exiting.</errortext></term>
-        <listitem>
-          <para>The configuration file seems to contain a broken configuration
-            line. Use the <option>--verbose</option> option, to get more info.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <para><command>&dhpackage;</command> provides some return codes, that can
-      be used in scripts:</para>
-    <segmentedlist>
-      <segtitle>Code</segtitle>
-      <segtitle>Diagnostic</segtitle>
-      <seglistitem>
-        <seg><errorcode>0</errorcode></seg>
-        <seg>Program exited successfully.</seg>
-      </seglistitem>
-      <seglistitem>
-        <seg><errorcode>1</errorcode></seg>
-        <seg>The configuration file seems to be broken.</seg>
-      </seglistitem>
-    </segmentedlist>
-  </refsect1>
-  <refsect1 id="bugs">
-    <!-- Or use this section to tell about upstream BTS. -->
-    <title>BUGS</title>
-    <para>The program is currently limited to only work
-      with the <package>foobar</package> library.</para>
-    <para>The upstreams <acronym>BTS</acronym> can be found
-      at <ulink url="http://bugzilla.foo.tld"/>.</para>
-  </refsect1>
-  <refsect1 id="see_also">
-    <title>SEE ALSO</title>
-    <!-- In alpabetical order. -->
-    <para><citerefentry>
-        <refentrytitle>bar</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry>, <citerefentry>
-        <refentrytitle>baz</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry>, <citerefentry>
-        <refentrytitle>foo.conf</refentrytitle>
-        <manvolnum>5</manvolnum>
-      </citerefentry></para>
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the <citerefentry>
-        <refentrytitle>info</refentrytitle>
-        <manvolnum>1</manvolnum>
-      </citerefentry> system.</para>
-  </refsect1>
-</refentry>
-
diff --git a/debian/menu.ex b/debian/menu.ex
deleted file mode 100644
index 28ba16d..0000000
--- a/debian/menu.ex
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(propel):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
-  title="propel" command="/usr/bin/propel"
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 359cf78..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# postinst script for propel
-
-set -e
-
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
-    ln -s /usr/share/php/propel/generator/bin/propel-gen /usr/bin/propel-gen 
-fi
-
-#DEBHELPER#
-exit 0
diff --git a/debian/postrm.ex b/debian/postrm.ex
deleted file mode 100644
index 57796ca..0000000
--- a/debian/postrm.ex
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# postrm script for propel
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm 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
diff --git a/debian/preinst.ex b/debian/preinst.ex
deleted file mode 100644
index c3138e4..0000000
--- a/debian/preinst.ex
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# preinst script for propel
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst 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
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644
index 4e4c2cf..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# prerm script for propel
-
-set -e
-
-if [ "$1" != "upgrade" ]; then
-        rm /usr/bin/propel-gen 
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/propel.cron.d.ex b/debian/propel.cron.d.ex
deleted file mode 100644
index 523744b..0000000
--- a/debian/propel.cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the propel package
-#
-0 4	* * *	root	[ -x /usr/bin/propel_maintenance ] && /usr/bin/propel_maintenance
diff --git a/debian/propel.default.ex b/debian/propel.default.ex
deleted file mode 100644
index fa8f9a4..0000000
--- a/debian/propel.default.ex
+++ /dev/null
@@ -1,10 +0,0 @@
-# Defaults for propel initscript
-# sourced by /etc/init.d/propel
-# installed at /etc/default/propel by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
diff --git a/debian/propel.doc-base.EX b/debian/propel.doc-base.EX
deleted file mode 100644
index 5e2346f..0000000
--- a/debian/propel.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: propel
-Title: Debian propel Manual
-Author: <insert document author here>
-Abstract: This manual describes what propel is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/propel/propel.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/propel/propel.ps.gz
-
-Format: text
-Files: /usr/share/doc/propel/propel.text.gz
-
-Format: HTML
-Index: /usr/share/doc/propel/html/index.html
-Files: /usr/share/doc/propel/html/*.html
diff --git a/debian/propel/DEBIAN/control b/debian/propel/DEBIAN/control
deleted file mode 100644
index 3f721b7..0000000
--- a/debian/propel/DEBIAN/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: propel
-Version: 1.4-1
-Architecture: all
-Maintainer: Debian Symfony Maintainers <pkg-symfony-maint at lists.alioth.debian.org>
-Installed-Size: 5728
-Depends: php5, php5-cli, php5-xsl, phing
-Section: php
-Priority: optional
-Homepage: http://propel.phpdb.org/
-Description: open-source Object-Relational Mapping (ORM) library written in PHP5
- allows access to database using a set of objects,
- providing a simple API for storing and retrieving
- data. Work with databases in the same way work
- with other classes and objects in PHP.
diff --git a/debian/propel/DEBIAN/md5sums b/debian/propel/DEBIAN/md5sums
deleted file mode 100644
index 58a45f5..0000000
--- a/debian/propel/DEBIAN/md5sums
+++ /dev/null
@@ -1,540 +0,0 @@
-5cab23fbc522041aa408842e0a0c6278  usr/share/php/propel/runtime/classes/propel/util/BasePeer.php
-ffdb937bd51a8b29d24e52b3fac446a0  usr/share/php/propel/runtime/classes/propel/util/PropelConfigurationIterator.php
-b28899ba722654354d26801303f9d2a7  usr/share/php/propel/runtime/classes/propel/util/DebugPDO.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/PropelConfiguration.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/Join.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/DebugPDO.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/DebugPDOStatement.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/PropelDateTime.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/NodePeer.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/PropelColumnTypes.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/PropelPager.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/Criteria.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/PropelPDO.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/BasePeer.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/util/.svn/prop-base/PropelConfigurationIterator.php.svn-base
-271cd2f7ad9d8bdfac00faaf9690cf07  usr/share/php/propel/runtime/classes/propel/util/.svn/all-wcprops
-fb727ec6ab64c41a7721b0115e33b50e  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/PropelConfiguration.php.svn-base
-e679271d6e960f2bff02960c7459c7f7  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/Join.php.svn-base
-8e89bd8c2f799865a6df3425c42dfd09  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/DebugPDO.php.svn-base
-81f2e1feb25469370af10f5183258d0f  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/DebugPDOStatement.php.svn-base
-5c3158baf82b03e9405d5405f96f981f  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/PropelDateTime.php.svn-base
-75e5c11a9d639ff74325dab6686715a1  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/NodePeer.php.svn-base
-d6bdfc3340ad646ddabff3a45933cf98  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/PropelColumnTypes.php.svn-base
-af87680f0e4b9763ff5fb4d3cd8ab4b6  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/PropelPager.php.svn-base
-473a7f1cea8ae7d88ba9295dd02eeff7  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/Criteria.php.svn-base
-d8fa32ba3101557bf4e3287789c1f6ae  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/PropelPDO.php.svn-base
-2f9b86494f8a83c8b4f1a6fb39c2e9c4  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/BasePeer.php.svn-base
-dc3e63075371f5f3c7b22e3365c774ac  usr/share/php/propel/runtime/classes/propel/util/.svn/text-base/PropelConfigurationIterator.php.svn-base
-1a598564e8371d53c23376ebaf17fe63  usr/share/php/propel/runtime/classes/propel/util/.svn/entries
-126101530fa6d67a93252c85bd5b2bf3  usr/share/php/propel/runtime/classes/propel/util/PropelPDO.php
-4be265bcfd822b408a2ce1538caa38b4  usr/share/php/propel/runtime/classes/propel/util/PropelPager.php
-7b364ab23b44d959106386fa29244f5e  usr/share/php/propel/runtime/classes/propel/util/PropelColumnTypes.php
-e45fd168f2e88f22d6c0c76892023412  usr/share/php/propel/runtime/classes/propel/util/PropelConfiguration.php
-a2f20e24077de3210c255e100c90c938  usr/share/php/propel/runtime/classes/propel/util/PropelDateTime.php
-766638ca9c516dfd0468bfd5c65f08af  usr/share/php/propel/runtime/classes/propel/util/NodePeer.php
-e679271d6e960f2bff02960c7459c7f7  usr/share/php/propel/runtime/classes/propel/util/Join.php
-95000d1de1b2835bab7e063b3d72d1cf  usr/share/php/propel/runtime/classes/propel/util/Criteria.php
-16ba949700cd1528aa0f118d0e3b0a90  usr/share/php/propel/runtime/classes/propel/util/DebugPDOStatement.php
-5949d1a62260953ac287423b201369dd  usr/share/php/propel/runtime/classes/propel/Propel.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/logger/.svn/prop-base/BasicLogger.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/logger/.svn/prop-base/MojaviLogAdapter.php.svn-base
-a792a1a999d2dc113b555903030d03f4  usr/share/php/propel/runtime/classes/propel/logger/.svn/all-wcprops
-2539bd69783d0429d0926ea8446c9ac2  usr/share/php/propel/runtime/classes/propel/logger/.svn/text-base/BasicLogger.php.svn-base
-90ab15980966390e0459fadec6484022  usr/share/php/propel/runtime/classes/propel/logger/.svn/text-base/MojaviLogAdapter.php.svn-base
-29518d71a17effb54487c5c6635a470e  usr/share/php/propel/runtime/classes/propel/logger/.svn/entries
-b1184c103e0c999c24296cef00ce6b3b  usr/share/php/propel/runtime/classes/propel/logger/MojaviLogAdapter.php
-27ba2e05d4a39757dc58b1a97cbd9c7a  usr/share/php/propel/runtime/classes/propel/logger/BasicLogger.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/.svn/prop-base/Propel.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/.svn/prop-base/PropelException.php.svn-base
-0cfdf4a1360bc80ecbeb38ee6de6687b  usr/share/php/propel/runtime/classes/propel/.svn/all-wcprops
-feb89d0edb89dc66cde90aaf5117e6fb  usr/share/php/propel/runtime/classes/propel/.svn/text-base/Propel.php.svn-base
-8fba5e85cc812ca3b0e0e4d0f54b3be6  usr/share/php/propel/runtime/classes/propel/.svn/text-base/PropelException.php.svn-base
-e98dc6c43e4f43d6014b3d0a3eb108d8  usr/share/php/propel/runtime/classes/propel/.svn/entries
-6d7f10968737dfa6b141116f5f1ca42c  usr/share/php/propel/runtime/classes/propel/PropelException.php
-725ecbe26d1676b61a7c1080fb854cc7  usr/share/php/propel/runtime/classes/propel/adapter/DBPostgres.php
-8da545b7f2a1e76509bbef75ba175426  usr/share/php/propel/runtime/classes/propel/adapter/DBMySQL.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBMySQL.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBSQLite.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBPostgres.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBNone.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBOracle.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBAdapter.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/adapter/.svn/prop-base/DBMSSQL.php.svn-base
-10e5fc35432a45b589694780b7c32051  usr/share/php/propel/runtime/classes/propel/adapter/.svn/all-wcprops
-ae4792e7e4cd564750548afe80ef90c0  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBMySQL.php.svn-base
-db1f777ef1b7837db4189147b95dd753  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBSQLite.php.svn-base
-9e6239cc8484351cb01c66ed82381045  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBPostgres.php.svn-base
-ae09d03db75cf0d161601aa194f47701  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBNone.php.svn-base
-a264080852156b9049baa0d7bac543ee  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBOracle.php.svn-base
-c8b9fba1dc4c4d4bc2b5ec02423a3293  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBAdapter.php.svn-base
-5cd0b6e09864fda6519885edf4a39f86  usr/share/php/propel/runtime/classes/propel/adapter/.svn/text-base/DBMSSQL.php.svn-base
-1b90739eac681b5b677c9705cf31aaba  usr/share/php/propel/runtime/classes/propel/adapter/.svn/entries
-3d973dadec6d9c32cadd005bfb31104d  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDebugPDO.php
-766e4c2e9f5e004ee4848fd8de0cca17  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDateTime.class.php
-c671639beacaec0da602fb10da25ed07  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlPropelPDO.php
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/prop-base/MssqlPropelPDO.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/prop-base/MssqlDateTime.class.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/prop-base/MssqlDebugPDO.php.svn-base
-cbca05f258cb0054519e4a587f07a572  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/all-wcprops
-c671639beacaec0da602fb10da25ed07  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/text-base/MssqlPropelPDO.php.svn-base
-766e4c2e9f5e004ee4848fd8de0cca17  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/text-base/MssqlDateTime.class.php.svn-base
-3d973dadec6d9c32cadd005bfb31104d  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/text-base/MssqlDebugPDO.php.svn-base
-d5347666ef8e12133b573a3f49188836  usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/.svn/entries
-37bf91d7f454a7566fadad640036a426  usr/share/php/propel/runtime/classes/propel/adapter/DBNone.php
-e568b1d27326ffd0a7162b5cd72c3391  usr/share/php/propel/runtime/classes/propel/adapter/DBMSSQL.php
-91cb6f58a235106a1d3af23491546747  usr/share/php/propel/runtime/classes/propel/adapter/DBOracle.php
-085225c744b0715281b35b6cf98b605b  usr/share/php/propel/runtime/classes/propel/adapter/DBAdapter.php
-3cac713edb1417f92810027e57780390  usr/share/php/propel/runtime/classes/propel/adapter/DBSQLite.php
-221d8bfcbcf15f956617f32e56f9a921  usr/share/php/propel/runtime/classes/propel/validator/ValidValuesValidator.php
-eb456fae96bb6e568184f6b91eca2f67  usr/share/php/propel/runtime/classes/propel/validator/MaxLengthValidator.php
-baa64b1ad9448192f974f724662f499f  usr/share/php/propel/runtime/classes/propel/validator/RequiredValidator.php
-a995cd8862b48c4a3badb8fc465cd9f3  usr/share/php/propel/runtime/classes/propel/validator/MaxValueValidator.php
-c917e348795f6d460ac78721bdf6b738  usr/share/php/propel/runtime/classes/propel/validator/NotMatchValidator.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/MinValueValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/UniqueValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/MaxValueValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/MaxLengthValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/RequiredValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/MatchValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/ValidValuesValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/ValidationFailed.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/TypeValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/BasicValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/MinLengthValidator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/validator/.svn/prop-base/NotMatchValidator.php.svn-base
-427893d2de80e6a4b86792c7964b90d9  usr/share/php/propel/runtime/classes/propel/validator/.svn/all-wcprops
-7cd086ee0626aeeaea2fdb91c9a447ba  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/MinValueValidator.php.svn-base
-1b88a1f4e2bdfc2c7337d8a8b62c4032  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/UniqueValidator.php.svn-base
-be20082b36c15ce60e9d12f4699edc65  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/MaxValueValidator.php.svn-base
-f764802bd01c9f6e614e88035556b65a  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/MaxLengthValidator.php.svn-base
-15773ad1a31ec6251a53203bde1fdd6e  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/RequiredValidator.php.svn-base
-62387281418dc6eaece57d02a8b0abd1  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/MatchValidator.php.svn-base
-75ccd8ca9415cbce395ff87cce59543c  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/ValidValuesValidator.php.svn-base
-650666edce16fcaa02935bc6b1764f76  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/ValidationFailed.php.svn-base
-616368c500786fb3ef5b54d2cc729fb0  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/TypeValidator.php.svn-base
-60c19d562bb1d12b9a64cd72efccfb13  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/BasicValidator.php.svn-base
-d3de9a34aeb5595d96fd72176d696e0b  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/MinLengthValidator.php.svn-base
-b88ecaf8a6d17fe837b26781cdf92c7c  usr/share/php/propel/runtime/classes/propel/validator/.svn/text-base/NotMatchValidator.php.svn-base
-1d2d8be1069ddc5161e29bf8f7a4fa17  usr/share/php/propel/runtime/classes/propel/validator/.svn/entries
-1752f1877be66d01c5c5fa8e47341120  usr/share/php/propel/runtime/classes/propel/validator/MinValueValidator.php
-c208a63f60bca55c42d2f1dffff5d7be  usr/share/php/propel/runtime/classes/propel/validator/MatchValidator.php
-cb763e1a1cc674823a7fbfaca78d490d  usr/share/php/propel/runtime/classes/propel/validator/ValidationFailed.php
-36ab2ad49999686a94b1b4be569cb79b  usr/share/php/propel/runtime/classes/propel/validator/UniqueValidator.php
-19194d88d0fcf795f653f1ae095bbf6c  usr/share/php/propel/runtime/classes/propel/validator/MinLengthValidator.php
-744b2e966dea7b3bdca72a5dac797f35  usr/share/php/propel/runtime/classes/propel/validator/BasicValidator.php
-2df80e013d70bd5af85f20181babc434  usr/share/php/propel/runtime/classes/propel/validator/TypeValidator.php
-3182fa8920cc6c89848e6354298f3680  usr/share/php/propel/runtime/classes/propel/map/DatabaseMap.php
-26b9eeb8c18bde26fa381ac5394117d2  usr/share/php/propel/runtime/classes/propel/map/ColumnMap.php
-8dde67cf6d4bf0240fbe489f6aca04a0  usr/share/php/propel/runtime/classes/propel/map/RelationMap.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/map/.svn/prop-base/DatabaseMap.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/map/.svn/prop-base/ColumnMap.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/map/.svn/prop-base/TableMap.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/map/.svn/prop-base/ValidatorMap.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/runtime/classes/propel/map/.svn/prop-base/RelationMap.php.svn-base
-fb673b35ac59c587b40b393c41fc1c15  usr/share/php/propel/runtime/classes/propel/map/.svn/all-wcprops
-b9a9ded2e3bda0c4a6e983f28001584d  usr/share/php/propel/runtime/classes/propel/map/.svn/text-base/DatabaseMap.php.svn-base
-5e244d33009eea0d7e5b63bcef8d2002  usr/share/php/propel/runtime/classes/propel/map/.svn/text-base/ColumnMap.php.svn-base
-9fab415f5535e50abcbae6481a7be51d  usr/share/php/propel/runtime/classes/propel/map/.svn/text-base/TableMap.php.svn-base
-956f36d582cb60d32e3e51454f59d8ac  usr/share/php/propel/runtime/classes/propel/map/.svn/text-base/ValidatorMap.php.svn-base
-8dde67cf6d4bf0240fbe489f6aca04a0  usr/share/php/propel/runtime/classes/propel/map/.svn/text-base/RelationMap.php.svn-base
-ed9d4a3d127933ea3646392c5cfef927  usr/share/php/propel/runtime/classes/propel/map/.svn/entries
-dc55f486fecce77101eb8c1a735f5d81  usr/share/php/propel/runtime/classes/propel/map/ValidatorMap.php
-e691e371cd031777cc6976b34aa59959  usr/share/php/propel/runtime/classes/propel/map/TableMap.php
-5f9d95833b1ebe172ceffb421f56e69f  usr/share/php/propel/runtime/classes/propel/om/NodeObject.php
-525cbc35b4c085de74527fb438da95e5  usr/share/php/propel/runtime/classes/propel/om/BaseObject.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/om/.svn/prop-base/BaseObject.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/om/.svn/prop-base/PreOrderNodeIterator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/om/.svn/prop-base/NestedSetRecursiveIterator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/om/.svn/prop-base/Persistent.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/runtime/classes/propel/om/.svn/prop-base/NodeObject.php.svn-base
-9801921569a0cefec66c511cff454893  usr/share/php/propel/runtime/classes/propel/om/.svn/all-wcprops
-7ca7772da246cc34fdf6228e1760a2e2  usr/share/php/propel/runtime/classes/propel/om/.svn/text-base/BaseObject.php.svn-base
-0bbc49e6f7474a6bd9ae89e43a86bf9c  usr/share/php/propel/runtime/classes/propel/om/.svn/text-base/PreOrderNodeIterator.php.svn-base
-33fd7af64361b9f266fd6cd403d5ee72  usr/share/php/propel/runtime/classes/propel/om/.svn/text-base/NestedSetRecursiveIterator.php.svn-base
-2ff527372e9316f1a9926a4f29ce7cdc  usr/share/php/propel/runtime/classes/propel/om/.svn/text-base/Persistent.php.svn-base
-c7cfa75b58299a170f2ed876c0b172c3  usr/share/php/propel/runtime/classes/propel/om/.svn/text-base/NodeObject.php.svn-base
-07b5b6c14869b39cf384dd25f8afd2e6  usr/share/php/propel/runtime/classes/propel/om/.svn/entries
-a39f791da3fd85e36cf57c3237cb7d61  usr/share/php/propel/runtime/classes/propel/om/Persistent.php
-325a5005a96061895a02d51ed2e068a0  usr/share/php/propel/runtime/classes/propel/om/PreOrderNodeIterator.php
-5e6e3dbc61834dad7311f7d7e385d1cf  usr/share/php/propel/runtime/classes/propel/om/NestedSetRecursiveIterator.php
-0aa9eabffdf91cf0372423cd49997f49  usr/share/php/propel/runtime/classes/.svn/all-wcprops
-ef7188ef7600a3a81c872325ac6a94de  usr/share/php/propel/runtime/classes/.svn/entries
-4c3521264fd8a56420035078d4368bf7  usr/share/php/propel/runtime/pear/build-pear-package.xml
-bf9347059052e6b81eb4778cb6c1c65f  usr/share/php/propel/runtime/pear/.svn/prop-base/build-pear-package.xml.svn-base
-bf9347059052e6b81eb4778cb6c1c65f  usr/share/php/propel/runtime/pear/.svn/prop-base/BuildPropelPEARPackageTask.php.svn-base
-3d31c116f3b7563a9bbb0699521ecca2  usr/share/php/propel/runtime/pear/.svn/all-wcprops
-4c3521264fd8a56420035078d4368bf7  usr/share/php/propel/runtime/pear/.svn/text-base/build-pear-package.xml.svn-base
-1ea015e3211c4face00207a438693e60  usr/share/php/propel/runtime/pear/.svn/text-base/BuildPropelPEARPackageTask.php.svn-base
-3c6d6cc6ae1a453b4e3e840c325d5932  usr/share/php/propel/runtime/pear/.svn/entries
-f04a7811a4105e2e7bc51c047f46ec66  usr/share/php/propel/runtime/pear/BuildPropelPEARPackageTask.php
-3a4d6052c569c17b2cf1fc5babb3612c  usr/share/php/propel/generator/default.properties
-a7edf6f1ec30d6fbf13a7c667526182a  usr/share/php/propel/generator/build-propel.xml
-73a110a56283ba9fdaafa2b09b0baf4d  usr/share/php/propel/generator/build.properties-sample
-03f7b2153051daeaf41231f19ca27512  usr/share/php/propel/generator/build.xml
-4160c74de5f4e580dc15660c798ff9fc  usr/share/php/propel/generator/bin/.svn/prop-base/propel-gen.bat.svn-base
-4160c74de5f4e580dc15660c798ff9fc  usr/share/php/propel/generator/bin/.svn/prop-base/propel-gen.svn-base
-4a2a3829f8160940ebb2ecf47f8ea2ee  usr/share/php/propel/generator/bin/.svn/all-wcprops
-9d3658b01c2cee7b9bac90404972acf6  usr/share/php/propel/generator/bin/.svn/text-base/propel-gen.bat.svn-base
-a8cd6240f234c2e8e9d5524499969401  usr/share/php/propel/generator/bin/.svn/text-base/propel-gen.svn-base
-1773fc3af62c91ba93f968d9182f8bd6  usr/share/php/propel/generator/bin/.svn/entries
-9d3658b01c2cee7b9bac90404972acf6  usr/share/php/propel/generator/bin/propel-gen.bat
-73010e57a3ff4527b00dc6305870995f  usr/share/php/propel/generator/bin/propel-gen
-4b5a0a2bcb5906f51938d1f80b765aea  usr/share/php/propel/generator/resources/.svn/all-wcprops
-3c60cfa1039877bab9085bac2a640a80  usr/share/php/propel/generator/resources/.svn/entries
-0c248bc648ea7a1c52f6161f426be4c1  usr/share/php/propel/generator/resources/dtd/database.dtd
-287589471527a3f7d2f510cb4d142461  usr/share/php/propel/generator/resources/dtd/.svn/all-wcprops
-0c248bc648ea7a1c52f6161f426be4c1  usr/share/php/propel/generator/resources/dtd/.svn/text-base/database.dtd.svn-base
-b10f6d199f8ff7417cc4d411bd9147c9  usr/share/php/propel/generator/resources/dtd/.svn/entries
-4160c74de5f4e580dc15660c798ff9fc  usr/share/php/propel/generator/resources/xsd/.svn/prop-base/custom_datatypes.xsd.svn-base
-4160c74de5f4e580dc15660c798ff9fc  usr/share/php/propel/generator/resources/xsd/.svn/prop-base/database.xsd.svn-base
-4298e1c72e8ad5eb2007dd2611a7d4bb  usr/share/php/propel/generator/resources/xsd/.svn/all-wcprops
-25639f786bdb6f27e6d0b19291bbc386  usr/share/php/propel/generator/resources/xsd/.svn/text-base/custom_datatypes.xsd.svn-base
-6093ad37941945d4f4fd8b2144d1efbe  usr/share/php/propel/generator/resources/xsd/.svn/text-base/database.xsd.svn-base
-de9a976eaa1e2afb52a8816a5b5bfb57  usr/share/php/propel/generator/resources/xsd/.svn/entries
-25639f786bdb6f27e6d0b19291bbc386  usr/share/php/propel/generator/resources/xsd/custom_datatypes.xsd
-6093ad37941945d4f4fd8b2144d1efbe  usr/share/php/propel/generator/resources/xsd/database.xsd
-4160c74de5f4e580dc15660c798ff9fc  usr/share/php/propel/generator/resources/xsl/.svn/prop-base/database.xsl.svn-base
-f1f52151455744d9f8d1aa9ff189703f  usr/share/php/propel/generator/resources/xsl/.svn/all-wcprops
-79b138612b64ead70fbf83b83c1d80a1  usr/share/php/propel/generator/resources/xsl/.svn/text-base/database.xsl.svn-base
-c90f4248cc2d9b4738fbf84d2f53fe0b  usr/share/php/propel/generator/resources/xsl/.svn/entries
-79b138612b64ead70fbf83b83c1d80a1  usr/share/php/propel/generator/resources/xsl/database.xsl
-94a1dcdd5006b196f707d31914f00c71  usr/share/php/propel/generator/classes/propel/.svn/all-wcprops
-df7c1628721573373af5a972da066651  usr/share/php/propel/generator/classes/propel/.svn/entries
-9d3432ecb15c813f51c89401fd47e33e  usr/share/php/propel/generator/classes/propel/phing/PropelOMTask.php
-2d781fd646b137ba244f49d3e5ec0de3  usr/share/php/propel/generator/classes/propel/phing/PropelDataSQLTask.php
-7b5139f7ccbce7ebbc98a0eb51e71975  usr/share/php/propel/generator/classes/propel/phing/AbstractPropelDataModelTask.php
-356a507f2cf0b2de31f4f38bcc7ab718  usr/share/php/propel/generator/classes/propel/phing/PropelSchemaReverseTask.php
-40aefc8ee7ec4c722aebe05246563404  usr/share/php/propel/generator/classes/propel/phing/PropelDataDTDTask.php
-826a80d4d2d017325a4e742cdc725d1a  usr/share/php/propel/generator/classes/propel/phing/PropelDataDumpTask.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelDataModelTemplateTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelSQLTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelDataSQLTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/AbstractPropelDataModelTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelDataDumpTask.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelSchemaReverseTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelOMTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelSQLExec.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelConvertConfTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelDataDTDTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelCreoleTransformTask.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/phing/.svn/prop-base/PropelGraphvizTask.php.svn-base
-204a3bf08a57382e8fc81a0c8dec961b  usr/share/php/propel/generator/classes/propel/phing/.svn/all-wcprops
-5ec493e17df8522090f996781ceafeff  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelDataModelTemplateTask.php.svn-base
-a6f73dfc338130e1320a1d6af342b4b5  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelSQLTask.php.svn-base
-241ad17a00ccd10c5327cf0569d9fd1c  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelDataSQLTask.php.svn-base
-2dd8f58bfcb21ac2a54a0eb7af6047be  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/AbstractPropelDataModelTask.php.svn-base
-cf7445c60c09ce6ddf1100f3fe39cfdc  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelDataDumpTask.php.svn-base
-356a507f2cf0b2de31f4f38bcc7ab718  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelSchemaReverseTask.php.svn-base
-d24606b5e8653821533bbb0be35d35eb  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelOMTask.php.svn-base
-e01a300b022f00a146b36f9da888304a  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelSQLExec.php.svn-base
-3585a8cc7731a7ac7c21865edfc1c66c  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelConvertConfTask.php.svn-base
-8b78cc49396de3b6487d8f001ba179e8  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelDataDTDTask.php.svn-base
-3ac93361b99eff48a58776fe3c06c1ac  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelCreoleTransformTask.php.svn-base
-f16ee4cd9e2d5d7c4aab9f7e2213a036  usr/share/php/propel/generator/classes/propel/phing/.svn/text-base/PropelGraphvizTask.php.svn-base
-eecd070315336031b5bcdded74a5bcbe  usr/share/php/propel/generator/classes/propel/phing/.svn/entries
-d3f005fb1f301c5647257d75d74cca4c  usr/share/php/propel/generator/classes/propel/phing/PropelConvertConfTask.php
-731dad929bfa66ec6835d8267ade1580  usr/share/php/propel/generator/classes/propel/phing/PropelGraphvizTask.php
-bb536f17272d820991b282c25fdfce5d  usr/share/php/propel/generator/classes/propel/phing/PropelCreoleTransformTask.php
-e955c110e80750fd9b5b1597185887cd  usr/share/php/propel/generator/classes/propel/phing/PropelSQLExec.php
-2df6e5aadc93afa4fe2c0750187329dc  usr/share/php/propel/generator/classes/propel/phing/PropelDataModelTemplateTask.php
-8acf46ac7fd7c88cc545c00bf86b76fe  usr/share/php/propel/generator/classes/propel/phing/PropelSQLTask.php
-73c39106228f49129726887f230de126  usr/share/php/propel/generator/classes/propel/engine/behavior/SoftDeleteBehavior.php
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/prop-base/AlternativeCodingStandardsBehavior.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/prop-base/SoftDeleteBehavior.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/prop-base/TimestampableBehavior.php.svn-base
-e49f80f0d7ac23e43d85dfc3e13e93ac  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/prop-base/AutoAddPkBehavior.php.svn-base
-157f9c845deca9ea40498a0c6f2c8332  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/all-wcprops
-1efa418b1a945987fd4d927c4d7881f1  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/text-base/AlternativeCodingStandardsBehavior.php.svn-base
-73c39106228f49129726887f230de126  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/text-base/SoftDeleteBehavior.php.svn-base
-a00c86e3e974b77166d218118711dec8  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/text-base/TimestampableBehavior.php.svn-base
-aedf64fd8b036e4b8f8157511a52b87d  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/text-base/AutoAddPkBehavior.php.svn-base
-9103e8ba1ab140c3b64320e3bdeb81d7  usr/share/php/propel/generator/classes/propel/engine/behavior/.svn/entries
-46a0a0bb7b6d9575e0f1fd05d02708c1  usr/share/php/propel/generator/classes/propel/engine/behavior/AutoAddPkBehavior.php
-a00c86e3e974b77166d218118711dec8  usr/share/php/propel/generator/classes/propel/engine/behavior/TimestampableBehavior.php
-1efa418b1a945987fd4d927c4d7881f1  usr/share/php/propel/generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/.svn/prop-base/EngineException.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/.svn/prop-base/GeneratorConfig.php.svn-base
-f9561a9dff37fea2969bd83dedb61638  usr/share/php/propel/generator/classes/propel/engine/.svn/all-wcprops
-bd719cafafc7865931205348c2b870c8  usr/share/php/propel/generator/classes/propel/engine/.svn/text-base/EngineException.php.svn-base
-5230c71bca1bdb96963e0c086ffe1ac8  usr/share/php/propel/generator/classes/propel/engine/.svn/text-base/GeneratorConfig.php.svn-base
-c5dcb6cf51e8b1274f41680626c390f6  usr/share/php/propel/generator/classes/propel/engine/.svn/entries
-8932a6a7fa44617cc1a6141c6684d30a  usr/share/php/propel/generator/classes/propel/engine/EngineException.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/util/.svn/prop-base/Pluralizer.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/util/.svn/prop-base/DefaultEnglishPluralizer.php.svn-base
-bfc900d8100870a18f27174a4fa8e008  usr/share/php/propel/generator/classes/propel/engine/builder/util/.svn/all-wcprops
-f4b6725ee624767ddb10275187daa5f7  usr/share/php/propel/generator/classes/propel/engine/builder/util/.svn/text-base/Pluralizer.php.svn-base
-708bcea27e9574ebc97aeba3c0d2c65f  usr/share/php/propel/generator/classes/propel/engine/builder/util/.svn/text-base/DefaultEnglishPluralizer.php.svn-base
-567275a1fd42c95021184b32929468c9  usr/share/php/propel/generator/classes/propel/engine/builder/util/.svn/entries
-0923e5ae999192d22be2187aed79880a  usr/share/php/propel/generator/classes/propel/engine/builder/util/Pluralizer.php
-55b5046117c5b3ce1ae3963dc0b1f96a  usr/share/php/propel/generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/.svn/prop-base/XmlToDataSQL.php.svn-base
-efd7f1ba2dd7f5e147293dc8be20786d  usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/.svn/all-wcprops
-5dfb6bbf112717c3665b3d1c2395f9ed  usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/.svn/text-base/XmlToDataSQL.php.svn-base
-737ff8cc40d37d512a00b6d2e9848f2e  usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/.svn/entries
-78e2dedb7886b80299d1ddad421b1953  usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/.svn/prop-base/DataSQLBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/.svn/prop-base/DDLBuilder.php.svn-base
-076f9bc320d0730dc34d5f61cb09d07f  usr/share/php/propel/generator/classes/propel/engine/builder/sql/.svn/all-wcprops
-8966b9e4ab5ec47dc37e84d1c9c8413f  usr/share/php/propel/generator/classes/propel/engine/builder/sql/.svn/text-base/DataSQLBuilder.php.svn-base
-656097ef37a2eaee77f11b711fccdb0c  usr/share/php/propel/generator/classes/propel/engine/builder/sql/.svn/text-base/DDLBuilder.php.svn-base
-12badf3e4003044c0066575fa2f2904b  usr/share/php/propel/generator/classes/propel/engine/builder/sql/.svn/entries
-b4f1fa6e0853add3fb91a2aff46f459e  usr/share/php/propel/generator/classes/propel/engine/builder/sql/DDLBuilder.php
-1895a59702f0a95c1acc0b02f5d736eb  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/.svn/prop-base/PgsqlDataSQLBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/.svn/prop-base/PgsqlDDLBuilder.php.svn-base
-6f1fb298c85d12409a6bc94a4d1a9e3a  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/.svn/all-wcprops
-93a13070b614ee444fa9342b236e5c09  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/.svn/text-base/PgsqlDataSQLBuilder.php.svn-base
-6d857ab9e7cd6ea17a7f1c1072085598  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/.svn/text-base/PgsqlDDLBuilder.php.svn-base
-685ee0595e3ba3871aa965fe6e7c22e2  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/.svn/entries
-b599f25e188c979c3a72c66c5d363fb3  usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/.svn/prop-base/MssqlDataSQLBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/.svn/prop-base/MssqlDDLBuilder.php.svn-base
-3b917f277d5d4ec9939812df45cdbe24  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/.svn/all-wcprops
-ef0a7e8682538b6c896b8b3166e1832b  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/.svn/text-base/MssqlDataSQLBuilder.php.svn-base
-18f0350743a9ab84ef2eb3389c34e977  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/.svn/text-base/MssqlDDLBuilder.php.svn-base
-557693cad7b82186f5c340b86b3ddfb6  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/.svn/entries
-8df2dff6c37c47a5316d9a59596f1d1d  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php
-0472b2e3f696125a4a291b636f35044c  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php
-41feadcc9e3bfdc14ed452353474a431  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/.svn/prop-base/OracleDataSQLBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/.svn/prop-base/OracleDDLBuilder.php.svn-base
-cca8c34f6f55a191ff905e3c8a84f775  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/.svn/all-wcprops
-fa510cb1707a386740ef5131e551d8a6  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/.svn/text-base/OracleDataSQLBuilder.php.svn-base
-4c35b08c8b72133d10a8d1d1570eadff  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/.svn/text-base/OracleDDLBuilder.php.svn-base
-8ec0c21a1119ef7c16a3fddfa252de17  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/.svn/entries
-b6610897c0709d6d49ebf067a8d22335  usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php
-666f52f1600fcb851ccd48b770a88711  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/.svn/prop-base/MysqlDDLBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/.svn/prop-base/MysqlDataSQLBuilder.php.svn-base
-19e39c35d893a0f13cedfc8744d810a0  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/.svn/all-wcprops
-bce9309f8e347e09e32886247d36a16e  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/.svn/text-base/MysqlDDLBuilder.php.svn-base
-ed2abc1e04c759c65cdafc92f9530521  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/.svn/text-base/MysqlDataSQLBuilder.php.svn-base
-e45a38b611e3276e1a5c8feeda632ed6  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/.svn/entries
-77731fff411e271988192bd18c584a8d  usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
-6286582ed99a2aa26217c1db278278bd  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/.svn/prop-base/SqliteDDLBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/.svn/prop-base/SqliteDataSQLBuilder.php.svn-base
-662d8b77547a7308a3bf110f96d56b39  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/.svn/all-wcprops
-47ddd81c29bab935068110d4cd9586d0  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/.svn/text-base/SqliteDDLBuilder.php.svn-base
-e1be8df0add70e50e0ef160f33491bc6  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/.svn/text-base/SqliteDataSQLBuilder.php.svn-base
-13a1a333866a3f40bf61ee5437fef6c9  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/.svn/entries
-5450300db33cb84fcc37780a49be566a  usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php
-8da1ff760be1e11bcad56904f0768520  usr/share/php/propel/generator/classes/propel/engine/builder/sql/DataSQLBuilder.php
-87d151911bbd5942ddfbd2b5e18c8522  usr/share/php/propel/generator/classes/propel/engine/builder/DataModelBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/.svn/prop-base/DataModelBuilder.php.svn-base
-870cf6b1ddb961aab3694954a320182f  usr/share/php/propel/generator/classes/propel/engine/builder/.svn/all-wcprops
-83f75497fe68246c9bbebd1ef3a99176  usr/share/php/propel/generator/classes/propel/engine/builder/.svn/text-base/DataModelBuilder.php.svn-base
-a9cac3914e6a444fd2481fd04d521433  usr/share/php/propel/generator/classes/propel/engine/builder/.svn/entries
-01a963b5d51bebd859a39ce29fc28521  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php
-32eb6b6d4916e74691e1ffd5c1f610ed  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php
-527e7df65fcda4971a89b424838efe6a  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php
-42e118c0cba76704f6c1fc7d59ff6aa1  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php
-555c64bea316e3b49afee1d04a85b771  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5PeerBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5NestedSetBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5MultiExtendObjectBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5ExtensionNodePeerBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5InterfaceBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5ExtensionPeerBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5ObjectBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5NestedSetPeerBuilder.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5TableMapBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5NodePeerBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5NodeBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5ExtensionObjectBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/prop-base/PHP5ExtensionNodeBuilder.php.svn-base
-e2cd00615c9e0d682223547b55faf3c2  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/all-wcprops
-0ff8556640365b8bfce70f1ea04de9ea  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5PeerBuilder.php.svn-base
-ded0035f0bd8e5c4ebc4172374d2f52b  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5NestedSetBuilder.php.svn-base
-d1e491c36b030298f36e2414722cdbd9  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5MultiExtendObjectBuilder.php.svn-base
-040fbc7ebd365151a601691d88e00082  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5ExtensionNodePeerBuilder.php.svn-base
-07cec5b0d81836ed476183e593ac12f3  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5InterfaceBuilder.php.svn-base
-9d46d7ab0f73d91be7203a6ef48bffd0  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5ExtensionPeerBuilder.php.svn-base
-46593473957e34c27d354e9b5ba03d2a  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5ObjectBuilder.php.svn-base
-08fd343b7fb37b4de4e006ed6e30a6b8  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5NestedSetPeerBuilder.php.svn-base
-32eb6b6d4916e74691e1ffd5c1f610ed  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5TableMapBuilder.php.svn-base
-10db6450cc747c010f56578cf6880712  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5NodePeerBuilder.php.svn-base
-b8f340109a948ac55acc74b44f212728  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5NodeBuilder.php.svn-base
-88ee9742adce862dcfae1e95a200b6f8  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5ExtensionObjectBuilder.php.svn-base
-f6efdac79a0afa3b24b6dbf058082506  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/text-base/PHP5ExtensionNodeBuilder.php.svn-base
-26a22cea5e09071e0342efc0b7abe6d2  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/.svn/entries
-b3c68034242dcb1aeaa16164496a99a5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php
-893fc670abb21c8c4278900328bb38cc  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php
-4368cfbc5527573ab99241fe1402a7f5  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php
-9590b31163999c353f57db4b7457493d  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php
-9dcb40eacd1614f65f1a784fa9649370  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php
-03a04a4277b7c8cea4d83ac44fbebcd2  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php
-d8281a1fa10aa75157c2d8236a5a4ec1  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php
-77e3765deb709d94205174d3bd9a8b0c  usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php
-4965cde9ace8cc531ac5731dc3e40919  usr/share/php/propel/generator/classes/propel/engine/builder/om/ObjectBuilder.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/prop-base/OMBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/prop-base/ClassTools.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/prop-base/ObjectBuilder.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/prop-base/PeerBuilder.php.svn-base
-814b98732473737b18cb4f46e209108f  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/all-wcprops
-f5b491136544f68e37d01a79b3224cf6  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/text-base/OMBuilder.php.svn-base
-b43d5ae194d1a150f4fc847232d5fdf6  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/text-base/ClassTools.php.svn-base
-d1c3f7dac59ffe49de9dde8fc2311ea8  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/text-base/ObjectBuilder.php.svn-base
-38f6ddf7adeb41a337819e06f7a54670  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/text-base/PeerBuilder.php.svn-base
-598989812b779509ba1166c2b4b87776  usr/share/php/propel/generator/classes/propel/engine/builder/om/.svn/entries
-626c41c390dff3325ef2c874f1e096d4  usr/share/php/propel/generator/classes/propel/engine/builder/om/OMBuilder.php
-22651d05683198a4432864404aba3498  usr/share/php/propel/generator/classes/propel/engine/builder/om/ClassTools.php
-f2e18385b5bf8355bf35a9f776190174  usr/share/php/propel/generator/classes/propel/engine/builder/om/PeerBuilder.php
-5023df4948438d0c1172eb628b45af89  usr/share/php/propel/generator/classes/propel/engine/platform/MssqlPlatform.php
-3bd05ff9c6b2af0802026520db3a8cf6  usr/share/php/propel/generator/classes/propel/engine/platform/DefaultPlatform.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/MysqlPlatform.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/SqlitePlatform.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/PgsqlPlatform.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/MssqlPlatform.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/OraclePlatform.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/Platform.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/prop-base/DefaultPlatform.php.svn-base
-1c256e3a0467b7c9a95e033211fb916f  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/all-wcprops
-7a0d5d5c6d5223c4f79d746ae40135db  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/MysqlPlatform.php.svn-base
-7ade77302d906c49d29256c069e44cad  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/SqlitePlatform.php.svn-base
-d2a76969dc4a1cef5c647a6ccb853db0  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/PgsqlPlatform.php.svn-base
-d28b5277fcbe4afd08d92504175dc468  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/MssqlPlatform.php.svn-base
-d4840bc4c15696f75d03f2815258aa5f  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/OraclePlatform.php.svn-base
-c5320a49b368abfe77eab48f2a57c761  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/Platform.php.svn-base
-395cf7e6901b0c46a33f3cc5a40f255b  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/text-base/DefaultPlatform.php.svn-base
-16447da3ba699f28e914e20246cecf64  usr/share/php/propel/generator/classes/propel/engine/platform/.svn/entries
-701fb28faa718b31b638010dce66b20d  usr/share/php/propel/generator/classes/propel/engine/platform/MysqlPlatform.php
-2d1969f6d177792ec6eb601778ad6740  usr/share/php/propel/generator/classes/propel/engine/platform/Platform.php
-3d86c282806682de9c8c69e8e5da7358  usr/share/php/propel/generator/classes/propel/engine/platform/PgsqlPlatform.php
-4ecbec6b58e14aa24d4ce1fb86bbb965  usr/share/php/propel/generator/classes/propel/engine/platform/SqlitePlatform.php
-7304fa25719fa1b2a031f82c7d9712a3  usr/share/php/propel/generator/classes/propel/engine/platform/OraclePlatform.php
-1053f49e32d55f9819df49ab3daa24e4  usr/share/php/propel/generator/classes/propel/engine/database/.svn/all-wcprops
-f09cb4d25d99f3c3d38e5b30b50a32ed  usr/share/php/propel/generator/classes/propel/engine/database/.svn/entries
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/transform/.svn/prop-base/XmlToAppData.php.svn-base
-d8ed81e7ae913e1397cde6f319847089  usr/share/php/propel/generator/classes/propel/engine/database/transform/.svn/all-wcprops
-648c265894bf4c5f8b0532ce2e1b256e  usr/share/php/propel/generator/classes/propel/engine/database/transform/.svn/text-base/XmlToAppData.php.svn-base
-59ed4fbd8169124a43be8ad588f7ef83  usr/share/php/propel/generator/classes/propel/engine/database/transform/.svn/entries
-3ee572aca588e8ee593dbe128b25f5a3  usr/share/php/propel/generator/classes/propel/engine/database/transform/XmlToAppData.php
-ed7b78bf32fe2c3edce25e693fb872eb  usr/share/php/propel/generator/classes/propel/engine/database/model/NameFactory.php
-0babeb85c5e1b3234051f2bed463b24a  usr/share/php/propel/generator/classes/propel/engine/database/model/PhpNameGenerator.php
-63b07e0f8b49c14b261b0f250bb677b8  usr/share/php/propel/generator/classes/propel/engine/database/model/PropelTypes.php
-bea41f32afb96bc1a319027099c4ff57  usr/share/php/propel/generator/classes/propel/engine/database/model/NameGenerator.php
-e2c6fdbe98bee7e6e888bbd832307883  usr/share/php/propel/generator/classes/propel/engine/database/model/IDMethod.php
-023c2fbb0eba36bbcd536e17d1a325c3  usr/share/php/propel/generator/classes/propel/engine/database/model/AppData.php
-279cd90312bfcbc163f12ad7856f3228  usr/share/php/propel/generator/classes/propel/engine/database/model/Column.php
-25ad6d8a9796ef27a9c4651cfaa6caa8  usr/share/php/propel/generator/classes/propel/engine/database/model/Rule.php
-4a7b3b0ccfcf13b909c93421d68e167c  usr/share/php/propel/generator/classes/propel/engine/database/model/Validator.php
-a94fed24c4ac9e2d4585d54d42eb71a7  usr/share/php/propel/generator/classes/propel/engine/database/model/Domain.php
-77099553c4a4c895293053f05b286291  usr/share/php/propel/generator/classes/propel/engine/database/model/ColumnDefaultValue.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/AppData.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Domain.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Unique.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Index.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/NameFactory.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Validator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Table.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/PropelTypes.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/IdMethodParameter.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/XMLElement.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/IDMethod.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Rule.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/VendorInfo.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Inheritance.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/PhpNameGenerator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Database.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/ForeignKey.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/NameGenerator.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Column.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/ColumnDefaultValue.php.svn-base
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/Behavior.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/prop-base/ConstraintNameGenerator.php.svn-base
-83039fdeea60a7f35ea4aa0e777ebb35  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/all-wcprops
-59e29ff097255d67379fb8d9dc23360a  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/AppData.php.svn-base
-4ab3ac4cb061150f78b3a146525fe464  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Domain.php.svn-base
-6313b7da2204d681db8a9aa3f4c78c6c  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Unique.php.svn-base
-0a705834f86dc9990887db5aa617144e  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Index.php.svn-base
-238e6dc15dc4c2bbf7bb62da9c37427d  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/NameFactory.php.svn-base
-fee2cf919a088e99411091c1ec8b3450  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Validator.php.svn-base
-d95348b66db2ab7d99f07c0a9a12ec72  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Table.php.svn-base
-9d4413c963327481e2cbd38e38f5fc14  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/PropelTypes.php.svn-base
-e1932f285a70a5ca0b3ac185de2ef79a  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/IdMethodParameter.php.svn-base
-e55693c50c811afd3b4f211180a93a1a  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/XMLElement.php.svn-base
-5ac1db16ca78004f31e99889cb291f9c  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/IDMethod.php.svn-base
-cecde0c3f52ca6f7d7d2b7b07547f54e  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Rule.php.svn-base
-2e4f86d483e433e9cd655f9c264027d0  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/VendorInfo.php.svn-base
-9e20c76d839dea118a282108f02ada5f  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Inheritance.php.svn-base
-8d1720e9d4e52de7bb5715cc53b4cdf0  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/PhpNameGenerator.php.svn-base
-85530e0f748c42c39a7982bde6133d2d  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Database.php.svn-base
-b5d80aa461264c90f2a8bdf1860e91e9  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/ForeignKey.php.svn-base
-262043332176cf3b7e25798b0a6b7dc0  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/NameGenerator.php.svn-base
-8d3209542a7ef9a8b03fbfa8905c6ac2  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Column.php.svn-base
-7d727fe8f8d918f6d05be67e5a240f82  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/ColumnDefaultValue.php.svn-base
-35a8d93800cba8c4076c4c93f9c5ebed  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/Behavior.php.svn-base
-61fa84b36dca6c19fb85fe63b6e0a17e  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/text-base/ConstraintNameGenerator.php.svn-base
-82e23c13066facc54d1e2302f124e95c  usr/share/php/propel/generator/classes/propel/engine/database/model/.svn/entries
-f20ff092ad219849f65ddbe5c6907edf  usr/share/php/propel/generator/classes/propel/engine/database/model/XMLElement.php
-86ff103d7a93403c5a9c9b0a2eddda5e  usr/share/php/propel/generator/classes/propel/engine/database/model/Unique.php
-af8bbb714d3a39a4c25a0c7a504856de  usr/share/php/propel/generator/classes/propel/engine/database/model/Table.php
-33bbea2080ec0c3766533df2d3725db6  usr/share/php/propel/generator/classes/propel/engine/database/model/Index.php
-35a8d93800cba8c4076c4c93f9c5ebed  usr/share/php/propel/generator/classes/propel/engine/database/model/Behavior.php
-c8c7c25f3524cac87ddc34ab2efaad13  usr/share/php/propel/generator/classes/propel/engine/database/model/VendorInfo.php
-b0c38004a0bd17c283087ec7ea4f6957  usr/share/php/propel/generator/classes/propel/engine/database/model/Database.php
-f91b0e58392dd900c45c682a5c35d538  usr/share/php/propel/generator/classes/propel/engine/database/model/ForeignKey.php
-e5d24bb11188b8699a3aa12cf558b52a  usr/share/php/propel/generator/classes/propel/engine/database/model/IdMethodParameter.php
-dc381d82d1646520d0317221ad6d1b26  usr/share/php/propel/generator/classes/propel/engine/database/model/ConstraintNameGenerator.php
-3a4ce7726f54a94d7ed0c2c26f555767  usr/share/php/propel/generator/classes/propel/engine/database/model/Inheritance.php
-fe515c8a0a02a937b08f39aa895dacd2  usr/share/php/propel/generator/classes/propel/engine/database/reverse/BaseSchemaParser.php
-e804d5e0089bcd20ab76c19c33393955  usr/share/php/propel/generator/classes/propel/engine/database/reverse/SchemaParser.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/reverse/.svn/prop-base/BaseSchemaParser.php.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/reverse/.svn/prop-base/SchemaParser.php.svn-base
-5d8a6c0c0fc0ef045ceef7c0066db519  usr/share/php/propel/generator/classes/propel/engine/database/reverse/.svn/all-wcprops
-bd0e5b3a0778f23b4bbabf21df6b2e5b  usr/share/php/propel/generator/classes/propel/engine/database/reverse/.svn/text-base/BaseSchemaParser.php.svn-base
-e80c0975d2fa986460099e6327d22154  usr/share/php/propel/generator/classes/propel/engine/database/reverse/.svn/text-base/SchemaParser.php.svn-base
-06f8db45339116bcc7919d61add0e28b  usr/share/php/propel/generator/classes/propel/engine/database/reverse/.svn/entries
-93cae8d869dee6f4e4c45fa4cd5f8efd  usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/.svn/prop-base/PgsqlSchemaParser.php.svn-base
-1f8f5766f7e96584b2a6bc4974733a86  usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/.svn/all-wcprops
-b6d4a87bb293ed42395744c42b225a42  usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/.svn/text-base/PgsqlSchemaParser.php.svn-base
-64c9ac19d04378c2d42e8aa701c8f03b  usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/.svn/entries
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/.svn/prop-base/MssqlSchemaParser.php.svn-base
-8bf4658ea210fa9adc08a8b13956e2ae  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/.svn/all-wcprops
-13862676fa2cfedf13bc26c0de4e5656  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/.svn/text-base/MssqlSchemaParser.php.svn-base
-e7803d2d161544ddfbc48aaed5e1a190  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/.svn/entries
-e90b7ff733d1253805babdc254259b75  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php
-25e6c2f7558b7484000d4d090dea5b92  usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/.svn/prop-base/OracleSchemaParser.php.svn-base
-5b12b527abdccebd78d4da6142a508f1  usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/.svn/all-wcprops
-a793f5718206ba3ddd2a0e572d3df2b2  usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/.svn/text-base/OracleSchemaParser.php.svn-base
-cd5a93a20ebdabc64f4b2fa96354e422  usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/.svn/entries
-a793f5718206ba3ddd2a0e572d3df2b2  usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php
-8885bb075a2adfa2afdce535d3738626  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/.svn/prop-base/MysqlSchemaParser.php.svn-base
-ec5dc2990ea5f74a958c26167956c2aa  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/.svn/all-wcprops
-6154c88ea46b43d6bed384f603b4b5e7  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/.svn/text-base/MysqlSchemaParser.php.svn-base
-f823ca82919c92c32fa6fb296ccd1563  usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/.svn/entries
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/.svn/prop-base/SqliteSchemaParser.php.svn-base
-d664a2e28db70a2d6f1252a4e4e57082  usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/.svn/all-wcprops
-1a4767a92b84237b8648c50949675207  usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/.svn/text-base/SqliteSchemaParser.php.svn-base
-c4a547e87215722262f8393cabda0e81  usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/.svn/entries
-720782a1958698e0764f5fbcbd0adb22  usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php
-82b806fa16c854d0601641cf04218d0c  usr/share/php/propel/generator/classes/propel/engine/GeneratorConfig.php
-20d9571f4ec0665eb9248bffaa6fd117  usr/share/php/propel/generator/classes/.svn/all-wcprops
-88c7408f52038ffc88411bd33b7d499e  usr/share/php/propel/generator/classes/.svn/entries
-469ae53be9a9c4372c62329e14ce3da3  usr/share/php/propel/generator/pear/build-pear-package.xml
-40bf58e043d9d754c74a9a166e0e0ac0  usr/share/php/propel/generator/pear/pear-build.xml
-445ac1041382238ca8b23205778f504d  usr/share/php/propel/generator/pear/BuildPropelGenPEARPackageTask.php
-da9e91d834c420feb06f86d7989ceb83  usr/share/php/propel/generator/pear/build.properties
-bf9347059052e6b81eb4778cb6c1c65f  usr/share/php/propel/generator/pear/.svn/prop-base/build-pear-package.xml.svn-base
-bf9347059052e6b81eb4778cb6c1c65f  usr/share/php/propel/generator/pear/.svn/prop-base/pear-build.xml.svn-base
-3aac4189d40cf59729b51d22c835caf5  usr/share/php/propel/generator/pear/.svn/prop-base/BuildPropelGenPEARPackageTask.php.svn-base
-bf9347059052e6b81eb4778cb6c1c65f  usr/share/php/propel/generator/pear/.svn/prop-base/build.properties.svn-base
-79fd18deb56f2c2683f3ef12f1424bd3  usr/share/php/propel/generator/pear/.svn/all-wcprops
-469ae53be9a9c4372c62329e14ce3da3  usr/share/php/propel/generator/pear/.svn/text-base/build-pear-package.xml.svn-base
-40bf58e043d9d754c74a9a166e0e0ac0  usr/share/php/propel/generator/pear/.svn/text-base/pear-build.xml.svn-base
-96ef1eace337ae0510b61f00ef5a5f23  usr/share/php/propel/generator/pear/.svn/text-base/BuildPropelGenPEARPackageTask.php.svn-base
-da9e91d834c420feb06f86d7989ceb83  usr/share/php/propel/generator/pear/.svn/text-base/build.properties.svn-base
-57a28b9e1871e1cb7d34421acf964680  usr/share/php/propel/generator/pear/.svn/text-base/pear-propel-gen.svn-base
-1dc3009a41408e9014acebb3662f2208  usr/share/php/propel/generator/pear/.svn/text-base/pear-propel-gen.bat.svn-base
-fb5724d64dd6eb3b2ca85283d1892e91  usr/share/php/propel/generator/pear/.svn/entries
-1dc3009a41408e9014acebb3662f2208  usr/share/php/propel/generator/pear/pear-propel-gen.bat
-57a28b9e1871e1cb7d34421acf964680  usr/share/php/propel/generator/pear/pear-propel-gen
-d4b1141aa15137f3bfc6ed64281a041d  usr/share/php/propel/generator/build.xml-local
-17fcaadc48f85de976e090c77c81a119  usr/share/doc/propel/changelog.Debian.gz
-4f5f64ce183da65f18297692c1a9b40c  usr/share/doc/propel/copyright
-54b522dd387d4699afe1f40f3d4c2e85  usr/share/doc/propel/changelog.gz
-de0c15c258dc1342c5dfbaade7964939  usr/share/doc/propel/README.Debian
diff --git a/debian/propel/DEBIAN/postinst b/debian/propel/DEBIAN/postinst
deleted file mode 100755
index d644258..0000000
--- a/debian/propel/DEBIAN/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# postinst script for propel
-
-set -e
-
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
-    ln -s /usr/share/php/propel/generator/bin/propel-gen /usr/bin/propel-gen 
-fi
-
-
-exit 0
diff --git a/debian/propel/DEBIAN/prerm b/debian/propel/DEBIAN/prerm
deleted file mode 100755
index a69008e..0000000
--- a/debian/propel/DEBIAN/prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# prerm script for propel
-
-set -e
-
-if [ "$1" != "upgrade" ]; then
-        rm /usr/bin/propel-gen 
-fi
-
-
-
-exit 0
diff --git a/debian/propel/usr/share/doc/propel/README.Debian b/debian/propel/usr/share/doc/propel/README.Debian
deleted file mode 100644
index 2b45b1b..0000000
--- a/debian/propel/usr/share/doc/propel/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-propel for Debian
------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- John Arevalo <johnarevalo at gmail.com>  Thu, 01 Apr 2010 21:40:44 -0500
diff --git a/debian/propel/usr/share/doc/propel/changelog.Debian.gz b/debian/propel/usr/share/doc/propel/changelog.Debian.gz
deleted file mode 100644
index 99e2b5d..0000000
Binary files a/debian/propel/usr/share/doc/propel/changelog.Debian.gz and /dev/null differ
diff --git a/debian/propel/usr/share/doc/propel/changelog.gz b/debian/propel/usr/share/doc/propel/changelog.gz
deleted file mode 100644
index 3c9a696..0000000
Binary files a/debian/propel/usr/share/doc/propel/changelog.gz and /dev/null differ
diff --git a/debian/propel/usr/share/doc/propel/copyright b/debian/propel/usr/share/doc/propel/copyright
deleted file mode 100644
index c9032c8..0000000
--- a/debian/propel/usr/share/doc/propel/copyright
+++ /dev/null
@@ -1,49 +0,0 @@
-This work was packaged for Debian by:
-
-    John Arevalo <johnarevalo at gmail.com> on Thu, 01 Apr 2010 21:40:44 -0500
-
-It was downloaded from:
-
-    http://propel.phpdb.org/
-
-Upstream Author(s):
-
-    Hans Lellelid <hans at xmpl.rg>
-
-Copyright:
-
-    <Copyright (C) 2010 Hans Lellelid>
-
-License:
-
-    This package 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 3 of the License, or (at your option) any later version.
-
-    This package 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 General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in "/usr/share/common-licenses/LGPL-3".
-
-The Debian packaging is:
-
-    Copyright (C) 2010 John Arevalo <johnarevalo at gmail.com>
-
-# Please chose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following lines in.
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/debian/propel/usr/share/php/propel/generator/bin/propel-gen b/debian/propel/usr/share/php/propel/generator/bin/propel-gen
deleted file mode 100755
index 41bbfe7..0000000
--- a/debian/propel/usr/share/php/propel/generator/bin/propel-gen
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# Shell wrapper for Propel generator
-# $Id$
-#
-# This script will do the following:
-# - check for PHING_COMMAND env, if found, use it.
-#   - if not found assume php is on the path
-# - check for PROPEL_GEN_HOME evn, if found use it
-#   - if not look for it
-
-if [ -z "$PROPEL_GEN_HOME" ] ; then
-
-  # echo "WARNING: PROPEL_GEN_HOME environment not set. Attempting to guess."
-
-  if [ -d "/usr/share/php/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="/usr/share/php/propel/generator"
-  fi
-  
-  ## resolve links - $0 may be a link to phing's home
-  PRG="$0"
-  progname=`basename "$0"`
-  saveddir=`pwd`
-
-  # need this for relative symlinks
-  dirname_prg=`dirname "$PRG"`
-  cd "$dirname_prg"
-  
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-	PRG="$link"
-    else
-	PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-  
-  PROPEL_GEN_HOME=`dirname "$PRG"`/..
-
-  cd "$saveddir"
-
-  # make it fully qualified
-  PROPEL_GEN_HOME=`cd "$PROPEL_GEN_HOME" && pwd`
-  
-  # make it available in PHP via getenv("PROPEL_GEN_HOME")
-  export PROPEL_GEN_HOME
-fi
-
-if (test -z "$PHING_COMMAND") ; then
-	# echo "WARNING: PHING_COMMAND environment not set. (Assuming phing on PATH)"
-	export PHING_COMMAND="phing"
-fi
-
-$PHING_COMMAND -f $PROPEL_GEN_HOME/build.xml -Dusing.propel-gen=true -Dproject.dir=$*
diff --git a/debian/propel/usr/share/php/propel/generator/bin/propel-gen.bat b/debian/propel/usr/share/php/propel/generator/bin/propel-gen.bat
deleted file mode 100755
index 2a25b7a..0000000
--- a/debian/propel/usr/share/php/propel/generator/bin/propel-gen.bat
+++ /dev/null
@@ -1,47 +0,0 @@
- at echo off
-
-rem *********************************************************************
-rem ** The Propel generator convenience script for Windows based systems
-rem ** $Id$
-rem *********************************************************************
-
-rem This script will do the following:
-rem - check for PHING_COMMAND env, if found, use it.
-rem   - if not found detect php, if found use it, otherwise err and terminate
-rem - check for PROPEL_GEN_HOME evn, if found use it
-rem   - if not found error and leave
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_PROPEL_GEN_HOME=%~dp0..
-
-goto init
-goto cleanup
-
-:init
-
-if "%PROPEL_GEN_HOME%" == "" set PROPEL_GEN_HOME=%DEFAULT_PROPEL_GEN_HOME%
-set DEFAULT_PROPEL_GEN_HOME=
-
-if "%PHING_COMMAND%" == "" goto no_phingcommand
-
-goto run
-goto cleanup
-
-:run
-%PHING_COMMAND% -f "%PROPEL_GEN_HOME%\build.xml" -Dusing.propel-gen=true -Dproject.dir=%*
-goto cleanup
-
-:no_phingcommand
-REM echo ------------------------------------------------------------------------
-REM echo WARNING: Set environment var PHING_COMMAND to the location of your phing
-REM echo          executable (e.g. C:\PHP\phing.bat). 
-REM echo Proceeding with assumption that phing.bat is on Path
-REM echo ------------------------------------------------------------------------
-set PHING_COMMAND=phing.bat
-goto init
-
-:cleanup
-if "%OS%"=="Windows_NT" @endlocal
-REM pause
diff --git a/debian/propel/usr/share/php/propel/generator/build-propel.xml b/debian/propel/usr/share/php/propel/generator/build-propel.xml
deleted file mode 100644
index 6837c2c..0000000
--- a/debian/propel/usr/share/php/propel/generator/build-propel.xml
+++ /dev/null
@@ -1,542 +0,0 @@
-<project name="propel" default="main">
-
-  <!--
-    Note - You should not have to edit this file.
-
-    Instead, if calling build-propel.xml directly, edit the build.properties
-    that is in the same directory. If calling build-propel.xml via another
-    build file, you can also use the build.properties in the same directory,
-    or set the property propel.contextProperties to the file
-    to use in place of build.properties (e.g. project.properties).
-  -->
-
-  <property name="build.properties" value="build.properties"/>
-  <property name="propel.contextProperties" value="./${build.properties}"/>
-  <property name="propel.home" value="."/>
-
-  <available file="${propel.home}/build.properties" property="globalBuildPopertiesExists"/>
-
-  <if>
-  	<and>
-  		<isset property="globalBuildPopertiesExists"/>
-  	</and>
-  	<then>
-	    <property file="${propel.home}/build.properties"/>
-    </then>
-  </if>
-
-  <!--
-    The default.properties file will map old properties to the new ones along
-    with setting the corret defaults.
-  -->
-  <property file="${propel.home}/default.properties"/>
-
-  <!--
-    Do forward declarations of all of our tasks to
-    centralize them and clean up the targets.
-  -->
-
-  <path id="propelclasses">
-    <pathelement dir="${propel.home}/classes/"/>
-  </path>
-
-  <taskdef
-    name="propel-data-model"
-    classname="propel.phing.PropelDataModelTemplateTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-om"
-    classname="propel.phing.PropelOMTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-data-dtd"
-    classname="propel.phing.PropelDataDTDTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-data-dump"
-    classname="propel.phing.PropelDataDumpTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-data-sql"
-    classname="propel.phing.PropelDataSQLTask" classpathRef="propelclasses"/>
-   <taskdef
-    name="propel-creole-transform"
-    classname="propel.phing.PropelCreoleTransformTask" classpathRef="propelclasses"/>
-   <taskdef
-    name="propel-schema-reverse"
-    classname="propel.phing.PropelSchemaReverseTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-sql"
-    classname="propel.phing.PropelSQLTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-sql-exec"
-    classname="propel.phing.PropelSQLExec" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-graphviz"
-    classname="propel.phing.PropelGraphvizTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-convert-conf"
-    classname="propel.phing.PropelConvertConfTask" classpathRef="propelclasses"/>
-
-  <!-- ================================================================ -->
-  <!-- M A I N  T A R G E T                                             -->
-  <!-- ================================================================ -->
-  <!-- This default target will run all the targets that generate       -->
-  <!-- source. You will probably only run this target once then         -->
-  <!-- call individual targets as necessary to update your sources      -->
-  <!-- when you change your XML schema.                                 -->
-  <!-- ================================================================ -->
-
-  <target
-    name="main"
-  	depends="mysqli-check"
-    description="==> generates sql + om classes">
-
-    <phingcall target="sql"/>
-    <phingcall target="om"/>
-    <phingcall target="convert-conf"/>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- C H E C K  R U N  O N L Y  O N  S C H E M A  C H A N G E         -->
-  <!-- ================================================================ -->
-  <!-- Maps the propel.runOnlyOnSchemaChange to                         -->
-  <!-- propel.internal.runOnlyOnSchemaChange                            -->
-  <!-- ================================================================ -->
-
-  <target name="check-run-only-on-schema-change">
-    <condition property="propel.internal.runOnlyOnSchemaChange">
-      <equals arg1="${propel.runOnlyOnSchemaChange}" arg2="true"/>
-    </condition>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- G E N E R A T E  P R O J E C T  S Q L                            -->
-  <!-- ================================================================ -->
-  <!-- Generate the SQL for your project, These are in addition         -->
-  <!-- to the base Turbine tables! The tables you require for your      -->
-  <!-- project should be specified in project-schema.xml.               -->
-  <!-- ================================================================ -->
-
-  <target
-    name="sql-check"
-    depends="check-run-only-on-schema-change"
-    if="propel.internal.runOnlyOnSchemaChange">
-    <uptodate
-      property="propel.internal.sql.uptodate"
-      targetfile="${propel.sql.dir}/${propel.schema.default.basename}.sql">
-      <srcfiles dir="${propel.schema.dir}" includes="**/${propel.schema.default.basename}.xml" />
-    </uptodate>
-  </target>
-
-  <!--	temporary target to check whether postgres is being used with identifier quoting ON.
-		If so, a warning is issued, since identifier quoting is only paritally implemented & this point.  -->
-  <target name="pgsql-quoting-check">
-  	<if>
-  		<and>
-			<equals arg1="${propel.database}" arg2="pgsql"/>
-			<equals arg1="${propel.disableIdentifierQuoting}" arg2=""/>
-		</and>
-		<then>
-			<warn>ATTENTION: It appears you are using PostgreSQL and you have identifier-quoting turned on.</warn>
-			<warn>It is suggested that you disable identifier quoting when using PostgreSQL -- especially if you</warn>
-			<warn>have case-sensitive columns in your database.</warn>
-			<warn></warn>
-			<warn>To disable identifier quoting, add the following property to your build.properties (or specify</warn>
-			<warn>it using -D on commandline):</warn>
-			<warn></warn>
-			<warn>propel.disableIdentifierQuoting=true</warn>
-			<warn></warn>
-			<warn>You can ignore this warning if you understand the issues related to case-sensitivity and Propel's</warn>
-			<warn>DDL-only implementation of identifier quoting.</warn>
-		</then>
-	</if>
-  </target>
-
-	  <!--	temporary target to check whether mysqli is being used
-			If so, a warning is issued, since this is deprecated  -->
-	  <target name="mysqli-check">
-	  	<if>
-	  		<and>
-				<equals arg1="${propel.database}" arg2="mysqli"/>
-			</and>
-			<then>
-				<warn>ATTENTION: It appears you are using the mysqli driver.</warn>
-				<warn></warn>
-				<warn>This driver is no longer supported by Propel because Propel now uses PDO for database connections.</warn>
-				<warn>Please use mysqli driver instead.</warn>
-				<fail>Use 'mysql' instead of 'mysqli' for your propel.database property.</fail>
-			</then>
-		</if>
-	  </target>
-	
-  <target
-    name="sql"
-    depends="sql-check,pgsql-quoting-check,mysqli-check"
-    unless="propel.internal.sql.uptodate"
-    description="==> generates the SQL for your project">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Generating SQL for YOUR Propel project!  |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-
-    <phingcall target="sql-template"/>
-
-  </target>
-
-  <target name="sql-template">
-    <propel-sql
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      outputDirectory="${propel.sql.dir}"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      targetDatabase="${propel.database}"
-      packageObjectModel="${propel.packageObjectModel}"
-      url="${propel.database.url}"
-      userId="${propel.database.user}"
-      password="${propel.database.password}">
-      <mapper type="glob" from="${propel.sql.mapper.from}" to="${propel.sql.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.sql.includes}"
-        excludes="${propel.schema.sql.excludes}"
-      />
-    </propel-sql>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- C R E A T E  T A R G E T  D A T A B A S E                        -->
-  <!-- ================================================================ -->
-  <!-- Create the target database by executing a generated script       -->
-  <!-- that is capable of performing the task.                          -->
-  <!-- ================================================================ -->
-
-  <target name="create-db-check">
-    <condition property="propel.internal.manualCreation">
-      <equals arg1="${propel.database.manualCreation}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target
-    name="create-db"
-    unless="propel.internal.manualCreation"
-    depends="create-db-check,mysqli-check"
-    description="==> generates the target database">
-
-    <fail message="create-db target temporarily disabled, while we replace creole components."/>
-
-	<!--
-    <propel-data-model
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      controlTemplate="${propel.template.sqlDbInit}"
-      outputDirectory="${propel.sql.dir}"
-      outputFile="create-db.sql"
-      targetDatabase="${propel.database}"
-      dbEncoding="${propel.database.encoding}"
-      templatePath="${propel.templatePath}"
-      packageObjectModel="${propel.packageObjectModel}">
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.create-db.includes}"
-        excludes="${propel.schema.create-db.excludes}"
-      />
-    </propel-data-model>
-
-    <echo message="Executing the create-db.sql script ..."/>
-
-    <sql
-      autocommit="true"
-      driver="${propel.database.driver}"
-      onerror="continue"
-      src="${propel.sql.dir}/create-db.sql"
-      url="${propel.database.createUrl}"
-    />
-    -->
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- I N S E R T  S I N G L E  S Q L  F I L E S                       -->
-  <!-- ================================================================ -->
-
-  <target
-    name="insert-sql"
-    description="==> inserts the generated sql ">
-
-    <propel-sql-exec
-      autocommit="true"
-      onerror="continue"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      srcDir="${propel.sql.dir}"
-      url="${propel.database.buildUrl}"
-      userId="${propel.database.user}"
-      password="${propel.database.password}"
-    />
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- C R E O L E   T O   X M L                                        -->
-  <!-- ================================================================ -->
-
-  <target
-    name="creole"
-    description="==> generate xml schema from Creole metadata">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating XML from Creole connection !       |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-creole-transform
-      dbDriver="${propel.database.creole.driver}"
-      dbSchema="${propel.database.schema}"
-      dbEncoding="${propel.database.encoding}"
-      dbUrl="${propel.database.creole.url}"
-      outputFile="${propel.schema.dir}/${propel.default.schema.basename}.xml"
-      samePhpName="${propel.samePhpName}"
-      addVendorInfo="${propel.addVendorInfo}"
-      addValidators="${propel.addValidators}"
-    />
-
-  </target>
-  
-  <!-- ================================================================ -->
-  <!-- N E W   R E V E R S E   T O   X M L                              -->
-  <!-- ================================================================ -->
-
-  <target
-    name="reverse"
-    description="==> generate xml schema from reverse-engineered database (new)">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating XML from PDO connection !          |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-schema-reverse
-      databaseName="${propel.project}"
-      dbSchema="${propel.database.schema}"
-      dbEncoding="${propel.database.encoding}"
-      url="${propel.database.buildUrl}"
-      userId="${propel.database.user}"
-      password="${propel.database.password}"
-      outputFile="${propel.schema.dir}/${propel.default.schema.basename}.xml"
-      samePhpName="${propel.samePhpName}"
-      addVendorInfo="${propel.addVendorInfo}"
-      addValidators="${propel.addValidators}"
-    />
-
-  </target>
-
-
-  <!-- ================================================================ -->
-  <!-- Generate SQL from XML data file                                  -->
-  <!-- ================================================================ -->
-
-  <target
-    name="datasql"
-    description="==> generates sql from data xml">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating SQL from data XML !                |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-data-sql
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      outputDirectory="${propel.sql.dir}"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      dbEncoding="${propel.database.encoding}"
-      targetDatabase="${propel.database}"
-      datadbmap="${propel.schema.dir}/datadb.map"
-      srcDir="${propel.schema.dir}">
-      <mapper type="glob" from="${propel.datasql.mapper.from}" to="${propel.datasql.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.datadtd.includes}"
-        excludes="${propel.schema.datadtd.excludes}"
-      />
-    </propel-data-sql>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- Dump data from database into xml file                            -->
-  <!-- ================================================================ -->
-
-  <target
-    name="datadump"
-    description="==> dump data from database into xml file">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Dumping the data from database into XML       |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-data-dump
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      targetDatabase="${propel.database}"
-      datadbmap="${propel.schema.dir}/datadb.map"
-      databaseDriver="${propel.database.driver}"
-      dbEncoding="${propel.database.encoding}"
-      databaseUrl="${propel.database.url}"
-      databaseUser="${propel.database.user}"
-      databasePassword="${propel.database.password}"
-      outputDirectory="${propel.schema.dir}">
-      <mapper type="glob" from="${propel.datadump.mapper.from}" to="${propel.datadump.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.datadtd.includes}"
-        excludes="${propel.schema.datadtd.excludes}"
-      />
-     </propel-data-dump>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- G E N E R A T E  P R O J E C T  D A T A  D T D                   -->
-  <!-- ================================================================ -->
-  <!-- Generate the DATA DTD for your project                           -->
-  <!-- ================================================================ -->
-
-  <target
-    name="datadtd"
-    description="==> generates the DATA DTD for your project">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating Data DTD for YOUR Propel project!  |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-data-dtd
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      targetDatabase="${propel.database}"
-      outputDirectory="${propel.output.dir}"
-      templatePath="${propel.templatePath}">
-      <!-- TODO: add properties for the mapper type, from, and to -->
-      <mapper type="glob" from="${propel.datadtd.mapper.from}" to="${propel.datadtd.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.datadtd.includes}"
-        excludes="${propel.schema.datadtd.excludes}"
-      />
-    </propel-data-dtd>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- G E N E R A T E  P R O J E C T  P E E R  B A S E D  O M          -->
-  <!-- ================================================================ -->
-  <!-- Generate the Peer-based object model for your project.           -->
-  <!-- These are in addition to the base Propel OM!                     -->
-  <!-- ================================================================ -->
-
-  <target
-    name="om-check"
-    depends="check-run-only-on-schema-change"
-    if="propel.internal.runOnlyOnSchemaChange">
-    <uptodate
-      property="propel.internal.om.uptodate"
-      targetfile="${propel.php.dir}/report.${propel.project}.om.generation">
-      <srcfiles dir="${propel.schema.dir}" includes="**/${propel.schema.om.includes}.xml" />
-    </uptodate>
-  </target>
-
-  <target
-    name="om"
-    depends="om-check,mysqli-check"
-    unless="propel.internal.om.uptodate"
-    description="==> generates the Peer-based object model for your project">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Generating Peer-based Object Model for   |"/>
-    <echo message="| YOUR Propel project!                     |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-
-    <phingcall target="om-template"/>
-    <!--<phingcall target="om-tar"/>-->
-  </target>
-
-  <target name="om-template">
-    <propel-om
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      outputDirectory="${propel.php.dir}"
-      targetDatabase="${propel.database}"
-      targetPackage="${propel.targetPackage}"
-      targetPlatform="${propel.targetPlatform}"
-      packageObjectModel="${propel.packageObjectModel}">
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.om.includes}"
-        excludes="${propel.schema.om.excludes}"
-      />
-    </propel-om>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- X M L   R U N T I M E   C O N F   T O   P H P   A R R A Y          -->
-  <!-- ================================================================== -->
-
-  <target
-    name="convert-conf"
-    description="==> converts properties file to PHP array">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Converting runtime config file to an     |"/>
-    <echo message="| array dump for improved performance.     |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-    
-    <echo>Output file: ${propel.runtime.phpconf.file}</echo>
-    <echo>XMLFile: ${propel.conf.dir}/${propel.runtime.conf.file}</echo>
-
-    <propel-convert-conf
-      targetDatabase="${propel.database}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      xmlConfFile="${propel.conf.dir}/${propel.runtime.conf.file}"
-      outputDirectory="${propel.phpconf.dir}"
-      outputFile="${propel.runtime.phpconf.file}"
-      packageObjectModel="${propel.packageObjectModel}">
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.sql.includes}"
-        excludes="${propel.schema.sql.excludes}"
-      />
-     </propel-convert-conf>
-
-  </target>
-
-  <target
-    name="graphviz"
-    depends="sql-check"
-    description="==> generates Graphviz file for your project">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Generating Graphiz for YOUR Propel       |"/>
-    <echo message="| project!                                 |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-
-    <propel-graphviz
-      outputDirectory="${propel.graph.dir}"
-      targetDatabase="${propel.database}"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      packageObjectModel="${propel.packageObjectModel}">
-      <mapper type="glob" from="${propel.sql.mapper.from}" to="${propel.sql.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.sql.includes}"
-        excludes="${propel.schema.sql.excludes}"
-      />
-    </propel-graphviz>
-  </target>
-
-
-</project>
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/build.properties-sample b/debian/propel/usr/share/php/propel/generator/build.properties-sample
deleted file mode 100644
index bcb8a2f..0000000
--- a/debian/propel/usr/share/php/propel/generator/build.properties-sample
+++ /dev/null
@@ -1,194 +0,0 @@
-# -------------------------------------------------------------------
-#
-# P R O P E L  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-# This file contains some example properties.  Ideally properties
-# should be specified in the project-specific build.properties file;
-# however, this file can be used to specify non-default properties 
-# that you would like to use accross all of your Propel projects.
-# -------------------------------------------------------------------
-#
-
-propel.home = .
-
-# -------------------------------------------------------------------
-#
-#  P R O J E C T
-#
-# -------------------------------------------------------------------
-# This is the name of your Propel project. The name of your Propel
-# project is used (by default) to determine where the generator will
-# find needed configuration files and will place resuilting build
-# files. E.g. if your project is named 'killerapp', Propel will 
-# look here for schema.xml and runtime-conf.xml files:
-# 
-#   projects/killerapp/
-#
-# -------------------------------------------------------------------
-
-# You can set this here, but it's preferrable to set this in a 
-# project-specific build.properties file.
-#
-# propel.project = bookstore
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-# This is the target database, only considered when generating
-# the SQL for your Propel project. Your possible choices are:
-#
-#   mssql, mysql, oracle, pgsql, sqlite
-# -------------------------------------------------------------------
-
-# You can set this here, but it's preferrable to set this in a 
-# project-specific build.properties file.
-#
-# propel.database = mysql
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addGenericAccessors
-#   If true, Propel adds methods to get database fields by name/position.
-#
-# addGenericMutators
-#   If true, Propel adds methods to set database fields by name/position.
-#
-# addSaveMethod
-#   If true, Propel adds tracking code to determine how to save objects.
-#
-# addTimeStamp
-#   If true, Propel true puts time stamps in phpdoc of generated om files.
-#
-# basePrefix
-#   A string to pre-pend to the file names of base data and peer objects.
-#
-# complexObjectModel
-#   If true, Propel generates data objects with collection support and 
-#   methods to easily retreive foreign key relationships.
-#
-# targetPackage
-#   Sets the PHP "package" the om files will generated to, e.g. 
-#   "com.company.project.om".
-#
-# targetPlatform
-#   Sets whether Propel is building classes for php5 (default) 
-#   or php4 (experimental).
-#
-# packageObjectModel
-#   Sets whether Propel is packaging ObjectModel fro several 
-#   [package].schema.xml files. The <database package="packageName">
-#   attribute has to be set then. (warning: this is experimental!)
-#
-# -------------------------------------------------------------------
-
-# classes will be put in (and  included from) this directory
-# e.g. if package is "bookstore" then om will expect include('bookstore/Book.php'); to work.
-# use dot-path notation -- e.g. my.bookstore -> my/bookstore.
-#
-propel.targetPackage = ${propel.project}
-
-propel.addGenericAccessors = false
-propel.addGenericMutators = false
-propel.addSaveMethod = true
-propel.addTimeStamp = true
-propel.basePrefix = Base
-propel.complexObjectModel = true
-propel.targetPlatform = php5
-propel.packageObjectModel = false
-
-# -------------------------------------------------------------------
-#
-#  D B   C O N N E C T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# Creole connection settings. These connection settings are used by
-# build tagets that perform database operations (e.g. 'insert-sql',
-# 'creole').
-#
-# You can set them here, but it's preferrable to set these properties
-# in a project-specific build.properties file.
-#
-
-# If you want to use a custom driver, specify it below, otherwise
-# leave it blank or comment it out to use Creole stock driver.
-#
-# propel.database.driver = creole.drivers.sqlite.SQLiteConnection
-
-# Note that if you do not wish to specify the database (e.g. if you
-# are using multiple databses) you can use the @DB@ token which
-# will be replaced with a database at runtime.
-#
-# propel.database.url = mysql://root@localhost/bookstore
-
-# For MySQL or Oracle, you also need to specify username & password 
-# propel.database.user = [db username]
-# propel.database.password = [db password]
-
-# Use the URL below to specify a DSN to used to create the database.
-# Note that this URL should not contain the database name, as you will
-# get an error if the database does not exist.
-# (This does not apply to SQLite since the databse is automatically created
-# when the connection is made -- if it does not already exist.)
-#
-# propel.database.createUrl = mysql://root@localhost/
-
-
-# -------------------------------------------------------------------
-#
-# C R E O L E  TO  X M L
-#
-# -------------------------------------------------------------------
-# These settings only applies to the 'creole' target.  
-# -------------------------------------------------------------------
-#
-# samePhpName 
-#   If true, the Creole task will set the phpName attribute for the 
-#   tables and columns to be the same as SQL name.
-#
-# addVendorInfo 
-#   If true, the Creole task will add vendor specific information 
-#   to the database schema
-#
-# addValidators 
-#   Bitfield like option to turn on/off addition of Validator and 
-#   Rule tags to the schema. Uses a boolean syntax like in php.ini.
-#   Allowed tokens are: 
-#      none       add no validators)
-#      all        add all validators)
-#      maxlength  add maxlengths for string type columns)
-#      maxvalue   add maxvalue for numeric columns)
-#      type       add notmatch validators for numeric columns)
-#      required   add required validators for required columns)
-#      unique     add unique validators for unique indexes)
-#   Allowed operators are: 
-#      &          bitwise AND 
-#      |          bitwise OR
-#      ~          bitwise NOT
-#
-# -------------------------------------------------------------------
-
-# propel.samePhpName = false
-# propel.addVendorInfo=true
-# propel.addValidators=none
-
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E   B U I L D   C O N F I G
-#
-# -------------------------------------------------------------------
-# Some databases provide some configuration options that can be set
-# in this script.  
-#
-# === MySQL
-# propel.mysql.tableType
-#   Use this property to set the table type of generated tables (e.g. InnoDB, MyISAM).
diff --git a/debian/propel/usr/share/php/propel/generator/build.xml b/debian/propel/usr/share/php/propel/generator/build.xml
deleted file mode 100644
index b2dfcd1..0000000
--- a/debian/propel/usr/share/php/propel/generator/build.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--
-    Use this file to faciliate easy per-project building.
-    
-    Simply create a build.properties file in your project directory,
-    for example ./projects/bookstore/build.properties, that contains
-    any needed (i.e. to override) values for that project.
-    
-    Call this build script and specify the name of the project and
-    (optionally) the name of the target you wish to execute (default is
-    'main' target) of build-propel.xml.
-
-    Normal use:
-    $> phing   -Dproject=bookstore
-    
-    Specific target: 
-    $> phing -Dproject=bookstore -Dtarget=insert-sql
-
--->
-<project name="propel-project-builder" default="main">
-
-<!-- in case ${project.dir} was specified on command line, we set the project.dir
-     property here.  If it wasn't set, then this will be bogus, but it will
-     be overridden by the "set-project-dir" target. -->    
-<resolvepath propertyName="propel.project.dir" file="${project.dir}" dir="${application.startdir}"/>
-
-<!-- set a default target if none provided -->
-<property name="target" value="main"/>
-
-<!-- Set a default name for the build.properties file.
-		This allows for overriding the name of the build.properties file; however,
-		Propel still expects to find the file in the ${propel.project.dir}.
- -->
-<property name="build.properties" value="build.properties"/>
-	
-<target name="check-buildprops-exists">
-  <available file="${propel.project.dir}/${build.properties}" property="projBuildPopertiesExists"/>  
-</target>
-
-<target name="check-buildprops" unless="projBuildPopertiesExists" depends="check-buildprops-exists">
-		<echo message="====================================================="/>
-		<echo message="Could not open ${build.properties} file:"/>
-		<echo message="		${propel.project.dir}/${build.properties}"/>
-		<echo message=" "/>
-		<echo message="Make sure that '${propel.project.dir}' is a valid path"/>
-		<echo message="and that it contains a ${build.properties} file."/>
-		<echo message="====================================================="/>	
-		
-		<fail message="Missing configuration file (see description above)."/>
-</target>
-
-<target name="check-project-or-dir-set">
-  <condition property="projectOrDirSet">
-  		<or>
-			<isset property="project"/>
-			<isset property="project.dir"/>
-		</or>
-  </condition>
-</target>
-
-<target name="check-buildprops-for-propel-gen" if="using.propel-gen" unless="projBuildPopertiesExists" depends="check-buildprops-exists">
-	<echo message="=========================================================="/>
-	<echo message="Could not open ${build.properties} file:"/>
-	<echo message="		${propel.project.dir}/${build.properties}"/>
-	<echo message=" "/>
-	<echo message="Project directory not specified or invalid. You must "/>
-	<echo message="specify the path to your project directory and your "/>
-	<echo message="project directory must contain your ${build.properties} "/>
-	<echo message="and schema.xml files.                                "/>
-	<echo message=" "/>
-	<echo message="Usage: "/>
-	<echo message=" "/>
-	<echo message="$&gt; propel-gen /path/to/projectdir [target]"/>
-	<echo message=" "/>
-	<echo message="=========================================================="/>	
-	<fail message="No project directory specified."/>
-</target>
-
-<target name="check-project-set" unless="projectOrDirSet" depends="check-project-or-dir-set">
-		<echo message="====================================================="/>
-		<echo message="Project not specified. You must enter a project name. "/>
-		<echo message="In the future you can enter it on the command line: "/>
-		<echo message=" "/>
-		<echo message="-Dproject=bookstore"/>
-		<echo message=" "/>
-		<echo message="This will attempt to find your project directory in"/>
-		<echo message="the default directory (./projects/bookstore)."/>
-		<echo message=" "/>
-		<echo message="You can also avoid this message and specicfy a custom "/>
-		<echo message="directory, using the project.dir property:"/>
-		<echo message=" "/>
-		<echo message="-Dproject.dir=/path/to/bookstore"/>
-		<echo message="====================================================="/>	
-		<input propertyname="project" promptChar=":">Project name</input>
-		<property name="propel.project" value="${project}" override="true"/>
-</target>
-
-<target name="set-project-dir" unless="project.dir" depends="check-project-set">
-	<echo>No project.dir was specified, using default path: ./projects/${project}</echo>
-	<property name="propel.project.dir" value="./projects/${project}" override="true"/>
-</target>
-
-<target name="configure" depends="set-project-dir,check-buildprops-for-propel-gen,check-buildprops">
-	<if>
-		<isset property="additional.properties"/>
-		<then>
-			<echo>Processing additional properties file: ${additional.properties}</echo>
-			<resolvepath propertyName="additional.properties.resolved" file="${additional.properties}" dir="${application.startdir}"/>
-			<property file="${additional.properties.resolved}"/>
-		</then>
-	</if>
-	<echo msg="Loading project-specific props from ${propel.project.dir}/${build.properties}"/>
-	<property file="${propel.project.dir}/${build.properties}"/>
-</target>
-
-<target name="main" depends="configure" description="The main target. Includes project-specific build.properties and calls the build-propel.xml script">
-
- <phing phingfile="./build-propel.xml" target="${target}"/>
- 
-</target>
-
-<!-- 
- Convenience mappings to build-propel.xml main targets 
- 
- This makes it possible to use this buildfile w/o needing to specify
- target as a property, e.g.:
- 
- $> phing -Dproject=bookstore insert-sql
- 
- The main reason for this is just consistency w/ old build-propel.xml file
- (primarily for documentation & user confusion avoidance reasons).  There are relatively
- few & infrequently changing main targets of build-propel.xml, so it's a non-
- issue as far as maintenance is concerned.
--->
-
-<target name="convert-conf" depends="configure">
-	<phing phingfile="build-propel.xml" target="convert-conf"/>
-</target>
-
-<target name="create-db" depends="configure">
-	<phing phingfile="build-propel.xml" target="create-db"/>
-</target>
-
-<target name="creole" depends="configure">
-	<phing phingfile="build-propel.xml" target="creole"/>
-</target>
-
-<target name="reverse" depends="configure">
-	<phing phingfile="build-propel.xml" target="reverse"/>
-</target>
-
-<target name="datadtd" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadtd"/>
-</target>
-
-<target name="datadump" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadump"/>
-</target>
-
-<target name="datasql" depends="configure">
-	<phing phingfile="build-propel.xml" target="datasql"/>
-</target>
-
-<target name="insert-sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="insert-sql"/>
-</target>
-
-<target name="om" depends="configure">
-	<phing phingfile="build-propel.xml" target="om"/>
-</target>
-
-<target name="new-om" depends="configure">
-	<phing phingfile="build-propel.xml" target="new-om"/>
-</target>
-
-<target name="sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="sql"/>
-</target>
-
-<target name="old-sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="old-sql"/>
-</target>
-
-<target name="graphviz" depends="configure">
-	<phing phingfile="build-propel.xml" target="graphviz"/>
-</target>
-
-
-</project>
diff --git a/debian/propel/usr/share/php/propel/generator/build.xml-local b/debian/propel/usr/share/php/propel/generator/build.xml-local
deleted file mode 100644
index d4d4e4c..0000000
--- a/debian/propel/usr/share/php/propel/generator/build.xml-local
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
-    Use this file to faciliate easy per-project building.
-    
-    Simply create a build.properties file in this directory,
-    that contains any needed (i.e. to override) values for this project.
-    
-    Call this build script and specify the name of the project and
-    (optionally) the name of the target you wish to execute (default is
-    'main' target) of build-propel.xml.
-
-    Normal use:
-    $> phing
-    
-    Specific target: 
-    $> phing -Dtarget=insert-sql
-
--->
-<project name="propel-project-builder" default="main" basedir=".">
-
-<!-- set to this dir -->    
-<property name="project.dir" value="."/>
-
-<!-- set a default target if none provided -->
-<property name="target" value="main"/>
-
-<target name="buildpropescheck">
-  <available file="./build.properties" property="projBuildPopertiesExists"/>  
-</target>
-
-<target name="init">
-	<echo msg="Loading project-specific props from ./build.properties"/>
-	<property file="./build.properties"/>
-</target>
-
-<target name="checkproject" unless="propel.project">
-    <fail msg="Build failed. Please make sure that propel.project is set to your project-name in local build.properties"/>
-</target>
-<target name="checkhome" unless="propel.home">
-    <fail msg="Build failed. Please make sure that propel.home is set to the propel-generator-dir in local build.properties"/>
-</target>
-<target name="checkschemadir" unless="propel.schema.dir">
-    <fail msg="Build failed. Please make sure that propel.schema.dir is set to '.' in local build.properties"/>
-</target>
-<target name="checkconfdir" unless="propel.conf.dir">
-    <fail msg="Build failed. Please make sure that propel.conf.dir is set to '.' in local build.properties"/>
-</target>
-<target name="checkoutputdir" unless="propel.output.dir">
-    <fail msg="Build failed. Please make sure that propel.output.dir is set to a directory of your choice (e.g. './build/') local build.properties"/>
-</target>
-<target name="configure" depends="init,checkproject,checkhome,checkschemadir,checkconfdir,checkoutputdir">
-    <property name="project" value="{$propel.project}"/>
-</target>
-
-<target name="main" depends="configure" 
-  description="The main target. Includes project-specific build.properties and calls the build-propel.xml script">	
-
- <phing phingfile="${propel.home}/build-propel.xml" target="${target}"/>
- 
-</target>
-
-<!-- 
- Convenience mappings to build-propel.xml main targets 
- 
- This makes it possible to use this buildfile w/o needing to specify
- target as a property, e.g.:
- 
- $> phing -Dproject=bookstore insert-sql
- 
- The main reason for this is just consistency w/ old build-propel.xml file
- (primarily for documentation & user confusion avoidance reasons).  There are relatively
- few & infrequently changing main targets of build-propel.xml, so it's a non-
- issue as far as maintenance is concerned.
--->
-
-<target name="convert-props" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="convert-props"/>
-</target>
-
-<target name="create-db" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="create-db"/>
-</target>
-
-<target name="creole" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="creole"/>
-</target>
-
-<target name="datadtd" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="datadtd"/>
-</target>
-
-<target name="datadump" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="datadump"/>
-</target>
-
-<target name="datasql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="datasql"/>
-</target>
-
-<target name="insert-sql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="insert-sql"/>
-</target>
-
-<target name="om" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="om"/>
-</target>
-
-<target name="new-om" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="new-om"/>
-</target>
-
-<target name="sql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="sql"/>
-</target>
-
-<target name="old-sql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="old-sql"/>
-</target>
-
-<target name="graphviz" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="graphviz"/>
-</target>
-
-
-</project>
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/EngineException.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/EngineException.php
deleted file mode 100644
index 224c34b..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/EngineException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- *  $Id: EngineException.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/BuildException.php';
-
-/**
- * The base class of all exceptions thrown by the engine.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @author     Jason van Zyl <jvz at apache.org> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine
- */
-class EngineException extends BuildException {}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/GeneratorConfig.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/GeneratorConfig.php
deleted file mode 100644
index d50c1c8..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/GeneratorConfig.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-/*
- *  $Id: GeneratorConfig.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A class that holds build properties and provide a class loading mechanism for the generator.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine
- */
-class GeneratorConfig {
-
-  /**
-   * The build properties.
-   *
-   * @var        array
-   */
-  private $buildProperties = array();
-
-  /**
-   * Construct a new GeneratorConfig.
-   * @param      mixed $props Array or Iterator
-   */
-  public function __construct($props = null)
-  {
-    if ($props) $this->setBuildProperties($props);
-  }
-
-  /**
-   * Gets the build properties.
-   * @return     array
-   */
-  public function getBuildProperties()
-  {
-    return $this->buildProperties;
-  }
-
-  /**
-   * Parses the passed-in properties, renaming and saving eligible properties in this object.
-   *
-   * Renames the propel.xxx properties to just xxx and renames any xxx.yyy properties
-   * to xxxYyy as PHP doesn't like the xxx.yyy syntax.
-   *
-   * @param      mixed $props Array or Iterator
-   */
-  public function setBuildProperties($props)
-  {
-    $this->buildProperties = array();
-
-    $renamedPropelProps = array();
-    foreach ($props as $key => $propValue) {
-      if (strpos($key, "propel.") === 0) {
-        $newKey = substr($key, strlen("propel."));
-        $j = strpos($newKey, '.');
-        while ($j !== false) {
-          $newKey =  substr($newKey, 0, $j) . ucfirst(substr($newKey, $j + 1));
-          $j = strpos($newKey, '.');
-        }
-        $this->setBuildProperty($newKey, $propValue);
-      }
-    }
-  }
-
-  /**
-   * Gets a specific propel (renamed) property from the build.
-   *
-   * @param      string $name
-   * @return     mixed
-   */
-  public function getBuildProperty($name)
-  {
-    return isset($this->buildProperties[$name]) ? $this->buildProperties[$name] : null;
-  }
-
-  /**
-   * Sets a specific propel (renamed) property from the build.
-   *
-   * @param      string $name
-   * @param      mixed $value
-   */
-  public function setBuildProperty($name, $value)
-  {
-    $this->buildProperties[$name] = $value;
-  }
-
-  /**
-   * Resolves and returns the class name based on the specified property value.
-   *
-   * @param      string $propname The name of the property that holds the class path (dot-path notation).
-   * @return     string The class name.
-   * @throws     BuildException If the classname cannot be determined or class cannot be loaded.
-   */
-  public function getClassname($propname)
-  {
-    $classpath = $this->getBuildProperty($propname);
-    if (empty($classpath)) {
-      throw new BuildException("Unable to find class path for '$propname' property.");
-    }
-
-    // This is a slight hack to workaround camel case inconsistencies for the DDL classes.
-    // Basically, we want to turn ?.?.?.sqliteDDLBuilder into ?.?.?.SqliteDDLBuilder
-    $lastdotpos = strrpos($classpath, '.');
-    if ($lastdotpos !== null) {
-      $classpath{$lastdotpos+1} = strtoupper($classpath{$lastdotpos+1});
-    } else {
-      $classpath = ucfirst($classpath);
-    }
-
-    if (empty($classpath)) {
-      throw new BuildException("Unable to find class path for '$propname' property.");
-    }
-
-    $clazz = Phing::import($classpath);
-
-    return $clazz;
-  }
-
-  /**
-   * Resolves and returns the builder class name.
-   *
-   * @param      string $type
-   * @return     string The class name.
-   */
-  public function getBuilderClassname($type)
-  {
-    $propname = 'builder' . ucfirst(strtolower($type)) . 'Class';
-    return $this->getClassname($propname);
-  }
-
-  /**
-   * Creates and configures a new Platform class.
-   *
-   * @param      PDO $con
-   * @return     Platform
-   */
-  public function getConfiguredPlatform(PDO $con = null)
-  {
-    $clazz = $this->getClassname("platformClass");
-    $platform = new $clazz();
-
-    if (!$platform instanceof Platform) {
-      throw new BuildException("Specified platform class ($clazz) does not implement Platform interface.", $this->getLocation());
-    }
-
-    $platform->setConnection($con);
-    $platform->setGeneratorConfig($this);
-    return $platform;
-  }
-
-  /**
-   * Creates and configures a new SchemaParser class for specified platform.
-   * @param      PDO $con
-   * @return     SchemaParser
-   */
-  public function getConfiguredSchemaParser(PDO $con = null)
-  {
-    $clazz = $this->getClassname("reverseParserClass");
-    $parser = new $clazz();
-    if (!$parser instanceof SchemaParser) {
-      throw new BuildException("Specified platform class ($clazz) does implement SchemaParser interface.", $this->getLocation());
-    }
-    $parser->setConnection($con);
-    $parser->setGeneratorConfig($this);
-    return $parser;
-  }
-
-  /**
-   * Gets a configured data model builder class for specified table and based on type.
-   *
-   * @param      Table $table
-   * @param      string $type The type of builder ('ddl', 'sql', etc.)
-   * @return     DataModelBuilder
-   */
-  public function getConfiguredBuilder(Table $table, $type, $cache = true)
-  {
-    $classname = $this->getBuilderClassname($type);
-    $builder = new $classname($table);
-    $builder->setGeneratorConfig($this);
-    return $builder;
-  }
-
-  /**
-   * Gets a configured Pluralizer class.
-   *
-   * @return     Pluralizer
-   */
-  public function getConfiguredPluralizer()
-  {
-    $classname = $this->getBuilderClassname('pluralizer');
-    $pluralizer = new $classname();
-    return $pluralizer;
-  }
-  
-  /**
-   * Gets a configured behavior class
-   *
-   * @param string $name a behavior name
-   * @return string a behavior class name
-   */
-  public function getConfiguredBehavior($name)
-  {
-    $propname = 'behavior' . ucfirst(strtolower($name)) . 'Class';
-    try {
-      $ret = $this->getClassname($propname);
-    } catch (BuildException $e) {
-      // class path not configured
-      $ret = false;
-    }
-    return $ret;    
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php
deleted file mode 100644
index aaa9863..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- *  $Id: AlternativeCodingStandardsBehavior.php $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
- 
-/**
- * Changes the coding standard of Propel generated Model classes
- *  - Opening brackets always use newline, e.g.
- *     if ($foo) {
- *       ...
- *     } else {
- *       ...
- *     }
- *    Becomes:
- *     if ($foo)
- *     {
- *       ...
- *     }
- *     else
- *     {
- *       ...
- *     }
- *  - closing comments are removed, e.g.
- *     } // save()
- *    Becomes:
- *     }
- *   - tabs are replaced by 2 whitespaces
- *   - comments are stripped (optional)
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class AlternativeCodingStandardsBehavior extends Behavior
-{
-	// default parameters value
-  protected $parameters = array(
-  	'brackets_newline'        => 'true',
-  	'remove_closing_comments' => 'true',
-  	'use_whitespace'          => 'true',
-  	'tab_size'                => 2,
-  	'strip_comments'          => 'false'
-  );
-  
-	public function objectFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-	
-	public function extensionObjectFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-
-	public function peerFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-
-	public function extensionPeerFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-	
-	public function tableMapFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-
-	/**
-	 * Transform the coding standards of a PHP sourcecode string
-	 * 
-	 * @param string $script A script string to be filtered, passed as reference
-	 */
-	protected function filter(&$script)
-	{
-		$filter = array();
-		if($this->getParameter('brackets_newline') == 'true') {
-			$filter['#^(\t*)\}\h(else|elseif|catch)(.*)\h\{$#m'] = "$1}
-$1$2$3
-$1{";
-			$filter['#^(\t*)(\w.*)\h\{$#m'] = "$1$2
-$1{";
-		}
-		if ($this->getParameter('remove_closing_comments') == 'true') {
-			$filter['#^(\t*)} //.*$#m'] = "$1}";
-		}
-		if ($this->getParameter('use_whitespace') == 'true') {
-			$filter['#\t#'] = str_repeat(' ', $this->getParameter('tab_size'));
-		}
-		
-		$script = preg_replace(array_keys($filter), array_values($filter), $script);
-		
-		if ($this->getParameter('strip_comments') == 'true') {
-			$script = self::stripComments($script);
-		}
-	}
-	
-	/**
-	 * Remove inline and codeblock comments from a PHP code string
-	 * @param  string $code The input code
-	 * @return string       The input code, without comments
-	 */
-	public static function stripComments($code)
-	{
-		$output  = '';
-		$commentTokens = array(T_COMMENT, T_DOC_COMMENT);
-		foreach (token_get_all($code) as $token) {
-			if (is_array($token)) {
-		    if (in_array($token[0], $commentTokens)) continue;
-				$token = $token[1];
-		  }
-		  $output .= $token;
-		}
-		
-		return $output;
-	}
-}
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/AutoAddPkBehavior.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/AutoAddPkBehavior.php
deleted file mode 100644
index 580d27e..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/AutoAddPkBehavior.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- *  $Id: AutoAddPkBehavior.php 1268 2009-10-30 22:51:21Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
- 
-/**
- * Adds a primary key to models defined without one
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class AutoAddPkBehavior extends Behavior
-{
-  // default parameters value
-  protected $parameters = array(
-    'name'          => 'id',
-    'autoIncrement' => 'true',
-    'type'          => 'INTEGER'
-  );
-
-  /**
-   * Copy the behavior to the database tables
-   * Only for tables that have no Pk
-   */
-  public function modifyDatabase()
-  {
-    foreach ($this->getDatabase()->getTables() as $table)
-    {
-      if(!$table->hasPrimaryKey())
-      {
-        $b = clone $this;
-        $table->addBehavior($b);
-      }
-    }
-  }
-  
-  /**
-   * Add the primary key to the current table
-   */
-  public function modifyTable()
-  {
-    if (!$this->getTable()->hasPrimaryKey())
-    {
-      $columnAttributes = array_merge(array('primaryKey' => 'true'), $this->getParameters());
-      $this->getTable()->addColumn($columnAttributes);
-    }
-  }
-}
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/SoftDeleteBehavior.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/SoftDeleteBehavior.php
deleted file mode 100644
index c85f2fc..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/SoftDeleteBehavior.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-
-/*
- *  $Id: SoftDeleteBehavior.php $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
- 
-/**
- * Gives a model class the ability to remain in database even when the user deletes object
- * Uses an additional column storing the deletion date
- * And an additional condition for every read query to only consider rows with no deletion date
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class SoftDeleteBehavior extends Behavior
-{
-	// default parameters value
-  protected $parameters = array(
-    'add_columns'    => 'true',
-    'deleted_column' => 'deleted_at',
-  );
-  
-  /**
-   * Add the deleted_column to the current table
-   */
-  public function modifyTable()
-  {
-    if ($this->getParameter('add_columns') == 'true')
-    {
-      $this->getTable()->addColumn(array(
-        'name' => $this->getParameter('deleted_column'),
-        'type' => 'TIMESTAMP'
-      ));
-    }
-  }
-  
-  protected function getColumnSetter()
-  {
-  	return 'set' . $this->getColumnForParameter('deleted_column')->getPhpName();
-  }
-  
-  public function preDelete()
-  {
-  	return <<<EOT
-if (!empty(\$ret) && {$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-	\$this->{$this->getColumnSetter()}(time());
-	\$this->save();
-	\$con->commit();
-	return;
-}
-EOT;
-  }
-  
-  public function preSelect()
-  {
-  	return <<<EOT
-if ({$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-	\$criteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, null, Criteria::ISNULL);
-} else {
-	{$this->getTable()->getPhpName()}Peer::enableSoftDelete();
-}
-EOT;
-  }
-  
-  public function objectMethods()
-  {
-  	return <<<EOT
-
-/**
- * Bypass the soft_delete behavior and force a hard delete of the current object
- */
-public function forceDelete(PropelPDO \$con = null)
-{
-	{$this->getTable()->getPhpName()}Peer::disableSoftDelete();
-	\$this->delete(\$con);
-}
-
-/**
- * Undelete a row that was soft_deleted
- *
- * @return     int The number of rows affected by this update and any referring fk objects' save() operations.
- */
-public function unDelete(PropelPDO \$con = null)
-{
-	\$this->{$this->getColumnSetter()}(null);
-	return \$this->save(\$con);
-}
-EOT;
-  }
-  
-  public function staticAttributes()
-  {
-  	return "protected static \$softDelete = true;
-";
-  }
-  
-  public function staticMethods()
-  {
-  	$script = "
-
-/**
- * Enable the soft_delete behavior for this model
- */
-public static function enableSoftDelete()
-{
-	self::\$softDelete = true;
-}
-
-/**
- * Disable the soft_delete behavior for this model
- */
-public static function disableSoftDelete()
-{
-	self::\$softDelete = false;
-}
-
-/**
- * Check the soft_delete behavior for this model
- * @return boolean true if the soft_delete behavior is enabled
- */
-public static function isSoftDeleteEnabled()
-{
-	return self::\$softDelete;
-}
-";
-	
-	$script .= "
-/**
- * Soft delete records, given a {$this->getTable()->getPhpName()} or Criteria object OR a primary key value.
- *
- * @param      mixed \$values Criteria or {$this->getTable()->getPhpName()} object or primary key or array of primary keys
- *              which is used to create the DELETE statement
- * @param      PropelPDO \$con the connection to use
- * @return     int 	The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doSoftDelete(\$values, PropelPDO \$con = null)
-{
-	if (\$values instanceof Criteria) {
-		// rename for clarity
-		\$criteria = clone \$values;
-	} elseif (\$values instanceof {$this->getTable()->getPhpName()}) {
-		// create criteria based on pk values
-		\$criteria = \$values->buildPkeyCriteria();
-	} else {
-		// it must be the primary key
-		\$criteria = new Criteria(self::DATABASE_NAME);";
-		$pks = $this->getTable()->getPrimaryKey();
-		if (count($pks)>1) {
-			$i = 0;
-			foreach ($pks as $col) {
-				$script .= "
-		\$criteria->add({$col->getConstantName()}, \$values[$i], Criteria::EQUAL);";
-				$i++;
-			}
-		} else  {
-			$col = $pks[0];
-			$script .= "
-		\$criteria->add({$col->getConstantName()}, (array) \$values, Criteria::IN);";
-		}
-		$script .= "
-	}
-	\$criteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, time());
-	return {$this->getTable()->getPhpName()}Peer::doUpdate(\$criteria, \$con);
-}
-
-/**
- * Delete or soft delete records, depending on {$this->getTable()->getPhpName()}Peer::\$softDelete
- *
- * @param      mixed \$values Criteria or {$this->getTable()->getPhpName()} object or primary key or array of primary keys
- *              which is used to create the DELETE statement
- * @param      PropelPDO \$con the connection to use
- * @return     int 	The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doDelete2(\$values, PropelPDO \$con = null)
-{
-	if ({$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-		return {$this->getTable()->getPhpName()}Peer::doSoftDelete(\$values, \$con);
-	} else {
-		return {$this->getTable()->getPhpName()}Peer::doForceDelete(\$values, \$con);
-	}	
-}
-
-/**
- * Method to soft delete all rows from the {$this->getTable()->getName()} table.
- *
- * @param      PropelPDO \$con the connection to use
- * @return     int The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doSoftDeleteAll(PropelPDO \$con = null)
-{
-	if (\$con === null) {
-		\$con = Propel::getConnection({$this->getTable()->getPhpName()}Peer::DATABASE_NAME, Propel::CONNECTION_WRITE);
-	}
-	\$selectCriteria = new Criteria();
-	\$selectCriteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, null, Criteria::ISNULL);
-	\$selectCriteria->setDbName({$this->getTable()->getPhpName()}Peer::DATABASE_NAME);
-	\$modifyCriteria = new Criteria();
-	\$modifyCriteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, time());
-	return BasePeer::doUpdate(\$selectCriteria, \$modifyCriteria, \$con);
-}
-
-/**
- * Delete or soft delete all records, depending on {$this->getTable()->getPhpName()}Peer::\$softDelete
- *
- * @param      PropelPDO \$con the connection to use
- * @return     int 	The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doDeleteAll2(PropelPDO \$con = null)
-{
-	if ({$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-		return {$this->getTable()->getPhpName()}Peer::doSoftDeleteAll(\$con);
-	} else {
-		return {$this->getTable()->getPhpName()}Peer::doForceDeleteAll(\$con);
-	}	
-}
-";
-	return $script;
-  }
-  
-  public function peerFilter(&$script)
-  {
-  	$script = str_replace(array(
-  		'public static function doDelete(', 
-  		'public static function doDelete2(',
-  		'public static function doDeleteAll(', 
-  		'public static function doDeleteAll2('
-  	), array(
-  		'public static function doForceDelete(',
-  		'public static function doDelete(',
-  		'public static function doForceDeleteAll(',
-  		'public static function doDeleteAll('
-  	), $script);
-  }
-}
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/TimestampableBehavior.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/TimestampableBehavior.php
deleted file mode 100644
index d8dd924..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/behavior/TimestampableBehavior.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- *  $Id: TimestampableBehavior.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Gives a model class the ability to track creation and last modification dates
- * Uses two additional columns storing the creation and update date
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class TimestampableBehavior extends Behavior
-{
-  // default parameters value
-  protected $parameters = array(
-    'add_columns'   => 'true',
-    'create_column' => 'created_at',
-    'update_column' => 'updated_at'
-  );
-  
-  /**
-   * Add the create_column and update_columns to the current table
-   */
-  public function modifyTable()
-  {
-    if ($this->getParameter('add_columns') == 'true')
-    {
-      $this->getTable()->addColumn(array(
-        'name' => $this->getParameter('create_column'),
-        'type' => 'TIMESTAMP'
-      ));
-      $this->getTable()->addColumn(array(
-        'name' => $this->getParameter('update_column'),
-        'type' => 'TIMESTAMP'
-      ));
-    }
-  }
-  
-  /**
-   * Get the setter of one of the columns of the behavior
-   * 
-   * @param  string $column One of the behavior colums, 'create_column' or 'update_column'
-   * @return string The related setter, 'setCreatedOn' or 'setUpdatedOn'
-   */
-  protected function getColumnSetter($column)
-  {
-    return 'set' . $this->getColumnForParameter($column)->getPhpName();
-  }
-  
-  /**
-   * Add code in ObjectBuilder::preSave
-   *
-   * @return string The code to put at the hook
-   */
-  public function preSave()
-  {
-    return "\$this->" . $this->getColumnSetter('update_column') . "(time());";
-  }
-  
-  /**
-   * Add code in ObjectBuilder::preInsert
-   *
-   * @return string The code to put at the hook
-   */
-  public function preInsert()
-  {
-    return "\$this->" . $this->getColumnSetter('create_column') . "(time());";    
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/DataModelBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/DataModelBuilder.php
deleted file mode 100644
index b6b0572..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/DataModelBuilder.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-
-/*
- *  $Id: DataModelBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * This is the base class for any builder class that is using the data model.
- *
- * This could be extended by classes that build SQL DDL, PHP classes, configuration
- * files, input forms, etc.
- *
- * The GeneratorConfig needs to be set on this class in order for the builders
- * to be able to access the propel generator build properties.  You should be
- * safe if you always use the GeneratorConfig to get a configured builder class
- * anyway.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder
- */
-abstract class DataModelBuilder {
-
-	/**
-	 * The current table.
-	 * @var        Table
-	 */
-	private $table;
-
-	/**
-	 * The generator config object holding build properties, etc.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * An array of warning messages that can be retrieved for display (e.g. as part of phing build process).
-	 * @var        array string[]
-	 */
-	private $warnings = array();
-
-	/**
-	 * Peer builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $peerBuilder;
-
-	/**
-	 * Stub Peer builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubPeerBuilder;
-
-	/**
-	 * Object builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $objectBuilder;
-
-	/**
-	 * Stub Object builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubObjectBuilder;
-
-	/**
-	 * Stub Interface builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $interfaceBuilder;
-
-	/**
-	 * Stub child object for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $multiExtendObjectBuilder;
-
-	/**
-	 * Node object builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nodeBuilder;
-
-	/**
-	 * Node peer builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nodePeerBuilder;
-
-	/**
-	 * Stub node object builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubNodeBuilder;
-
-	/**
-	 * Stub node peer builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubNodePeerBuilder;
-
-	/**
-	 * NestedSet object builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nestedSetBuilder;
-
-	/**
-	 * NestedSet peer builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nestedSetPeerBuilder;
-
-	/**
-	 * The DDL builder for current table.
-	 * @var        DDLBuilder
-	 */
-	private $ddlBuilder;
-
-	/**
-	 * The Data-SQL builder for current table.
-	 * @var        DataSQLBuilder
-	 */
-	private $dataSqlBuilder;
-
-	/**
-	 * The Pluralizer class to use.
-	 * @var        Pluralizer
-	 */
-	private $pluralizer;
-
-
-	/**
-	 * Creates new instance of DataModelBuilder subclass.
-	 * @param      Table $table The Table which we are using to build [OM, DDL, etc.].
-	 */
-	public function __construct(Table $table)
-	{
-		$this->table = $table;
-	}
-
-	/**
-	 * Returns new or existing Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getPeerBuilder()
-	{
-		if (!isset($this->peerBuilder)) {
-			$this->peerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'peer');
-		}
-		return $this->peerBuilder;
-	}
-
-	/**
-	 * Returns new or existing Pluralizer class.
-	 * @return     Pluralizer
-	 */
-	public function getPluralizer()
-	{
-		if (!isset($this->pluralizer)) {
-			$this->pluralizer = $this->getGeneratorConfig()->getConfiguredPluralizer();
-		}
-		return $this->pluralizer;
-	}
-
-	/**
-	 * Returns new or existing stub Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getStubPeerBuilder()
-	{
-		if (!isset($this->stubPeerBuilder)) {
-			$this->stubPeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'peerstub');
-		}
-		return $this->stubPeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getObjectBuilder()
-	{
-		if (!isset($this->objectBuilder)) {
-			$this->objectBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'object');
-		}
-		return $this->objectBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getStubObjectBuilder()
-	{
-		if (!isset($this->stubObjectBuilder)) {
-			$this->stubObjectBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'objectstub');
-		}
-		return $this->stubObjectBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub Interface builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getInterfaceBuilder()
-	{
-		if (!isset($this->interfaceBuilder)) {
-			$this->interfaceBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'interface');
-		}
-		return $this->interfaceBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub child object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getMultiExtendObjectBuilder()
-	{
-		if (!isset($this->multiExtendObjectBuilder)) {
-			$this->multiExtendObjectBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'objectmultiextend');
-		}
-		return $this->multiExtendObjectBuilder;
-	}
-
-	/**
-	 * Returns new or existing node Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getNodeBuilder()
-	{
-		if (!isset($this->nodeBuilder)) {
-			$this->nodeBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'node');
-		}
-		return $this->nodeBuilder;
-	}
-
-	/**
-	 * Returns new or existing node Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getNodePeerBuilder()
-	{
-		if (!isset($this->nodePeerBuilder)) {
-			$this->nodePeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nodepeer');
-		}
-		return $this->nodePeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub node Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getStubNodeBuilder()
-	{
-		if (!isset($this->stubNodeBuilder)) {
-			$this->stubNodeBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nodestub');
-		}
-		return $this->stubNodeBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub node Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getStubNodePeerBuilder()
-	{
-		if (!isset($this->stubNodePeerBuilder)) {
-			$this->stubNodePeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nodepeerstub');
-		}
-		return $this->stubNodePeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing nested set object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getNestedSetBuilder()
-	{
-		if (!isset($this->nestedSetBuilder)) {
-			$this->nestedSetBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nestedset');
-		}
-		return $this->nestedSetBuilder;
-	}
-
-	/**
-	 * Returns new or existing nested set Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getNestedSetPeerBuilder()
-	{
-		if (!isset($this->nestedSetPeerBuilder)) {
-			$this->nestedSetPeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nestedsetpeer');
-		}
-		return $this->nestedSetPeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing ddl builder class for this table.
-	 * @return     DDLBuilder
-	 */
-	public function getDDLBuilder()
-	{
-		if (!isset($this->ddlBuilder)) {
-			$this->ddlBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'ddl');
-		}
-		return $this->ddlBuilder;
-	}
-
-	/**
-	 * Returns new or existing data sql builder class for this table.
-	 * @return     DataSQLBuilder
-	 */
-	public function getDataSQLBuilder()
-	{
-		if (!isset($this->dataSqlBuilder)) {
-			$this->dataSqlBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'datasql');
-		}
-		return $this->dataSqlBuilder;
-	}
-
-	/**
-	 * Convenience method to return a NEW Peer class builder instance
-	 * .
-	 * This is used very frequently from the peer and object builders to get
-	 * a peer builder for a RELATED table.
-	 *
-	 * @param      Table $table
-	 * @return     PeerBuilder
-	 */
-	public function getNewPeerBuilder(Table $table)
-	{
-		return $this->getGeneratorConfig()->getConfiguredBuilder($table, 'peer');
-	}
-
-	/**
-	 * Convenience method to return a NEW Object class builder instance.
-	 *
-	 * This is used very frequently from the peer and object builders to get
-	 * an object builder for a RELATED table.
-	 *
-	 * @param      Table $table
-	 * @return     ObjectBuilder
-	 */
-	public function getNewObjectBuilder(Table $table)
-	{
-		return $this->getGeneratorConfig()->getConfiguredBuilder($table, 'object');
-	}
-
-	/**
-	 * Gets the GeneratorConfig object.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig()
-	{
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Get a specific [name transformed] build property.
-	 *
-	 * @param      string $name
-	 * @return     string
-	 */
-	public function getBuildProperty($name)
-	{
-		if ($this->getGeneratorConfig()) {
-			return $this->getGeneratorConfig()->getBuildProperty($name);
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * Sets the GeneratorConfig object.
-	 *
-	 * @param      GeneratorConfig $v
-	 */
-	public function setGeneratorConfig(GeneratorConfig $v)
-	{
-		$this->generatorConfig = $v;
-	}
-
-	/**
-	 * Sets the table for this builder.
-	 * @param      Table $table
-	 */
-	public function setTable(Table $table)
-	{
-		$this->table = $table;
-	}
-
-	/**
-	 * Returns the current Table object.
-	 * @return     Table
-	 */
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	/**
-	 * Convenience method to returns the Platform class for this table (database).
-	 * @return     Platform
-	 */
-	public function getPlatform()
-	{
-		if ($this->getTable() && $this->getTable()->getDatabase()) {
-			return $this->getTable()->getDatabase()->getPlatform();
-		}
-	}
-
-	/**
-	 * Convenience method to returns the database for current table.
-	 * @return     Database
-	 */
-	public function getDatabase()
-	{
-		if ($this->getTable()) {
-			return $this->getTable()->getDatabase();
-		}
-	}
-
-	/**
-	 * Pushes a message onto the stack of warnings.
-	 * @param      string $msg The warning message.
-	 */
-	protected function warn($msg)
-	{
-		$this->warnings[] = $msg;
-	}
-
-	/**
-	 * Gets array of warning messages.
-	 * @return     array string[]
-	 */
-	public function getWarnings()
-	{
-		return $this->warnings;
-	}
-
-	/**
-	 * Wraps call to Platform->quoteIdentifier() with a check to see whether quoting is enabled.
-	 *
-	 * All subclasses should call this quoteIdentifier() method rather than calling the Platform
-	 * method directly.  This method is used by both DataSQLBuilder and DDLBuilder, and potentially
-	 * in the OM builders also, which is why it is defined in this class.
-	 *
-	 * @param      string $text The text to quote.
-	 * @return     string Quoted text.
-	 */
-	public function quoteIdentifier($text)
-	{
-		if (!$this->getBuildProperty('disableIdentifierQuoting')) {
-			return $this->getPlatform()->quoteIdentifier($text);
-		}
-		return $text;
-	}
-
-	/**
-	 * Returns the name of the current class being built, with a possible prefix.
-	 * @return     string
-	 * @see        OMBuilder#getClassname()
-	 */
-	public function prefixClassname($identifier)
-	{
-		return $this->getBuildProperty('classPrefix') . $identifier;
-	}
-
-	/**
-	 * Returns the name of the current table being built, with a possible prefix.
-	 * @return     string
-	 */
-	public function prefixTablename($identifier)
-	{
-		return $this->getBuildProperty('tablePrefix') . $identifier;
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/ClassTools.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/ClassTools.php
deleted file mode 100644
index 6061f47..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/ClassTools.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/*
- *  $Id: ClassTools.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
- /**
-  * Tools to support class & package inclusion and referencing.
-  *
-  * @author     Hans Lellelid <hans at xmpl.org>
-  * @version    $Revision: 1262 $
-  * @package    propel.engine.builder.om
-  */
-class ClassTools {
-
-	/**
-	 * Gets just classname, given a dot-path to class.
-	 * @param      string $qualifiedName
-	 * @return     string
-	 */
-	public static function classname($qualifiedName)
-	{
-		$pos = strrpos($qualifiedName, '.');
-		if ($pos === false) {
-			return $qualifiedName;  // there is no '.' in the qualifed name
-		} else {
-			return substr($qualifiedName, $pos + 1); // start just after '.'
-		}
-	}
-
-	/**
-	 * Gets the path to be used in include()/require() statement.
-	 *
-	 * Supports multiple function signatures:
-	 *
-	 * (1) getFilePath($dotPathClass);
-	 * (2) getFilePath($dotPathPrefix, $className);
-	 * (3) getFilePath($dotPathPrefix, $className, $extension);
-	 *
-	 * @param      string $path dot-path to class or to package prefix.
-	 * @param      string $classname class name
-	 * @param      string $extension The extension to use on the file.
-	 * @return     string The constructed file path.
-	 */
-	public static function getFilePath($path, $classname = null, $extension = '.php')
-	{
-		$path = strtr(ltrim($path, '.'), '.', '/');
-		if ($classname !== null) {
-			if ($path !== "") { $path .= '/'; }
-			return $path . $classname . $extension;
-		} else {
-			return $path . $extension;
-		}
-	}
-
-	/**
-	 * Gets the basePeer path if specified for table/db.
-	 * If not, will return 'propel.util.BasePeer'
-	 * @return     string
-	 */
-	public static function getBasePeer(Table $table) {
-		$class = $table->getBasePeer();
-		if ($class === null) {
-			$class = "propel.util.BasePeer";
-		}
-		return $class;
-	}
-
-	/**
-	 * Gets the baseClass path if specified for table/db.
-	 * If not, will return 'propel.om.BaseObject'
-	 * @return     string
-	 */
-	public static function getBaseClass(Table $table) {
-		$class = $table->getBaseClass();
-		if ($class === null) {
-			$class = "propel.om.BaseObject";
-		}
-		return $class;
-	}
-
-	/**
-	 * Gets the interface path if specified for table.
-	 * If not, will return 'propel.om.Persistent'.
-	 * @return     string
-	 */
-	public static function getInterface(Table $table) {
-		$interface = $table->getInterface();
-		if ($interface === null && !$table->isReadOnly()) {
-			$interface = "propel.om.Persistent";
-		}
-		return $interface;
-	}
-
-	/**
-	 * Gets a list of PHP reserved words.
-	 *
-	 * @return     array string[]
-	 */
-	public static function getPhpReservedWords()
-	{
-		return array(
-			'and', 'or', 'xor', 'exception', '__FILE__', '__LINE__',
-			'array', 'as', 'break', 'case', 'class', 'const', 'continue',
-			'declare', 'default', 'die', 'do', 'echo', 'else', 'elseif', 'empty',
-			'enddeclare', 'endfor', 'endforeach', 'endif', 'endswitch', 'endwhile',
-			'eval', 'exit', 'extends', 'for', 'foreach', 'function', 'global',
-			'if', 'include', 'include_once', 'isset', 'list', 'new', 'print', 'require',
-			'require_once', 'return', 'static', 'switch', 'unset', 'use', 'var', 'while',
-			'__FUNCTION__', '__CLASS__', '__METHOD__', 'final', 'php_user_filter', 'interface',
-			'implements', 'extends', 'public', 'protected', 'private', 'abstract', 'clone', 'try', 'catch',
-			'throw', 'this', 'namespace'
-		);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/OMBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/OMBuilder.php
deleted file mode 100644
index af916ea..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/OMBuilder.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-
-/*
- *  $Id: OMBuilder.php 1524 2010-02-04 17:22:16Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/DataModelBuilder.php';
-
-/**
- * Baseclass for OM-building classes.
- *
- * OM-building classes are those that build a PHP (or other) class to service
- * a single table.  This includes Peer classes, Entity classes, Map classes,
- * Node classes, Nested Set classes, etc.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om
- */
-abstract class OMBuilder extends DataModelBuilder {
-
-	/**
-	 * Builds the PHP source for current class and returns it as a string.
-	 *
-	 * This is the main entry point and defines a basic structure that classes should follow.
-	 * In most cases this method will not need to be overridden by subclasses.  This method
-	 * does assume that the output language is PHP code, so it will need to be overridden if
-	 * this is not the case.
-	 *
-	 * @return     string The resulting PHP sourcecode.
-	 */
-	public function build()
-	{
-		$this->validateModel();
-
-		$script = "<" . "?php\n"; // intentional concatenation
-		if ($this->isAddIncludes()) {
-			$this->addIncludes($script);
-		}
-		$this->addClassOpen($script);
-		$this->addClassBody($script);
-		$this->addClassClose($script);
-		return $script;
-	}
-
-	/**
-	 * Validates the current table to make sure that it won't
-	 * result in generated code that will not parse.
-	 *
-	 * This method may emit warnings for code which may cause problems
-	 * and will throw exceptions for errors that will definitely cause
-	 * problems.
-	 */
-	protected function validateModel()
-	{
-		// Validation is currently only implemented in the subclasses.
-	}
-
-	/**
-	 * Creates a $obj = new Book(); code snippet. Can be used by frameworks, for instance, to
-	 * extend this behavior, e.g. initialize the object after creating the instance or so.
-	 *
-	 * @return     string Some code
-	 */
-	public function buildObjectInstanceCreationCode($objName, $clsName)
-	{
-		return "$objName = new $clsName();";
-	}
-
-	/**
-	 * Returns the qualified (prefixed) classname that is being built by the current class.
-	 * This method must be implemented by child classes.
-	 * @return     string
-	 */
-	abstract public function getUnprefixedClassname();
-
-	/**
-	 * Returns the prefixed clasname that is being built by the current class.
-	 * @return     string
-	 * @see        DataModelBuilder#prefixClassname()
-	 */
-	public function getClassname()
-	{
-		return $this->prefixClassname($this->getUnprefixedClassname());
-	}
-	/**
-	 * Gets the dot-path representation of current class being built.
-	 * @return     string
-	 */
-	public function getClasspath()
-	{
-		if ($this->getPackage()) {
-			$path = $this->getPackage() . '.' . $this->getClassname();
-		} else {
-			$path = $this->getClassname();
-		}
-		return $path;
-	}
-
-	/**
-	 * Gets the full path to the file for the current class.
-	 * @return     string
-	 */
-	public function getClassFilePath()
-	{
-		return ClassTools::getFilePath($this->getPackage(), $this->getClassname());
-	}
-
-	/**
-	 * Gets package name for this table.
-	 * This is overridden by child classes that have different packages.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		$pkg = ($this->getTable()->getPackage() ? $this->getTable()->getPackage() : $this->getDatabase()->getPackage());
-		if (!$pkg) {
-			$pkg = $this->getBuildProperty('targetPackage');
-		}
-		return $pkg;
-	}
-
-	/**
-	 * Returns filesystem path for current package.
-	 * @return     string
-	 */
-	public function getPackagePath()
-	{
-		return strtr($this->getPackage(), '.', '/');
-	}
-
-	/**
-	 * Shortcut method to return the [stub] peer classname for current table.
-	 * This is the classname that is used whenever object or peer classes want
-	 * to invoke methods of the peer classes.
-	 * @return     string (e.g. 'MyPeer')
-	 * @see        StubPeerBuilder::getClassname()
-	 */
-	public function getPeerClassname() {
-		return $this->getStubPeerBuilder()->getClassname();
-	}
-
-	/**
-	 * Returns the object classname for current table.
-	 * This is the classname that is used whenever object or peer classes want
-	 * to invoke methods of the object classes.
-	 * @return     string (e.g. 'My')
-	 * @see        StubPeerBuilder::getClassname()
-	 */
-	public function getObjectClassname() {
-		return $this->getStubObjectBuilder()->getClassname();
-	}
-
-	/**
-	 * Get the column constant name (e.g. PeerName::COLUMN_NAME).
-	 *
-	 * @param      Column $col The column we need a name for.
-	 * @param      string $classname The Peer classname to use.
-	 *
-	 * @return     string If $classname is provided, then will return $classname::COLUMN_NAME; if not, then the peername is looked up for current table to yield $currTablePeer::COLUMN_NAME.
-	 */
-	public function getColumnConstant($col, $classname = null)
-	{
-		if ($col === null) {
-			$e = new Exception("No col specified.");
-			print $e;
-			throw $e;
-		}
-		if ($classname === null) {
-			return $this->getBuildProperty('classPrefix') . $col->getConstantName();
-		}
-		// was it overridden in schema.xml ?
-		if ($col->getPeerName()) {
-			$const = strtoupper($col->getPeerName());
-		} else {
-			$const = strtoupper($col->getName());
-		}
-		return $classname.'::'.$const;
-	}
-
-	/**
-	 * Gets the basePeer path if specified for table/db.
-	 * If not, will return 'propel.util.BasePeer'
-	 * @return     string
-	 */
-	public function getBasePeer(Table $table) {
-		$class = $table->getBasePeer();
-		if ($class === null) {
-			$class = "propel.util.BasePeer";
-		}
-		return $class;
-	}
-
-	/**
-	 * Convenience method to get the foreign Table object for an fkey.
-	 * @return     Table
-	 */
-	protected function getForeignTable(ForeignKey $fk)
-	{
-		return $this->getTable()->getDatabase()->getTable($fk->getForeignTableName());
-	}
-
-	/**
-	 * Gets the PHP method name affix to be used for fkeys for the current table (not referrers to this table).
-	 *
-	 * The difference between this method and the getRefFKPhpNameAffix() method is that in this method the
-	 * classname in the affix is the foreign table classname.
-	 *
-	 * @param      ForeignKey $fk The local FK that we need a name for.
-	 * @param      boolean $plural Whether the php name should be plural (e.g. initRelatedObjs() vs. addRelatedObj()
-	 * @return     string
-	 */
-	public function getFKPhpNameAffix(ForeignKey $fk, $plural = false)
-	{
-		if ($fk->getPhpName()) {
-			if ($plural) {
-				return $this->getPluralizer()->getPluralForm($fk->getPhpName());
-			} else {
-				return $fk->getPhpName();
-			}
-		} else {
-			$className = $this->getForeignTable($fk)->getPhpName();
-			if ($plural) {
-				$className = $this->getPluralizer()->getPluralForm($className);
-			}
-			return $className . $this->getRelatedBySuffix($fk, true);
-		}
-	}
-
-	/**
-	 * Gets the PHP method name affix to be used for referencing foreign key methods and variable names (e.g. set????(), $coll???).
-	 *
-	 * The difference between this method and the getFKPhpNameAffix() method is that in this method the
-	 * classname in the affix is the classname of the local fkey table.
-	 *
-	 * @param      ForeignKey $fk The referrer FK that we need a name for.
-	 * @param      boolean $plural Whether the php name should be plural (e.g. initRelatedObjs() vs. addRelatedObj()
-	 * @return     string
-	 */
-	public function getRefFKPhpNameAffix(ForeignKey $fk, $plural = false)
-	{
-		if ($fk->getRefPhpName()) {
-			if ($plural) {
-				return $this->getPluralizer()->getPluralForm($fk->getRefPhpName());
-			} else {
-				return $fk->getRefPhpName();
-			}
-		} else {
-			$className = $fk->getTable()->getPhpName();
-			if ($plural) {
-				$className = $this->getPluralizer()->getPluralForm($className);
-			}
-			return $className . $this->getRelatedBySuffix($fk);
-		}
-	}
-
-	/**
-	 * Gets the "RelatedBy*" suffix (if needed) that is attached to method and variable names.
-	 *
-	 * The related by suffix is based on the local columns of the foreign key.  If there is more than
-	 * one column in a table that points to the same foreign table, then a 'RelatedByLocalColName' suffix
-	 * will be appended.
-	 *
-	 * @return     string
-	 */
-	protected function getRelatedBySuffix(ForeignKey $fk, $columnCheck = false)
-	{
-		$relCol = "";
-		foreach ($fk->getLocalColumns() as $columnName) {
-			$column = $fk->getTable()->getColumn($columnName);
-			if (!$column) {
-				throw new Exception("Could not fetch column: $columnName in table " . $fk->getTable()->getName());
-			}
-
-			if ( count($column->getTable()->getForeignKeysReferencingTable($fk->getForeignTableName())) > 1
-			|| $fk->getForeignTableName() == $fk->getTable()->getName()) {
-				// if there are seeral foreign keys that point to the same table
-				// then we need to generate methods like getAuthorRelatedByColName()
-				// instead of just getAuthor().  Currently we are doing the same
-				// for self-referential foreign keys, to avoid confusion.
-				$relCol .= $column->getPhpName();
-			}
-		}
-
-		#var_dump($fk->getForeignTableName() . ' - ' .$fk->getTableName() . ' - ' . $this->getTable()->getName());
-
-		#$fk->getForeignTableName() != $this->getTable()->getName() &&
-		// @todo comment on it
-		if ($columnCheck && !$relCol && $fk->getTable()->getColumn($fk->getForeignTableName())) {
-			foreach ($fk->getLocalColumns() as $columnName) {
-				$column = $fk->getTable()->getColumn($columnName);
-				$relCol .= $column->getPhpName();
-			}
-		}
-
-
-		if ($relCol != "") {
-			$relCol = "RelatedBy" . $relCol;
-		}
-
-		return $relCol;
-	}
-	
-	/**
-	 * Whether to add the include statements.
-	 * This is based on the build property propel.addIncludes
-	 */
-	protected function isAddIncludes()
-	{
-		return $this->getBuildProperty('addIncludes');
-	}
-	
-	/**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @param string $modifier The name of the modifier object providing the method in the behavior
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName, $modifier)
-  {
-    $modifierGetter = 'get' . $modifier;
-    foreach ($this->getTable()->getBehaviors() as $behavior) {
-      if(method_exists($behavior->$modifierGetter(), $hookName)) { 
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @param string $modifier The name of the modifier object providing the method in the behavior
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, $modifier, &$script, $tab = "		")
-  {
-    $modifierGetter = 'get' . $modifier;
-    foreach ($this->getTable()->getBehaviors() as $behavior) {
-      $modifier = $behavior->$modifierGetter();
-      if(method_exists($modifier, $hookName)) {
-        if (strpos($hookName, 'Filter') !== false) {
-          // filter hook: the script string will be modified by the behavior
-          $modifier->$hookName($script);
-        } else {
-          // regular hook: the behavior returns a string to append to the script string
-          $script .= "\n" . $tab . '// ' . $behavior->getName() . " behavior\n";
-          $script .= preg_replace('/^/m', $tab, $modifier->$hookName());           
-         }
-      }
-    }
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/ObjectBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/ObjectBuilder.php
deleted file mode 100644
index 4432c74..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/ObjectBuilder.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/*
- *  $Id: ObjectBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * Base class for Peer-building classes.
- *
- * This class is designed so that it can be extended by a PHP4PeerBuilder in addition
- * to the "standard" PHP5PeerBuilder and PHP5ComplexOMPeerBuilder.  Hence, this class
- * should not have any actual template code in it -- simply basic logic & utility
- * methods.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om
- */
-abstract class ObjectBuilder extends OMBuilder {
-
-	/**
-	 * Constructs a new PeerBuilder subclass.
-	 */
-	public function __construct(Table $table) {
-		parent::__construct($table);
-	}
-
-	/**
-	 * This method adds the contents of the generated class to the script.
-	 *
-	 * This method is abstract and should be overridden by the subclasses.
-	 *
-	 * Hint: Override this method in your subclass if you want to reorganize or
-	 * drastically change the contents of the generated peer class.
-	 *
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addClassBody(&$script);
-
-	/**
-	 * Adds the getter methods for the column values.
-	 * This is here because it is probably generic enough to apply to templates being generated
-	 * in different langauges (e.g. PHP4 and PHP5).
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addColumnAccessorMethods(&$script)
-	{
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-
-			// if they're not using the DateTime class than we will generate "compatibility" accessor method
-			if ($col->getType() === PropelTypes::DATE || $col->getType() === PropelTypes::TIME || $col->getType() === PropelTypes::TIMESTAMP) {
-				$this->addTemporalAccessor($script, $col);
-			} else {
-				$this->addDefaultAccessor($script, $col);
-			}
-
-			if ($col->isLazyLoad()) {
-				$this->addLazyLoader($script, $col);
-			}
-		}
-	}
-
-	/**
-	 * Adds the mutator (setter) methods for setting column values.
-	 * This is here because it is probably generic enough to apply to templates being generated
-	 * in different langauges (e.g. PHP4 and PHP5).
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addColumnMutatorMethods(&$script)
-	{
-		foreach ($this->getTable()->getColumns() as $col) {
-
-			if ($col->isLobType()) {
-				$this->addLobMutator($script, $col);
-			} elseif ($col->getType() === PropelTypes::DATE || $col->getType() === PropelTypes::TIME || $col->getType() === PropelTypes::TIMESTAMP) {
-				$this->addTemporalMutator($script, $col);
-			} else {
-				$this->addDefaultMutator($script, $col);
-			}
-		}
-	}
-
-
-	/**
-	 * Gets the baseClass path if specified for table/db.
-	 * If not, will return 'propel.om.BaseObject'
-	 * @return     string
-	 */
-	protected function getBaseClass() {
-		$class = $this->getTable()->getBaseClass();
-		if ($class === null) {
-			$class = "propel.om.BaseObject";
-		}
-		return $class;
-	}
-
-	/**
-	 * Gets the interface path if specified for current table.
-	 * If not, will return 'propel.om.Persistent'.
-	 * @return     string
-	 */
-	protected function getInterface() {
-		$interface = $this->getTable()->getInterface();
-		if ($interface === null && !$this->getTable()->isReadOnly()) {
-			$interface = "propel.om.Persistent";
-		}
-		return $interface;
-	}
-
-	/**
-	 * Whether to add the generic mutator methods (setByName(), setByPosition(), fromArray()).
-	 * This is based on the build property propel.addGenericMutators, and also whether the
-	 * table is read-only or an alias.
-	 */
-	protected function isAddGenericMutators()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericMutators') && !$table->isReadOnly());
-	}
-
-	/**
-	 * Whether to add the generic accessor methods (getByName(), getByPosition(), toArray()).
-	 * This is based on the build property propel.addGenericAccessors, and also whether the
-	 * table is an alias.
-	 */
-	protected function isAddGenericAccessors()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericAccessors'));
-	}
-
-	/**
-	 * Whether to add the validate() method.
-	 * This is based on the build property propel.addValidateMethod
-	 */
-	protected function isAddValidateMethod()
-	{
-		return $this->getBuildProperty('addValidateMethod');
-	}
-	
-	protected function hasDefaultValues()
-	{
-		foreach ($this->getTable()->getColumns() as $col) {
-			if($col->getDefaultValue() !== null) return true;
-		}
-		return false;
-	}
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName)
-  {
-    return parent::hasBehaviorModifier($hookName, 'ObjectBuilderModifier');
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, &$script, $tab = "		")
-  {
-    return parent::applyBehaviorModifier($hookName, 'ObjectBuilderModifier', $script, $tab);
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/PeerBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/PeerBuilder.php
deleted file mode 100644
index dc87a0c..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/PeerBuilder.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/*
- *  $Id: PeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * Base class for Peer-building classes.
- *
- * This class is designed so that it can be extended by a PHP4PeerBuilder in addition
- * to the "standard" PHP5PeerBuilder and PHP5ComplexOMPeerBuilder.  Hence, this class
- * should not have any actual template code in it -- simply basic logic & utility
- * methods.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om
- */
-abstract class PeerBuilder extends OMBuilder {
-
-	protected $basePeerClass;
-	protected $basePeerClassname;
-
-	/**
-	 * Constructs a new PeerBuilder subclass.
-	 */
-	public function __construct(Table $table) {
-		parent::__construct($table);
-		$this->basePeerClassname = $this->basePeerClass = $this->getBasePeer($table);
-		$pos = strrpos($this->basePeerClassname, '.');
-		if ($pos !== false) {
-			$this->basePeerClassname = substr($this->basePeerClassname, $pos + 1);
-		}
-	}
-
-	/**
-	 * Adds the addSelectColumns(), doCount(), etc. methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSelectMethods(&$script)
-	{
-		$this->addAddSelectColumns($script);
-
-		$this->addDoCount($script);
-
-		// consider refactoring the doSelect stuff
-		// into a top-level method
-		$this->addDoSelectOne($script);
-		$this->addDoSelect($script);
-		$this->addDoSelectStmt($script);	 // <-- there's PDO code in here
-
-		$this->addAddInstanceToPool($script);
-		$this->addRemoveInstanceFromPool($script);
-		$this->addGetInstanceFromPool($script);
-		$this->addClearInstancePool($script);
-		$this->addClearRelatedInstancePool($script);
-
-		$this->addGetPrimaryKeyHash($script);
-		$this->addPopulateObjects($script); // <-- there's PDO code in here
-
-	}
-
-	/**
-	 * Adds the correct getOMClass() method, depending on whether this table uses inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClassMethod(&$script)
-	{
-		$table = $this->getTable();
-		if ($table->getChildrenColumn()) {
-			if ($table->isAbstract()) {
-				$this->addGetOMClass_Inheritance_Abstract($script);
-			} else {
-				$this->addGetOMClass_Inheritance($script);
-			}
-		} else {
-			if ($table->isAbstract()) {
-				$this->addGetOMClass_NoInheritance_Abstract($script);
-			} else {
-				$this->addGetOMClass_NoInheritance($script);
-			}
-		}
-	}
-
-	/**
-	 * Adds the doInsert(), doUpdate(), doDeleteAll(), doValidate(), etc. methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addUpdateMethods(&$script)
-	{
-		$this->addDoInsert($script);
-		$this->addDoUpdate($script);
-		$this->addDoDeleteAll($script);
-		$this->addDoDelete($script);
-		if ($this->isDeleteCascadeEmulationNeeded()) {
-			$this->addDoOnDeleteCascade($script);
-		}
-		if ($this->isDeleteSetNullEmulationNeeded()) {
-			$this->addDoOnDeleteSetNull($script);
-		}
-		$this->addDoValidate($script);
-	}
-
-	/**
-	 * Adds the retrieveByPK() (and possibly retrieveByPKs()) method(s) appropriate for this class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPKMethods(&$script)
-	{
-		if (count($this->getTable()->getPrimaryKey()) === 1) {
-			$this->addRetrieveByPK_SinglePK($script);
-			$this->addRetrieveByPKs_SinglePK($script);
-		} else {
-			$this->addRetrieveByPK_MultiPK($script);
-		}
-	}
-
-	/**
-	 * This method adds the contents of the generated class to the script.
-	 *
-	 * This method contains the high-level logic that determines which methods
-	 * get generated.
-	 *
-	 * Hint: Override this method in your subclass if you want to reorganize or
-	 * drastically change the contents of the generated peer class.
-	 *
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassBody(&$script)
-	{
-
-		$table = $this->getTable();
-
-		if (!$table->isAlias()) {
-			$this->addConstantsAndAttributes($script);
-		}
-
-		$this->addTranslateFieldName($script);
-		$this->addGetFieldNames($script);
-
-		if (!$table->isAlias()) {
-			$this->addAlias($script); // alias() utility method (deprecated?)
-			$this->addSelectMethods($script);
-			$this->addGetTableMap($script);
-		}
-		
-		$this->addBuildTableMap($script);
-
-		$this->addGetOMClassMethod($script);
-
-		// add the insert, update, delete, validate etc. methods
-		if (!$table->isAlias() && !$table->isReadOnly()) {
-			$this->addUpdateMethods($script);
-		}
-
-		if (count($table->getPrimaryKey()) > 0) {
-			$this->addRetrieveByPKMethods($script);
-		}
-	}
-
-	/**
-	 * Whether the platform in use requires ON DELETE CASCADE emulation and whether there are references to this table.
-	 * @return     boolean
-	 */
-	protected function isDeleteCascadeEmulationNeeded()
-	{
-		$table = $this->getTable();
-		if ((!$this->getPlatform()->supportsNativeDeleteTrigger() || $this->getBuildProperty('emulateForeignKeyConstraints')) && count($table->getReferrers()) > 0) {
-			foreach ($table->getReferrers() as $fk) {
-				if ($fk->getOnDelete() == ForeignKey::CASCADE) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Whether the platform in use requires ON DELETE SETNULL emulation and whether there are references to this table.
-	 * @return     boolean
-	 */
-	protected function isDeleteSetNullEmulationNeeded()
-	{
-		$table = $this->getTable();
-		if ((!$this->getPlatform()->supportsNativeDeleteTrigger() || $this->getBuildProperty('emulateForeignKeyConstraints')) && count($table->getReferrers()) > 0) {
-			foreach ($table->getReferrers() as $fk) {
-				if ($fk->getOnDelete() == ForeignKey::SETNULL) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Whether to add the generic mutator methods (setByName(), setByPosition(), fromArray()).
-	 * This is based on the build property propel.addGenericMutators, and also whether the
-	 * table is read-only or an alias.
-	 * @return     boolean
-	 */
-	protected function isAddGenericMutators()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericMutators') && !$table->isReadOnly());
-	}
-
-	/**
-	 * Whether to add the generic accessor methods (getByName(), getByPosition(), toArray()).
-	 * This is based on the build property propel.addGenericAccessors, and also whether the
-	 * table is an alias.
-	 * @return     boolean
-	 */
-	protected function isAddGenericAccessors()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericAccessors'));
-	}
-
-	/**
-	 * Returns the retrieveByPK method name to use for this table.
-	 * If the table is an alias then the method name looks like "retrieveTablenameByPK"
-	 * otherwise simply "retrieveByPK".
-	 * @return     string
-	 */
-	public function getRetrieveMethodName()
-	{
-		if ($this->getTable()->isAlias()) {
-			$retrieveMethod = "retrieve" . $this->getTable()->getPhpName() . "ByPK";
-		} else {
-			$retrieveMethod = "retrieveByPK";
-		}
-		return $retrieveMethod;
-	}
-
-
-	/**
-	 * COMPATIBILITY: Get the column constant name (e.g. PeerName::COLUMN_NAME).
-	 *
-	 * This method exists simply because it belonged to the 'PeerBuilder' that this
-	 * class is replacing (because of name conflict more than actual functionality overlap).
-	 * When the new builder model is finished this method will be removed.
-	 *
-	 * @param      Column $col The column we need a name for.
-	 * @param      string $phpName The PHP Name of the peer class. The 'Peer' is appended automatically.
-	 *
-	 * @return     string If $phpName is provided, then will return {$phpName}Peer::COLUMN_NAME; if not, just COLUMN_NAME.
-	 * @deprecated
-	 */
-	public static function getColumnName(Column $col, $phpName = null) {
-		// was it overridden in schema.xml ?
-		if ($col->getPeerName()) {
-			$const = strtoupper($col->getPeerName());
-		} else {
-			$const = strtoupper($col->getName());
-		}
-		if ($phpName !== null) {
-			return $phpName . 'Peer::' . $const;
-		} else {
-			return $const;
-		}
-	}
-	
-	/**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName)
-  {
-    return parent::hasBehaviorModifier($hookName, 'PeerBuilderModifier');
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, &$script, $tab = "		")
-  {
-    return parent::applyBehaviorModifier($hookName, 'PeerBuilderModifier', $script, $tab);
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php
deleted file mode 100644
index d849582..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionNodeBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub node object class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionNode.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionNodeBuilder extends ObjectBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getTable()->getPhpName() . 'Node';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .= "
-require '".$this->getNodeBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getNodeBuilder()->getClassname();
-
-		$script .= "
-
-/**
- * Skeleton subclass for representing a node from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php
deleted file mode 100644
index fd97c3d..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionNodePeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates the empty PHP5 stub node peer class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionNodePeer.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionNodePeerBuilder extends PeerBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getStubNodeBuilder()->getClassname() . 'Peer';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .="
-require '".$this->getNodePeerBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getNodePeerBuilder()->getClassname();
-
-		$script .= "
-
-/**
- * Skeleton subclass for performing query and update operations on nodes of the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-		/**
-	 * Specifies the methods that are added as part of the stub peer class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionPeerBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php
deleted file mode 100644
index 83a9aa0..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionObjectBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub object class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionObject.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionObjectBuilder extends ObjectBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getTable()->getPhpName();
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		switch($this->getTable()->treeMode()) {
-			case 'NestedSet':
-				$requiredClassFilePath = $this->getNestedSetBuilder()->getClassFilePath();
-			break;
-
-			case 'MaterializedPath':
-			case 'AdjacencyList':
-			default:
-				$requiredClassFilePath = $this->getObjectBuilder()->getClassFilePath();
-			break;
-		}
-
-		$script .="
-require '".$requiredClassFilePath."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		switch($table->treeMode()) {
-			case 'NestedSet':
-				$baseClassname = $this->getNestedSetBuilder()->getClassname();
-			break;
-
-			case 'MaterializedPath':
-			case "AdjacencyList":
-			default:
-				$baseClassname = $this->getObjectBuilder()->getClassname();
-			break;
-		}
-
-		$script .= "
-
-/**
- * Skeleton subclass for representing a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-".($table->isAbstract() ? "abstract " : "")."class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-	  if ($this->hasDefaultValues()) {
-	    $this->addConstructor($script);
-	  }
-	}
-
-		/**
-	 * Adds the applyDefaults() method, which is called from the constructor.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addConstructor()
-	 */
-	protected function addConstructor(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Initializes internal state of ".$this->getClassname()." object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-";
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->applyBehaviorModifier('extensionObjectFilter', $script, "");
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php
deleted file mode 100644
index 66b920d..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionPeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates the empty PHP5 stub peer class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionPeer.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionPeerBuilder extends PeerBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getStubObjectBuilder()->getUnprefixedClassname() . 'Peer';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		switch($this->getTable()->treeMode()) {
-			case 'NestedSet':
-				$requiredClassFilePath = $this->getNestedSetPeerBuilder()->getClassFilePath();
-			break;
-
-			case 'MaterializedPath':
-			case 'AdjacencyList':
-			default:
-				$requiredClassFilePath = $this->getPeerBuilder()->getClassFilePath();
-			break;
-		}
-
-		$script .="
-require '".$requiredClassFilePath."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		switch($table->treeMode()) {
-			case 'NestedSet':
-				$baseClassname = $this->getNestedSetPeerBuilder()->getClassname();
-			break;
-
-			case 'MaterializedPath':
-			case 'AdjacencyList':
-			default:
-				$baseClassname = $this->getPeerBuilder()->getClassname();
-			break;
-		}
-
-		$script .= "
-
-/**
- * Skeleton subclass for performing query and update operations on the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-		/**
-	 * Specifies the methods that are added as part of the stub peer class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->applyBehaviorModifier('extensionPeerFilter', $script, "");
-	}
-
-
-} // PHP5ExtensionPeerBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php
deleted file mode 100644
index 7bc6085..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5InterfaceBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub interface for user object model (OM).
- *
- * This class produces the empty stub interface when the interface="" attribute is used
- * in the the schema xml.
- *
- * This class replaces the Interface.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5InterfaceBuilder extends ObjectBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return ClassTools::classname($this->getInterface());
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getObjectBuilder()->getClassname();
-
-		$script .= "
-/**
- * This is an interface that should be filled with the public api of the $tableName objects.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional method declarations to this interface to meet the
- * application requirements.  This interface will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-interface ".$this->getClassname()." {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php
deleted file mode 100644
index 35967a4..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5MultiExtendObjectBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub object class for use with inheritance in the user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the MultiExtendObject.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5MultiExtendObjectBuilder extends ObjectBuilder {
-
-	/**
-	 * The current child "object" we are operating on.
-	 */
-	private $child;
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getChild()->getClassname();
-	}
-
-	/**
-	 * Override method to return child package, if specified.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return ($this->child->getPackage() ? $this->child->getPackage() : parent::getPackage());
-	}
-
-	/**
-	 * Set the child object that we're operating on currrently.
-	 * @param      $child Inheritance
-	 */
-	public function setChild(Inheritance $child)
-	{
-		$this->child = $child;
-	}
-
-	/**
-	 * Returns the child object we're operating on currently.
-	 * @return     Inheritance
-	 * @throws     BuildException - if child was not set.
-	 */
-	public function getChild()
-	{
-		if (!$this->child) {
-			throw new BuildException("The PHP5MultiExtendObjectBuilder needs to be told which child class to build (via setChild() method) before it can build the stub class.");
-		}
-		return $this->child;
-	}
-
-	/**
-	 * Returns classpath to parent class.
-	 * @return     string
-	 */
-	protected function getParentClasspath()
-	{
-		if ($this->getChild()->getAncestor()) {
-			return $this->getChild()->getAncestor();
-		} else {
-			return $this->getObjectBuilder()->getClasspath();
-		}
-	}
-
-	/**
-	 * Returns classname of parent class.
-	 * @return     string
-	 */
-	protected function getParentClassname()
-	{
-		return ClassTools::classname($this->getParentClasspath());
-	}
-
-	/**
-	 * Gets the file path to the parent class.
-	 * @return     string
-	 */
-	protected function getParentClassFilePath()
-	{
-		return ClassTools::getFilePath($this->getParentClasspath());
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getObjectBuilder()->getClassname();
-
-		$script .= "
-
-/**
- * Skeleton subclass for representing a row from one of the subclasses of the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends ".$this->getParentClassname()." {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$child = $this->getChild();
-		$col = $child->getColumn();
-		$cfc = $col->getPhpName();
-
-		$const = "CLASSKEY_".strtoupper($child->getKey());
-
-		$script .= "
-	/**
-	 * Constructs a new ".$this->getChild()->getClassname()." class, setting the ".$col->getName()." column to ".$this->getPeerClassname()."::$const.
-	 */
-	public function __construct()
-	{";
-		$script .= "
-		parent::__construct();
-		\$this->set$cfc(".$this->getPeerClassname()."::CLASSKEY_".strtoupper($child->getKey()).");
-	}
-";
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php
deleted file mode 100644
index a31ffc7..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php
+++ /dev/null
@@ -1,1145 +0,0 @@
-<?php
-/*
- *  $Id: PHP5NestedSetBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates a PHP5 tree node Object class for user object model (OM) using Nested Set way.
- *
- * This class produces the base tree node object class (e.g. BaseMyTableNestedSet) which contains all
- * the custom-built accessor and setter methods.
- *
- * @author     Heltem <heltem at o2php.com>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NestedSetBuilder extends ObjectBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubObjectBuilder()->getUnprefixedClassname() . 'NestedSet';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .="
-require '".$this->getObjectBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base class that represents a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." extends ".$this->getObjectBuilder()->getClassname()." implements NodeObject {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		$this->addAttributes($script);
-
-		$this->addGetIterator($script);
-
-		$this->addSave($script);
-		$this->addDelete($script);
-
-		$this->addMakeRoot($script);
-
-		$this->addGetLevel($script);
-		$this->addGetPath($script);
-
-		$this->addGetNumberOfChildren($script);
-		$this->addGetNumberOfDescendants($script);
-
-		$this->addGetChildren($script);
-		$this->addGetDescendants($script);
-
-		$this->addSetLevel($script);
-
-		$this->addSetChildren($script);
-		$this->addSetParentNode($script);
-		$this->addSetPrevSibling($script);
-		$this->addSetNextSibling($script);
-
-		$this->addIsRoot($script);
-		$this->addIsLeaf($script);
-		$this->addIsEqualTo($script);
-
-		$this->addHasParent($script);
-		$this->addHasChildren($script);
-		$this->addHasPrevSibling($script);
-		$this->addHasNextSibling($script);
-
-		$this->addRetrieveParent($script);
-		$this->addRetrieveFirstChild($script);
-		$this->addRetrieveLastChild($script);
-		$this->addRetrievePrevSibling($script);
-		$this->addRetrieveNextSibling($script);
-
-		$this->addInsertAsFirstChildOf($script);
-		$this->addInsertAsLastChildOf($script);
-
-		$this->addInsertAsPrevSiblingOf($script);
-		$this->addInsertAsNextSiblingOf($script);
-
-		$this->addMoveToFirstChildOf($script);
-		$this->addMoveToLastChildOf($script);
-
-		$this->addMoveToPrevSiblingOf($script);
-		$this->addMoveToNextSiblingOf($script);
-
-		$this->addInsertAsParentOf($script);
-
-		$this->addGetLeft($script);
-		$this->addGetRight($script);
-		$this->addGetScopeId($script);
-
-		$this->addSetLeft($script);
-		$this->addSetRight($script);
-		$this->addSetScopeId($script);
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-
-	/**
-	 * Adds class attributes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Store level of node
-	 * @var        int
-	 */
-	protected \$level = null;
-
-	/**
-	 * Store if node has prev sibling
-	 * @var        bool
-	 */
-	protected \$hasPrevSibling = null;
-
-	/**
-	 * Store node if has prev sibling
-	 * @var        $objectClassName
-	 */
-	protected \$prevSibling = null;
-
-	/**
-	 * Store if node has next sibling
-	 * @var        bool
-	 */
-	protected \$hasNextSibling = null;
-
-	/**
-	 * Store node if has next sibling
-	 * @var        $objectClassName
-	 */
-	protected \$nextSibling = null;
-
-	/**
-	 * Store if node has parent node
-	 * @var        bool
-	 */
-	protected \$hasParentNode = null;
-
-	/**
-	 * The parent node for this node.
-	 * @var        $objectClassName
-	 */
-	protected \$parentNode = null;
-
-	/**
-	 * Store children of the node
-	 * @var        array
-	 */
-	protected \$_children = null;
-";
-	}
-
-	protected function addGetIterator(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns a pre-order iterator for this node and its children.
-	 *
-	 * @return     NodeIterator
-	 */
-	public function getIterator()
-	{
-		return new NestedSetRecursiveIterator(\$this);
-	}
-";
-	}
-
-	protected function addSave(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Saves modified object data to the datastore.
-	 * If object is saved without left/right values, set them as undefined (0)
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
-	 *                 May be unreliable with parent/children/brother changes
-	 * @throws     PropelException
-	 */
-	public function save(PropelPDO \$con = null)
-	{
-		\$left = \$this->getLeftValue();
-		\$right = \$this->getRightValue();
-		if (empty(\$left) || empty(\$right)) {
-			\$root = $peerClassname::retrieveRoot(\$this->getScopeIdValue(), \$con);
-			$peerClassname::insertAsLastChildOf(\$this, \$root, \$con);
-		}
-
-		return parent::save(\$con);
-	}
-";
-	}
-
-	protected function addDelete(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Removes this object and all descendants from datastore.
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function delete(PropelPDO \$con = null)
-	{
-		// delete node first
-		parent::delete(\$con);
-
-		// delete descendants and then shift tree
-		$peerClassname::deleteDescendants(\$this, \$con);
-	}
-";
-	}
-
-	protected function addMakeRoot(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets node properties to make it a root node.
-	 *
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function makeRoot()
-	{
-		$peerClassname::createRoot(\$this);
-		return \$this;
-	}
-";
-	}
-
-	protected function addGetLevel(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the level if set, otherwise calculates this and returns it
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int
-	 */
-	public function getLevel(PropelPDO \$con = null)
-	{
-		if (null === \$this->level) {
-			\$this->level = $peerClassname::getLevel(\$this, \$con);
-		}
-		return \$this->level;
-	}
-";
-	}
-
-	protected function addSetLevel(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the level of the node in the tree
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setLevel(\$level)
-	{
-		\$this->level = \$level;
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetChildren(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the children array of the node in the tree
-	 *
-	 * @param      array of $objectClassName \$children	array of Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setChildren(array \$children)
-	{
-		\$this->_children = \$children;
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetParentNode(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the parentNode of the node in the tree
-	 *
-	 * @param      $objectClassName \$parent Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setParentNode(NodeObject \$parent = null)
-	{
-		\$this->parentNode = (true === (\$this->hasParentNode = $peerClassname::isValid(\$parent))) ? \$parent : null;
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetPrevSibling(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the previous sibling of the node in the tree
-	 *
-	 * @param      $objectClassName \$node Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setPrevSibling(NodeObject \$node = null)
-	{
-		\$this->prevSibling = \$node;
-		\$this->hasPrevSibling = $peerClassname::isValid(\$node);
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetNextSibling(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the next sibling of the node in the tree
-	 *
-	 * @param      $objectClassName \$node Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setNextSibling(NodeObject \$node = null)
-	{
-		\$this->nextSibling = \$node;
-		\$this->hasNextSibling = $peerClassname::isValid(\$node);
-		return \$this;
-	}
-";
-	}
-
-	protected function addGetPath(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Get the path to the node in the tree
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     array
-	 */
-	public function getPath(PropelPDO \$con = null)
-	{
-		return $peerClassname::getPath(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetNumberOfChildren(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the number of children for the node (direct descendants)
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfChildren(PropelPDO \$con = null)
-	{
-		return $peerClassname::getNumberOfChildren(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetNumberOfDescendants(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the total number of descendants for the node
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfDescendants(PropelPDO \$con = null)
-	{
-		return $peerClassname::getNumberOfDescendants(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetChildren(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the children for the node
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     array
-	 */
-	public function getChildren(PropelPDO \$con = null)
-	{
-		\$this->getLevel();
-
-		if (is_array(\$this->_children)) {
-			return \$this->_children;
-		}
-
-		return $peerClassname::retrieveChildren(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetDescendants(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the descendants for the node
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     array
-	 */
-	public function getDescendants(PropelPDO \$con = null)
-	{
-		\$this->getLevel();
-
-		return $peerClassname::retrieveDescendants(\$this, \$con);
-	}
-";
-	}
-
-	protected function addIsRoot(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns true if node is the root node of the tree.
-	 *
-	 * @return     bool
-	 */
-	public function isRoot()
-	{
-		return $peerClassname::isRoot(\$this);
-	}
-";
-	}
-
-	protected function addIsLeaf(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Return true if the node is a leaf node
-	 *
-	 * @return     bool
-	 */
-	public function isLeaf()
-	{
-		return $peerClassname::isLeaf(\$this);
-	}
-";
-	}
-
-	protected function addIsEqualTo(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if object is equal to \$node
-	 *
-	 * @param      object \$node		Propel object for node to compare to
-	 * @return     bool
-	 */
-	public function isEqualTo(NodeObject \$node)
-	{
-		return $peerClassname::isEqualTo(\$this, \$node);
-	}
-";
-	}
-
-	protected function addHasParent(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if object has an ancestor
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     bool
-	 */
-	public function hasParent(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasParentNode) {
-			$peerClassname::hasParent(\$this, \$con);
-		}
-		return \$this->hasParentNode;
-	}
-";
-	}
-
-	protected function addHasChildren(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Determines if the node has children / descendants
-	 *
-	 * @return     bool
-	 */
-	public function hasChildren()
-	{
-		return  $peerClassname::hasChildren(\$this);
-	}
-";
-	}
-
-	protected function addHasPrevSibling(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Determines if the node has previous sibling
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     bool
-	 */
-	public function hasPrevSibling(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasPrevSibling) {
-			$peerClassname::hasPrevSibling(\$this, \$con);
-		}
-		return \$this->hasPrevSibling;
-	}
-";
-	}
-
-	protected function addHasNextSibling(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Determines if the node has next sibling
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     bool
-	 */
-	public function hasNextSibling(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasNextSibling) {
-			$peerClassname::hasNextSibling(\$this, \$con);
-		}
-		return \$this->hasNextSibling;
-	}
-";
-	}
-
-	protected function addRetrieveParent(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets ancestor for the given node if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveParent(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasParentNode) {
-			\$this->parentNode = $peerClassname::retrieveParent(\$this, \$con);
-			\$this->hasParentNode = $peerClassname::isValid(\$this->parentNode);
-		}
-		return \$this->parentNode;
-	}
-";
-	}
-
-	protected function addRetrieveFirstChild(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets first child if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveFirstChild(PropelPDO \$con = null)
-	{
-		if (\$this->hasChildren(\$con)) {
-			if (is_array(\$this->_children)) {
-				return \$this->_children[0];
-			}
-
-			return $peerClassname::retrieveFirstChild(\$this, \$con);
-		}
-		return false;
-	}
-";
-	}
-
-	protected function addRetrieveLastChild(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets last child if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveLastChild(PropelPDO \$con = null)
-	{
-		if (\$this->hasChildren(\$con)) {
-			if (is_array(\$this->_children)) {
-				\$last = count(\$this->_children) - 1;
-				return \$this->_children[\$last];
-			}
-
-			return $peerClassname::retrieveLastChild(\$this, \$con);
-		}
-		return false;
-	}
-";
-	}
-
-	protected function addRetrievePrevSibling(&$script)
-	{
-		$script .= "
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrievePrevSibling(PropelPDO \$con = null)
-	{
-		if (\$this->hasPrevSibling(\$con)) {
-			return \$this->prevSibling;
-		}
-		return \$this->hasPrevSibling;
-	}
-";
-	}
-
-	protected function addRetrieveNextSibling(&$script)
-	{
-		$script .= "
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveNextSibling(PropelPDO \$con = null)
-	{
-		if (\$this->hasNextSibling(\$con)) {
-			return \$this->nextSibling;
-		}
-		return \$this->hasNextSibling;
-	}
-";
-	}
-
-	protected function addInsertAsFirstChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts as first child of given destination node \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsFirstChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsFirstChildOf(\$this, \$parent, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsLastChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts as last child of given destination node \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsLastChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsLastChildOf(\$this, \$parent, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsPrevSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$node as previous sibling to given destination node \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsPrevSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsPrevSiblingOf(\$this, \$dest, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsNextSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$node as next sibling to given destination node \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsNextSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsNextSiblingOf(\$this, \$dest, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToFirstChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be first child of \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToFirstChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToFirstChildOf(\$parent, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToLastChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be last child of \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToLastChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToLastChildOf(\$parent, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToPrevSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be prev sibling to \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToPrevSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToPrevSiblingOf(\$dest, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToNextSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be next sibling to \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToNextSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToNextSiblingOf(\$dest, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsParentOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts node as parent of given node.
-	 *
-	 * @param      $objectClassName \$node Propel object for destination node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function insertAsParentOf(NodeObject \$node, PropelPDO \$con = null)
-	{
-		$peerClassname::insertAsParentOf(\$this, \$node, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addGetLeft(&$script)
-	{
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetLeftKey()) {
-				$left_col_getter_name = 'get'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Wraps the getter for the left value
-	 *
-	 * @return     int
-	 */
-	public function getLeftValue()
-	{
-		return \$this->$left_col_getter_name();
-	}
-";
-	}
-
-	protected function addGetRight(&$script)
-	{
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetRightKey()) {
-				$right_col_getter_name = 'get'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Wraps the getter for the right value
-	 *
-	 * @return     int
-	 */
-	public function getRightValue()
-	{
-		return \$this->$right_col_getter_name();
-	}
-";
-	}
-
-	protected function addGetScopeId(&$script)
-	{
-		$table = $this->getTable();
-
-		$scope_col_getter_name = null;
-		foreach ($table->getColumns() as $col) {
-			if ($col->isTreeScopeKey()) {
-				$scope_col_getter_name = 'get'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Wraps the getter for the scope value
-	 *
-	 * @return     int or null if scope is disabled
-	 */
-	public function getScopeIdValue()
-	{";
-		if ($scope_col_getter_name) {
-			$script .= "
-		return \$this->$scope_col_getter_name();";
-		} else {
-			$script .= "
-		return null;";
-		}
-		$script .= "
-	}
-";
-	}
-
-	protected function addSetLeft(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetLeftKey()) {
-				$left_col_setter_name = 'set'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Set the value left column
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setLeftValue(\$v)
-	{
-		\$this->$left_col_setter_name(\$v);
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetRight(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetRightKey()) {
-				$right_col_setter_name = 'set'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Set the value of right column
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setRightValue(\$v)
-	{
-		\$this->$right_col_setter_name(\$v);
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetScopeId(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$table = $this->getTable();
-
-		$scope_col_setter_name = null;
-		foreach ($table->getColumns() as $col) {
-			if ($col->isTreeScopeKey()) {
-				$scope_col_setter_name = 'set'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Set the value of scope column
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setScopeIdValue(\$v)
-	{";
-		if ($scope_col_setter_name) {
-			$script .= "
-		\$this->$scope_col_setter_name(\$v);";
-		}
-		$script .= "
-		return \$this;
-	}
-";
-
-	}
-
-} // PHP5NestedSetBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php
deleted file mode 100644
index 28d0ff2..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php
+++ /dev/null
@@ -1,1737 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5NestedSetPeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates a PHP5 tree nested set Peer class for user object model (OM).
- *
- * This class produces the base tree nested set object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * This class replaces the Node.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     heltem <heltem at o2php.com>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NestedSetPeerBuilder extends PeerBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubObjectBuilder()->getUnprefixedClassname() . 'NestedSetPeer';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .="
-require '".$this->getPeerBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base static class for performing query operations on the tree contained by the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." extends ".$this->getPeerBuilder()->getClassName()." implements NodePeer {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		// FIXME
-		// - Probably the build needs to be customized for supporting
-		// tables that are "aliases".  -- definitely a fringe usecase, though.
-
-		$this->addConstants($script);
-
-		$this->addCreateRoot($script);
-
-		$this->addRetrieveRoot($script);
-
-		$this->addInsertAsFirstChildOf($script);
-		$this->addInsertAsLastChildOf($script);
-		$this->addInsertAsPrevSiblingOf($script);
-		$this->addInsertAsNextSiblingOf($script);
-		$this->addInsertAsParentOf($script);
-
-		$this->addInsertRoot($script);
-		$this->addInsertParent($script);
-
-		$this->addDeleteRoot($script);
-		$this->addDeleteNode($script);
-
-		$this->addMoveToFirstChildOf($script);
-		$this->addMoveToLastChildOf($script);
-		$this->addMoveToPrevSiblingOf($script);
-		$this->addMoveToNextSiblingOf($script);
-
-		$this->addRetrieveFirstChild($script);
-		$this->addRetrieveLastChild($script);
-		$this->addRetrievePrevSibling($script);
-		$this->addRetrieveNextSibling($script);
-
-		$this->addRetrieveTree($script);
-		$this->addRetrieveBranch($script);
-		$this->addRetrieveChildren($script);
-		$this->addRetrieveDescendants($script);
-		$this->addRetrieveSiblings($script);
-		$this->addRetrieveParent($script);
-
-		$this->addGetLevel($script);
-		$this->addGetNumberOfChildren($script);
-		$this->addGetNumberOfDescendants($script);
-		$this->addGetPath($script);
-
-		$this->addIsValid($script);
-		$this->addIsRoot($script);
-		$this->addIsLeaf($script);
-		$this->addIsChildOf($script);
-		$this->addIsChildOfOrSiblingTo($script);
-		$this->addIsEqualTo($script);
-
-		$this->addHasParent($script);
-		$this->addHasPrevSibling($script);
-		$this->addHasNextSibling($script);
-		$this->addHasChildren($script);
-
-		$this->addDeleteDescendants($script);
-
-		$this->addGetNode($script);
-
-		$this->addHydrateDescendants($script);
-		$this->addHydrateChildren($script);
-
-		$this->addShiftRParent($script);
-		$this->addUpdateLoadedNode($script);
-		$this->addUpdateDBNode($script);
-
-		$this->addShiftRLValues($script);
-		$this->addShiftRLRange($script);
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-	protected function addConstants(&$script)
-	{
-		$table = $this->getTable();
-		$tableName = $table->getName();
-
-		$colname = array();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetLeftKey()) {
-				$colname['left'] = $this->prefixTablename($tableName) . '.' . strtoupper($col->getName());
-			}
-
-			if ($col->isNestedSetRightKey()) {
-				$colname['right'] = $this->prefixTablename($tableName) . '.' . strtoupper($col->getName());
-			}
-
-			if ($col->isTreeScopeKey()) {
-				$colname['scope'] = $this->prefixTablename($tableName) . '.' . strtoupper($col->getName());
-			}
-
-			if (3 == count($colname)) {
-				break;
-			}
-		}
-
-		if(!isset($colname['left'])) {
-			throw new EngineException("One column must have nestedSetLeftKey attribute set to true for [" . $table->getName() . "] table");
-		}
-
-		if(!isset($colname['right'])) {
-			throw new EngineException("One column must have nestedSetRightKey attribute set to true for [" . $table->getName() . "] table");
-		}
-
-		$colname['scope'] = isset($colname['scope']) ? $colname['scope'] : null;
-
-		$script .= "
-	/**
-	 * Left column for the set
-	 */
-	const LEFT_COL = " . var_export($colname['left'], true) . ";
-
-	/**
-	 * Right column for the set
-	 */
-	const RIGHT_COL = " . var_export($colname['right'], true) . ";
-
-	/**
-	 * Scope column for the set
-	 */
-	const SCOPE_COL = " . var_export($colname['scope'], true) . ";
-";
-	}
-
-	protected function addCreateRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Creates the supplied node as the root node.
-	 *
-	 * @param      $objectClassname \$node	Propel object for model
-	 * @throws     PropelException
-	 */
-	public static function createRoot(NodeObject \$node)
-	{
-		if (\$node->getLeftValue()) {
-			throw new PropelException('Cannot turn an existing node into a root node.');
-		}
-
-		\$node->setLeftValue(1);
-		\$node->setRightValue(2);
-	}
-";
-	}
-
-	protected function addRetrieveRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns the root node for a given scope id
-	 *
-	 * @param      int \$scopeId		Scope id to determine which root node to return
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     $objectClassname			Propel object for root node
-	 */
-	public static function retrieveRoot(\$scopeId = null, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-
-		\$c->add(self::LEFT_COL, 1, Criteria::EQUAL);
-
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$scopeId, Criteria::EQUAL);
-		}
-
-		return $peerClassname::doSelectOne(\$c, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsFirstChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$child as first child of given \$parent node
-	 *
-	 * @param      $objectClassname \$child	Propel object for child node
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsFirstChildOf(NodeObject \$child, NodeObject \$parent, PropelPDO \$con = null)
-	{
-		// Update \$child node properties
-		\$child->setLeftValue(\$parent->getLeftValue() + 1);
-		\$child->setRightValue(\$parent->getLeftValue() + 2);
-		\$child->setParentNode(\$parent);
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$child->setScopeIdValue(\$sidv = \$parent->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$child->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsLastChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$child as last child of destination node \$parent
-	 *
-	 * @param      $objectClassname \$child		Propel object for child node
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsLastChildOf(NodeObject \$child, NodeObject \$parent, PropelPDO \$con = null)
-	{
-		// Update \$child node properties
-		\$child->setLeftValue(\$parent->getRightValue());
-		\$child->setRightValue(\$parent->getRightValue() + 1);
-		\$child->setParentNode(\$parent);
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$child->setScopeIdValue(\$sidv = \$parent->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$child->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsPrevSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$sibling as previous sibling to destination node \$node
-	 *
-	 * @param      $objectClassname \$node		Propel object for destination node
-	 * @param      $objectClassname \$sibling	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsPrevSiblingOf(NodeObject \$node, NodeObject \$sibling, PropelPDO \$con = null)
-	{
-		if (\$sibling->isRoot()) {
-			throw new PropelException('Root nodes cannot have siblings');
-		}
-
-		\$node->setLeftValue(\$sibling->getLeftValue());
-		\$node->setRightValue(\$sibling->getLeftValue() + 1);
-		\$node->setParentNode(\$sibling->retrieveParent());
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$node->setScopeIdValue(\$sidv = \$sibling->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$node->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$sibling->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsNextSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$sibling as next sibling to destination node \$node
-	 *
-	 * @param      $objectClassname \$node		Propel object for destination node
-	 * @param      $objectClassname \$sibling	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsNextSiblingOf(NodeObject \$node, NodeObject \$sibling, PropelPDO \$con = null)
-	{
-		if (\$sibling->isRoot()) {
-			throw new PropelException('Root nodes cannot have siblings');
-		}
-
-		\$node->setLeftValue(\$sibling->getRightValue() + 1);
-		\$node->setRightValue(\$sibling->getRightValue() + 2);
-		\$node->setParentNode(\$sibling->retrieveParent());
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$node->setScopeIdValue(\$sidv = \$sibling->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$node->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$sibling->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsParentOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$parent as parent of given node.
-	 *
-	 * @param      $objectClassname \$parent	Propel object for given parent node
-	 * @param      $objectClassname \$node	Propel object for given destination node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsParentOf(NodeObject \$parent, NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$sidv = \$node->getScopeIdValue();
-		}
-
-		self::shiftRLValues(\$node->getLeftValue(), 1, \$con, \$sidv);
-		self::shiftRLValues(\$node->getRightValue() + 2, 1, \$con, \$sidv);
-
-		if (self::SCOPE_COL) {
-			\$parent->setScopeIdValue(\$sidv);
-		}
-
-		\$parent->setLeftValue(\$node->getLeftValue());
-		\$parent->setRightValue(\$node->getRightValue() + 2);
-
-		\$previous_parent = \$node->retrieveParent();
-		\$parent->setParentNode(\$previous_parent);
-		\$node->setParentNode(\$parent);
-
-		\$node->save(\$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$previous_parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$node as root node
-	 *
-	 * @param      $objectClassname \$node	Propel object as root node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertRoot(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$sidv = \$node->getScopeIdValue();
-		}
-
-		$peerClassname::insertAsParentOf($peerClassname::retrieveRoot(\$sidv, \$con), \$node, \$con);
-	}
-";
-	}
-
-	protected function addInsertParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$parent as parent to destination node \$child
-	 *
-	 * @deprecated 1.3 - 2007/11/06
-	 * @see        insertAsParentOf()
-	 * @param      $objectClassname \$child	Propel object to become child node
-	 * @param      $objectClassname \$parent	Propel object as parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertParent(NodeObject \$child, NodeObject \$parent, PropelPDO \$con = null)
-	{
-		self::insertAsParentOf(\$parent, \$child, \$con);
-	}
-";
-	}
-
-	protected function addDeleteRoot(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Delete root node
-	 *
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteRoot(\$scopeId = null, PropelPDO \$con = null)
-	{
-		if (!self::SCOPE_COL) {
-			\$scopeId = null;
-		}
-		\$root = $peerClassname::retrieveRoot(\$scopeId, \$con);
-		if ($peerClassname::getNumberOfChildren(\$root) == 1) {
-			return $peerClassname::deleteNode(\$root, \$con);
-		} else {
-			return false;
-		}
-	}
-";
-	}
-
-	protected function addDeleteNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Delete \$dest node
-	 *
-	 * @param      $objectClassname \$dest	Propel object node to delete
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteNode(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (\$dest->getLeftValue() == 1) {
-			// deleting root implies conditions (see deleteRoot() method)
-			return $peerClassname::deleteRoot(\$con);
-		}
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$sidv = \$dest->getScopeIdValue();
-		}
-
-		self::shiftRLRange(\$dest->getLeftValue(), \$dest->getRightValue(), -1, \$con, \$sidv);
-		self::shiftRLValues(\$dest->getRightValue() + 1, -2, \$con, \$sidv);
-		return \$dest->delete(\$con);
-	}
-";
-	}
-
-	protected function addMoveToFirstChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$child to be first child of \$parent
-	 *
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      $objectClassname \$child		Propel object for child node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToFirstChildOf(NodeObject \$parent, NodeObject \$child, PropelPDO \$con = null)
-	{
-		if (\$parent->getScopeIdValue() != \$child->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$parent->getLeftValue() + 1;
-		self::updateDBNode(\$child, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addMoveToLastChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$child to be last child of \$parent
-	 *
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      $objectClassname \$child		Propel object for child node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToLastChildOf(NodeObject \$parent, NodeObject \$child, PropelPDO \$con = null)
-	{
-		if (\$parent->getScopeIdValue() != \$child->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$parent->getRightValue();
-		self::updateDBNode(\$child, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addMoveToPrevSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$node to be prev sibling to \$dest
-	 *
-	 * @param      $objectClassname \$dest	Propel object for destination node
-	 * @param      $objectClassname \$node	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToPrevSiblingOf(NodeObject \$dest, NodeObject \$node, PropelPDO \$con = null)
-	{
-		if (\$dest->getScopeIdValue() != \$node->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$dest->getLeftValue();
-		self::updateDBNode(\$node, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$dest->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addMoveToNextSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$node to be next sibling to \$dest
-	 *
-	 * @param      $objectClassname \$dest	Propel object for destination node
-	 * @param      $objectClassname \$node	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToNextSiblingOf(NodeObject \$dest, NodeObject \$node, PropelPDO \$con = null)
-	{
-		if (\$dest->getScopeIdValue() != \$node->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$dest->getRightValue();
-		\$destLeft = \$destLeft + 1;
-		self::updateDBNode(\$node, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$dest->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addRetrieveFirstChild(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets first child for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveFirstChild(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::LEFT_COL, \$node->getLeftValue() + 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-
-		return $peerClassname::doSelectOne(\$c, \$con);
-	}
-";
-	}
-
-	protected function addRetrieveLastChild(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets last child for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveLastChild(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::RIGHT_COL, \$node->getRightValue() - 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-
-		return $peerClassname::doSelectOne(\$c, \$con);
-	}
-";
-	}
-
-	protected function addRetrievePrevSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else null
-	 */
-	public static function retrievePrevSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::RIGHT_COL, \$node->getLeftValue() - 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$prevSibling = $peerClassname::doSelectOne(\$c, \$con);
-		\$node->setPrevSibling(\$prevSibling);
-		return \$prevSibling;
-	}
-";
-	}
-
-	protected function addRetrieveNextSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveNextSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::LEFT_COL, \$node->getRightValue() + 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$nextSibling = $peerClassname::doSelectOne(\$c, \$con);
-		\$node->setNextSibling(\$nextSibling);
-		return \$nextSibling;
-	}
-";
-	}
-
-	protected function addRetrieveTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Retrieves the entire tree from root
-	 *
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveTree(\$scopeId = null, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->addAscendingOrderByColumn(self::LEFT_COL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$scopeId, Criteria::EQUAL);
-		}
-		\$stmt = $peerClassname::doSelectStmt(\$c, \$con);
-		if (false !== (\$row = \$stmt->fetch(PDO::FETCH_NUM))) {
-			\$omClass = $peerClassname::getOMClass(\$row, 0);
-			\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-
-			\$key = ".$peerClassname."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null === (\$root = ".$peerClassname."::getInstanceFromPool(\$key))) {
-				" . $this->buildObjectInstanceCreationCode('$root', '$cls') . "
-				\$root->hydrate(\$row);
-			}
-
-			\$root->setLevel(0);
-			$peerClassname::hydrateDescendants(\$root, \$stmt);
-			$peerClassname::addInstanceToPool(\$root);
-			
-			\$stmt->closeCursor();
-			return \$root;
-		}
-		return false;
-	}
-";
-	}
-
-	protected function addRetrieveBranch(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Retrieves the entire tree from parent \$node
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveBranch(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::retrieveDescendants(\$node, \$con);
-	}
-";
-	}
-
-	protected function addRetrieveChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets direct children for the node
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveChildren(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->addAscendingOrderByColumn(self::LEFT_COL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->add(self::LEFT_COL, \$node->getLeftValue(), Criteria::GREATER_THAN);
-		\$c->addAnd(self::RIGHT_COL, \$node->getRightValue(), Criteria::LESS_THAN);
-		\$stmt = $peerClassname::doSelectStmt(\$c, \$con);
-
-		return $peerClassname::hydrateChildren(\$node, \$stmt);
-	}
-";
-	}
-
-	protected function addRetrieveDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets all descendants for the node
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveDescendants(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->addAscendingOrderByColumn(self::LEFT_COL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->add(self::LEFT_COL, \$node->getLeftValue(), Criteria::GREATER_THAN);
-		\$c->addAnd(self::RIGHT_COL, \$node->getRightValue(), Criteria::LESS_THAN);
-		\$stmt = $peerClassname::doSelectStmt(\$c, \$con);
-
-		return $peerClassname::hydrateDescendants(\$node, \$stmt);
-	}
-";
-	}
-
-	protected function addRetrieveSiblings(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets all siblings for the node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveSiblings(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$parent = $peerClassname::retrieveParent(\$node, \$con);
-		\$siblings = $peerClassname::retrieveChildren(\$parent, \$con);
-
-		return \$siblings;
-	}
-";
-	}
-
-	protected function addRetrieveParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets immediate ancestor for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else null
-	 */
-	public static function retrieveParent(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c1 = \$c->getNewCriterion(self::LEFT_COL, \$node->getLeftValue(), Criteria::LESS_THAN);
-		\$c2 = \$c->getNewCriterion(self::RIGHT_COL, \$node->getRightValue(), Criteria::GREATER_THAN);
-
-		\$c1->addAnd(\$c2);
-
-		\$c->add(\$c1);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->addAscendingOrderByColumn(self::RIGHT_COL);
-
-		\$parent = $peerClassname::doSelectOne(\$c, \$con);
-
-		\$node->setParentNode(\$parent);
-
-		return \$parent;
-	}
-";
-	}
-
-	protected function addGetLevel(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets level for the given node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getLevel(NodeObject \$node, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		\$sql = \"SELECT COUNT(*) AS level FROM \" . self::TABLE_NAME . \" WHERE \" . self::LEFT_COL . \" < :left AND \" . self::RIGHT_COL . \" > :right\";
-
-		if (self::SCOPE_COL) {
-			\$sql .= ' AND ' . self::SCOPE_COL . ' = :scope';
-		}
-
-		\$stmt = \$con->prepare(\$sql);
-		\$stmt->bindValue(':left', \$node->getLeftValue(), PDO::PARAM_INT);
-		\$stmt->bindValue(':right', \$node->getRightValue(), PDO::PARAM_INT);
-		if (self::SCOPE_COL) {
-			\$stmt->bindValue(':scope', \$node->getScopeIdValue());
-		}
-		\$stmt->execute();
-		\$row = \$stmt->fetch();
-		return \$row['level'];
-	}
-";
-	}
-
-	protected function addGetNumberOfChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets number of direct children for given node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfChildren(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$children = $peerClassname::retrieveChildren(\$node);
-		return count(\$children);
-	}
-";
-	}
-
-	protected function addGetNumberOfDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets number of descendants for given node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfDescendants(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$right = \$node->getRightValue();
-		\$left = \$node->getLeftValue();
-		\$num = (\$right - \$left - 1) / 2;
-		return \$num;
-	}
-";
-	}
-
-	protected function addGetPath(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns path to a specific node as an array, useful to create breadcrumbs
-	 *
-	 * @param      $objectClassname \$node	Propel object of node to create path to
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     array			Array in order of heirarchy
-	 */
-	public static function getPath(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$criteria = new Criteria();
-		if (self::SCOPE_COL) {
-			\$criteria->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$criteria->add(self::LEFT_COL, \$node->getLeftValue(), Criteria::LESS_EQUAL);
-		\$criteria->add(self::RIGHT_COL, \$node->getRightValue(), Criteria::GREATER_EQUAL);
-		\$criteria->addAscendingOrderByColumn(self::LEFT_COL);
-
-		return self::doSelect(\$criteria, \$con);
-	}
-";
-	}
-
-	protected function addIsValid(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if node is valid
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isValid(NodeObject \$node = null)
-	{
-		if (is_object(\$node) && \$node->getRightValue() > \$node->getLeftValue()) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-";
-	}
-
-	protected function addIsRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if node is a root
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isRoot(NodeObject \$node)
-	{
-		return (\$node->getLeftValue()==1);
-	}
-";
-	}
-
-	protected function addIsLeaf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if node is a leaf
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isLeaf(NodeObject \$node)
-	{
-		return ((\$node->getRightValue()-\$node->getLeftValue())==1);
-	}
-";
-	}
-
-	protected function addIsChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$child is a child of \$parent
-	 *
-	 * @param      $objectClassname \$child	Propel object for node
-	 * @param      $objectClassname \$parent	Propel object for node
-	 * @return     bool
-	 */
-	public static function isChildOf(NodeObject \$child, NodeObject \$parent)
-	{
-		return ((\$child->getLeftValue()>\$parent->getLeftValue()) && (\$child->getRightValue()<\$parent->getRightValue()));
-	}
-";
-	}
-
-	protected function addIsChildOfOrSiblingTo(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node1 is a child of or equal to \$node2
-	 *
-	 * @deprecated 1.3 - 2007/11/09
-	 * @param      $objectClassname \$node1		Propel object for node
-	 * @param      $objectClassname \$node2		Propel object for node
-	 * @return     bool
-	 */
-	public static function isChildOfOrSiblingTo(NodeObject \$node1, NodeObject \$node2)
-	{
-		return ((\$node1->getLeftValue()>=\$node2->getLeftValue()) and (\$node1->getRightValue()<=\$node2->getRightValue()));
-	}
-";
-	}
-
-	protected function addIsEqualTo(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node1 is equal to \$node2
-	 *
-	 * @param      $objectClassname \$node1		Propel object for node
-	 * @param      $objectClassname \$node2		Propel object for node
-	 * @return     bool
-	 */
-	public static function isEqualTo(NodeObject \$node1, NodeObject \$node2)
-	{
-		\$also = true;
-		if (self::SCOPE_COL) {
-			\$also = (\$node1->getScopeIdValue() === \$node2->getScopeIdValue());
-		}
-		return \$node1->getLeftValue() == \$node2->getLeftValue() && \$node1->getRightValue() == \$node2->getRightValue() && \$also;
-	}
-";
-	}
-
-	protected function addHasParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has an ancestor
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasParent(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::isValid($peerClassname::retrieveParent(\$node, \$con));
-	}
-";
-	}
-
-	protected function addHasPrevSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has prev sibling
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasPrevSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::isValid($peerClassname::retrievePrevSibling(\$node, \$con));
-	}
-";
-	}
-
-	protected function addHasNextSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has next sibling
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasNextSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::isValid($peerClassname::retrieveNextSibling(\$node, \$con));
-	}
-";
-	}
-
-	protected function addHasChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has children
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @return     bool
-	 */
-	public static function hasChildren(NodeObject \$node)
-	{
-		return ((\$node->getRightValue()-\$node->getLeftValue())>1);
-	}
-";
-	}
-
-	protected function addDeleteDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Deletes \$node and all of its descendants
-	 *
-	 * @param      $objectClassname \$node		Propel object for source node
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	public static function deleteDescendants(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$left = \$node->getLeftValue();
-		\$right = \$node->getRightValue();
-
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c1 = \$c->getNewCriterion(self::LEFT_COL, \$left, Criteria::GREATER_THAN);
-		\$c2 = \$c->getNewCriterion(self::RIGHT_COL, \$right, Criteria::LESS_THAN);
-
-		\$c1->addAnd(\$c2);
-
-		\$c->add(\$c1);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->addAscendingOrderByColumn(self::RIGHT_COL);
-
-		\$result = $peerClassname::doDelete(\$c, \$con);
-
-		self::shiftRLValues(\$right + 1, \$left - \$right -1, \$con, \$node->getScopeIdValue());
-
-		return \$result;
-	}
-";
-	}
-
-	protected function addGetNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns a node given its primary key or the node itself
-	 *
-	 * @param      int/$objectClassname \$node	Primary key/instance of required node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     object		Propel object for model
-	 */
-	public static function getNode(\$node, PropelPDO \$con = null)
-	{
-		if (is_object(\$node)) {
-			return \$node;
-		} else {
-			\$object = $peerClassname::retrieveByPK(\$node, \$con);
-			\$rtn = is_object(\$object) ? \$object : false;
-			return \$rtn;
-		}
-	}
-";
-	}
-
-	protected function addHydrateDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Hydrate recursively the descendants of the given node
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PDOStatement \$stmt	Executed PDOStatement
-	 */
-	protected static function hydrateDescendants(NodeObject \$node, PDOStatement \$stmt)
-	{
-		\$descendants = array();
-		\$children = array();
-		\$prevSibling = null;
-";
-
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = $peerClassname::getOMClass();
-		\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key = ".$peerClassname."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null === (\$child = ".$peerClassname."::getInstanceFromPool(\$key))) {";
-
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = ".$peerClassname."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-				" . $this->buildObjectInstanceCreationCode('$child', '$cls') . "
-				\$child->hydrate(\$row);
-			}
-
-			\$child->setLevel(\$node->getLevel() + 1);
-			\$child->setParentNode(\$node);
-			if (!empty(\$prevSibling)) {
-				\$child->setPrevSibling(\$prevSibling);
-				\$prevSibling->setNextSibling(\$child);
-			}
-
-			\$descendants[] = \$child;
-
-			if (\$child->hasChildren()) {
-				\$descendants = array_merge(\$descendants, $peerClassname::hydrateDescendants(\$child, \$stmt));
-			} else {
-				\$child->setChildren(array());
-			}
-
-			\$children[] = \$child;
-			\$prevSibling = \$child;
-
-			$peerClassname::addInstanceToPool(\$child);
-			if (\$child->getRightValue() + 1 == \$node->getRightValue()) {
-				\$child->setNextSibling(null);
-				break;
-			}
-		}
-		\$node->setChildren(\$children);
-		return \$descendants;
-	}
-";
-	}
-
-	protected function addHydrateChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Hydrate the children of the given node
-	 * @param      $objectClassname \$node Propel object for src node
-	 * @param      PDOStatement \$stmt Executed PDOStatement
-	 */
-	protected static function hydrateChildren(NodeObject \$node, PDOStatement \$stmt)
-	{
-		\$children = array();
-		\$prevRight = 0;
-";
-
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = $peerClassname::getOMClass();
-		\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key = ".$peerClassname."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null === (\$child = ".$peerClassname."::getInstanceFromPool(\$key))) {";
-			
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = ".$peerClassname."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-				" . $this->buildObjectInstanceCreationCode('$child', '$cls') . "
-				\$child->hydrate(\$row);
-			}
-
-			\$child->setLevel(\$node->getLevel() + 1);
-
-			if (\$child->getRightValue() > \$prevRight) {
-				\$children[] = \$child;
-				\$prevRight = \$child->getRightValue();
-			}
-
-			if (\$child->getRightValue() + 1 == \$node->getRightValue()) {
-				break;
-			}
-		}
-		\$node->setChildren(\$children);
-		return \$children;
-	}
-";
-	}
-
-	/**
-	 * @deprecated 1.3 - 2008/03/11
-	 * Won't be fixed, defect by design
-	 * Never trust it
-	 */
-	protected function addShiftRParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adds '\$delta' to all parent R values.
-	 * '\$delta' can also be negative.
-	 *
-	 * @deprecated 1.3 - 2008/03/11
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      int \$delta	Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function shiftRParent(NodeObject \$node, \$delta, PropelPDO \$con = null)
-	{
-		if (\$node->hasParent(\$con)) {
-			\$parent = \$node->retrieveParent();
-			self::shiftRParent(\$parent, \$delta, \$con);
-		}
-		\$node->setRightValue(\$node->getRightValue() + \$delta);
-	}
-";
-	}
-
-	protected function addUpdateLoadedNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Reload all already loaded nodes to sync them with updated db
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      int \$delta	Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function updateLoadedNode(NodeObject \$node, \$delta, PropelPDO \$con = null)
-	{
-		if (Propel::isInstancePoolingEnabled()) {
-			\$keys = array();
-			foreach (self::\$instances as \$obj) {
-				\$keys[] = \$obj->getPrimaryKey();
-			}
-
-			if (!empty(\$keys)) {
-				// We don't need to alter the object instance pool; we're just modifying these ones
-				// already in the pool.
-				\$criteria = new Criteria(self::DATABASE_NAME);";
-		if (count($table->getPrimaryKey()) === 1) {
-			$pkey = $table->getPrimaryKey();
-			$col = array_shift($pkey);
-			$script .= "
-				\$criteria->add(".$this->getColumnConstant($col).", \$keys, Criteria::IN);
-";
-		} else {
-			$fields = array();
-			foreach ($table->getPrimaryKey() as $k => $col) {
-				$fields[] = $this->getColumnConstant($col);
-			};
-			$script .= "
-
-				// Loop on each instances in pool
-				foreach (\$keys as \$values) {
-				  // Create initial Criterion
-					\$cton = \$criteria->getNewCriterion(" . $fields[0] . ", \$values[0]);";
-			unset($fields[0]);
-			foreach ($fields as $k => $col) {
-				$script .= "
-
-					// Create next criterion
-					\$nextcton = \$criteria->getNewCriterion(" . $col . ", \$values[$k]);
-					// And merge it with the first
-					\$cton->addAnd(\$nextcton);";
-			}
-			$script .= "
-
-					// Add final Criterion to Criteria
-					\$criteria->addOr(\$cton);
-				}";
-			}
-
-			$script .= "
-				\$stmt = $peerClassname::doSelectStmt(\$criteria, \$con);
-				while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-					\$key = $peerClassname::getPrimaryKeyHashFromRow(\$row, 0);
-					if (null !== (\$object = $peerClassname::getInstanceFromPool(\$key))) {";
-			$n = 0;
-			foreach ($table->getColumns() as $col) {
-				if ($col->isNestedSetLeftKey()) {
-					$script .= "
-						\$object->setLeftValue(\$row[$n]);";
-				} else if ($col->isNestedSetRightKey()) {
-					$script .= "
-						\$object->setRightValue(\$row[$n]);";
-				}
-				$n++;
-			}
-			$script .= "
-					}
-				}
-				\$stmt->closeCursor();
-			}
-		}
-	}
-";
-	}
-
-	protected function addUpdateDBNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Move \$node and its children to location \$destLeft and updates rest of tree
-	 *
-	 * @param      $objectClassname \$node Propel object for node to update
-	 * @param      int	\$destLeft Destination left value
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function updateDBNode(NodeObject \$node, \$destLeft, PropelPDO \$con = null)
-	{
-		\$left = \$node->getLeftValue();
-		\$right = \$node->getRightValue();
-
-		\$treeSize = \$right - \$left +1;
-
-		self::shiftRLValues(\$destLeft, \$treeSize, \$con, \$node->getScopeIdValue());
-
-		if (\$left >= \$destLeft) { // src was shifted too?
-			\$left += \$treeSize;
-			\$right += \$treeSize;
-		}
-
-		// now there's enough room next to target to move the subtree
-		self::shiftRLRange(\$left, \$right, \$destLeft - \$left, \$con, \$node->getScopeIdValue());
-
-		// correct values after source
-		self::shiftRLValues(\$right + 1, -\$treeSize, \$con, \$node->getScopeIdValue());
-	}
-";
-	}
-
-	protected function addShiftRLValues(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adds '\$delta' to all L and R values that are >= '\$first'. '\$delta' can also be negative.
-	 *
-	 * @param      int \$first		First node to be shifted
-	 * @param      int \$delta		Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function shiftRLValues(\$first, \$delta, PropelPDO \$con = null, \$scopeId = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		\$leftUpdateCol = self::LEFT_COL;
-		\$rightUpdateCol = self::RIGHT_COL;
-
-		// Shift left column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(
-			self::LEFT_COL,
-			\$first,
-			Criteria::GREATER_EQUAL);
-
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(
-				\$whereCriteria->getNewCriterion(
-					self::SCOPE_COL,
-					\$scopeId,
-					Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-			self::LEFT_COL,
-			array('raw' => \$leftUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-
-		// Shift right column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(
-			self::RIGHT_COL,
-			\$first,
-			Criteria::GREATER_EQUAL);
-
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(
-				\$whereCriteria->getNewCriterion(
-					self::SCOPE_COL,
-					\$scopeId,
-					Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-		  self::RIGHT_COL,
-			array('raw' => \$rightUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-	}
-";
-	}
-
-	protected function addShiftRLRange(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adds '\$delta' to all L and R values that are >= '\$first' and <= '\$last'.
-	 * '\$delta' can also be negative.
-	 *
-	 * @param      int \$first	First node to be shifted (L value)
-	 * @param      int \$last	Last node to be shifted (L value)
-	 * @param      int \$delta	Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     array 		Shifted L and R values
-	 */
-	protected static function shiftRLRange(\$first, \$last, \$delta, PropelPDO \$con = null, \$scopeId = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		\$leftUpdateCol = substr(self::LEFT_COL, strrpos(self::LEFT_COL, '.') + 1);
-		\$rightUpdateCol = substr(self::RIGHT_COL, strrpos(self::RIGHT_COL, '.') + 1);
-
-		// Shift left column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(self::LEFT_COL, \$first, Criteria::GREATER_EQUAL);
-		\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::LEFT_COL, \$last, Criteria::LESS_EQUAL));
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::SCOPE_COL, \$scopeId, Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-			self::LEFT_COL,
-			array('raw' => \$leftUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-
-		// Shift right column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(self::RIGHT_COL, \$first, Criteria::GREATER_EQUAL);
-		\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::RIGHT_COL, \$last, Criteria::LESS_EQUAL));
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::SCOPE_COL, \$scopeId, Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-			self::RIGHT_COL,
-			array('raw' => \$rightUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-
-		return array('left' => \$first + \$delta, 'right' => \$last + \$delta);
-	}
-";
-	}
-
-} // PHP5NestedSetPeerBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php
deleted file mode 100644
index dc83250..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php
+++ /dev/null
@@ -1,1115 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5NodeBuilder.php 1264 2009-10-26 21:58:09Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates a PHP5 tree node Object class for user object model (OM).
- *
- * This class produces the base tree node object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * This class replaces the Node.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NodeBuilder extends ObjectBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubNodeBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base class that represents a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." implements IteratorAggregate {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		$this->addAttributes($script);
-
-		$this->addConstructor($script);
-
-		$this->addCallOverload($script);
-		$this->addSetIteratorOptions($script);
-		$this->addGetIterator($script);
-
-		$this->addGetNodeObj($script);
-		$this->addGetNodePath($script);
-		$this->addGetNodeIndex($script);
-		$this->addGetNodeLevel($script);
-
-		$this->addHasChildNode($script);
-		$this->addGetChildNodeAt($script);
-		$this->addGetFirstChildNode($script);
-		$this->addGetLastChildNode($script);
-		$this->addGetSiblingNode($script);
-
-		$this->addGetParentNode($script);
-		$this->addGetAncestors($script);
-		$this->addIsRootNode($script);
-
-		$this->addSetNew($script);
-		$this->addSetDeleted($script);
-		$this->addAddChildNode($script);
-		$this->addMoveChildNode($script);
-		$this->addSave($script);
-
-		$this->addDelete($script);
-		$this->addEquals($script);
-
-		$this->addAttachParentNode($script);
-		$this->addAttachChildNode($script);
-		$this->addDetachParentNode($script);
-		$this->addDetachChildNode($script);
-		$this->addShiftChildNodes($script);
-		$this->addInsertNewChildNode($script);
-
-		$this->addAdjustStatus($script);
-		$this->addAdjustNodePath($script);
-
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-
-	/**
-	 * Adds class attributes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-		$script .= "
-	/**
-	 * @var        ".$this->getStubObjectBuilder()->getClassname()." object wrapped by this node.
-	 */
-	protected \$obj = null;
-
-	/**
-	 * The parent node for this node.
-	 * @var        ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	protected \$parentNode = null;
-
-	/**
-	 * Array of child nodes for this node. Nodes indexes are one-based.
-	 * @var        array
-	 */
-	protected \$childNodes = array();
-";
-	}
-
-	/**
-	 * Adds the constructor.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addConstructor(&$script)
-	{
-		$script .= "
-	/**
-	 * Constructor.
-	 *
-	 * @param      ".$this->getStubObjectBuilder()->getClassname()." \$obj Object wrapped by this node.
-	 */
-	public function __construct(\$obj = null)
-	{
-		if (\$obj !== null) {
-			\$this->obj = \$obj;
-		} else {
-			\$setNodePath = 'set' . ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_PHPNAME;
-			\$this->obj = new ".$this->getStubObjectBuilder()->getClassname()."();
-			\$this->obj->\$setNodePath('0');
-		}
-	}
-";
-	}
-
-
-
-	protected function addCallOverload(&$script)
-	{
-		$script .= "
-	/**
-	 * Convenience overload for wrapped object methods.
-	 *
-	 * @param      string Method name to call on wrapped object.
-	 * @param      mixed Parameter accepted by wrapped object set method.
-	 * @return     mixed Return value of wrapped object method.
-	 * @throws     PropelException Fails if method is not defined for wrapped object.
-	 */
-	public function __call(\$name, \$parms)
-	{
-		if (method_exists(\$this->obj, \$name))
-			return call_user_func_array(array(\$this->obj, \$name), \$parms);
-		else
-			throw new PropelException('get method not defined: \$name');
-	}
-";
-	}
-
-	protected function addSetIteratorOptions(&$script)
-	{
-		$script .= "
-
-	/**
-	 * Sets the default options for iterators created from this object.
-	 * The options are specified in map format. The following options
-	 * are supported by all iterators. Some iterators may support other
-	 * options:
-	 *
-	 *   \"querydb\" - True if nodes should be retrieved from database.
-	 *   \"con\" - Connection to use if retrieving from database.
-	 *
-	 * @param      string Type of iterator to use (\"pre\", \"post\", \"level\").
-	 * @param      array Map of option name => value.
-	 * @return     void
-	 * @todo       Implement other iterator types (i.e. post-order, level, etc.)
-	 */
-	public function setIteratorOptions(\$type, \$opts)
-	{
-		\$this->itType = \$type;
-		\$this->itOpts = \$opts;
-	}
-";
-	}
-
-	protected function addGetIterator(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns a pre-order iterator for this node and its children.
-	 *
-	 * @param      string Type of iterator to use (\"pre\", \"post\", \"level\")
-	 * @param      array Map of option name => value.
-	 * @return     NodeIterator
-	 */
-	public function getIterator(\$type = null, \$opts = null)
-	{
-		if (\$type === null)
-			\$type = (isset(\$this->itType) ? \$this->itType : 'Pre');
-
-		if (\$opts === null)
-			\$opts = (isset(\$this->itOpts) ? \$this->itOpts : array());
-
-		\$itclass = ucfirst(strtolower(\$type)) . 'OrderNodeIterator';
-
-    require_once('propel/om/' . \$itclass . '.php'); 
-		return new \$itclass(\$this, \$opts); 
-	}
-";
-	}
-
-	protected function addGetNodeObj(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns the object wrapped by this class.
-	 * @return     ".$this->getStubObjectBuilder()->getClassname()."
-	 */
-	public function getNodeObj()
-	{
-		return \$this->obj;
-	}
-";
-	}
-
-	protected function addGetNodePath(&$script)
-	{
-		$script .= "
-	/**
-	 * Convenience method for retrieving nodepath.
-	 * @return     string
-	 */
-	public function getNodePath()
-	{
-		\$getNodePath = 'get' . ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_PHPNAME;
-		return \$this->obj->\$getNodePath();
-	}
-";
-	}
-
-	protected function addGetNodeIndex(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns one-based node index among siblings.
-	 * @return     int
-	 */
-	public function getNodeIndex()
-	{
-		\$npath =& \$this->getNodePath();
-		\$sep = strrpos(\$npath, ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_SEP);
-		return (int) (\$sep !== false ? substr(\$npath, \$sep+1) : \$npath);
-	}
-";
-	}
-
-	protected function addGetNodeLevel(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns one-based node level within tree (root node is level 1).
-	 * @return     int
-	 */
-	public function getNodeLevel()
-	{
-		return (substr_count(\$this->getNodePath(), ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_SEP) + 1);
-	}
-";
-	}
-
-	protected function addHasChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns true if specified node is a child of this node. If recurse is
-	 * true, checks if specified node is a descendant of this node.
-	 *
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to look for.
-	 * @param      boolean True if strict comparison should be used.
-	 * @param      boolean True if all descendants should be checked.
-	 * @return     boolean
-	 */
-	public function hasChildNode(\$node, \$strict = false, \$recurse = false)
-	{
-		foreach (\$this->childNodes as \$childNode)
-		{
-			if (\$childNode->equals(\$node, \$strict))
-				return true;
-
-			if (\$recurse && \$childNode->hasChildNode(\$node, \$recurse))
-				return true;
-		}
-
-		return false;
-	}
-";
-	}
-
-	protected function addGetChildNodeAt(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns child node at one-based index. Retrieves from database if not
-	 * loaded yet.
-	 *
-	 * @param      int One-based child node index.
-	 * @param      boolean True if child should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getChildNodeAt(\$i, \$querydb = false, PropelPDO \$con = null)
-	{
-		if (\$querydb &&
-			!\$this->obj->isNew() &&
-			!\$this->obj->isDeleted() &&
-			!isset(\$this->childNodes[\$i]))
-		{
-			\$criteria = new Criteria(".$this->getStubPeerBuilder()->getClassname()."::DATABASE_NAME);
-			\$criteria->add(".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_COLNAME, \$this->getNodePath() . ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_SEP . \$i, Criteria::EQUAL);
-
-			if (\$childObj = ".$this->getStubPeerBuilder()->getClassname()."::doSelectOne(\$criteria, \$con))
-				\$this->attachChildNode(new ".$this->getStubNodeBuilder()->getClassname()."(\$childObj));
-		}
-
-		return (isset(\$this->childNodes[\$i]) ? \$this->childNodes[\$i] : null);
-	}
-";
-	}
-
-	protected function addGetFirstChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns first child node (if any). Retrieves from database if not loaded yet.
-	 *
-	 * @param      boolean True if child should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getFirstChildNode(\$querydb = false, PropelPDO \$con = null)
-	{
-		return \$this->getChildNodeAt(1, \$querydb, \$con);
-	}
-";
-	}
-
-	protected function addGetLastChildNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Returns last child node (if any).
-	 *
-	 * @param      boolean True if child should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 */
-	public function getLastChildNode(\$querydb = false, PropelPDO \$con = null)
-	{
-		\$lastNode = null;
-
-		if (\$this->obj->isNew() || \$this->obj->isDeleted())
-		{
-			end(\$this->childNodes);
-			\$lastNode = (count(\$this->childNodes) ? current(\$this->childNodes) : null);
-		}
-		else if (\$querydb)
-		{
-			\$db = Propel::getDb($peerClassname::DATABASE_NAME);
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-			\$criteria->add($nodePeerClassname::NPATH_COLNAME, \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . '%', Criteria::LIKE);
-			\$criteria->addAnd($nodePeerClassname::NPATH_COLNAME, \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . '%' . $nodePeerClassname::NPATH_SEP . '%', Criteria::NOT_LIKE);
-			$peerClassname::addSelectColumns(\$criteria);
-			\$criteria->addAsColumn('npathlen', \$db->strLength($nodePeerClassname::NPATH_COLNAME));
-			\$criteria->addDescendingOrderByColumn('npathlen');
-			\$criteria->addDescendingOrderByColumn($nodePeerClassname::NPATH_COLNAME);
-
-			\$lastObj = $peerClassname::doSelectOne(\$criteria, \$con);
-
-			if (\$lastObj !== null)
-			{
-				\$lastNode = new ".$this->getStubNodeBuilder()->getClassname()."(\$lastObj);
-
-				end(\$this->childNodes);
-				\$endNode = (count(\$this->childNodes) ? current(\$this->childNodes) : null);
-
-				if (\$endNode)
-				{
-					if (\$endNode->getNodePath() > \$lastNode->getNodePath())
-						throw new PropelException('Cached child node inconsistent with database.');
-					else if (\$endNode->getNodePath() == \$lastNode->getNodePath())
-						\$lastNode = \$endNode;
-					else
-						\$this->attachChildNode(\$lastNode);
-				}
-				else
-				{
-					\$this->attachChildNode(\$lastNode);
-				}
-			}
-		}
-
-		return \$lastNode;
-	}
-";
-	}
-
-	protected function addGetSiblingNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns next (or previous) sibling node or null. Retrieves from database if
-	 * not loaded yet.
-	 *
-	 * @param      boolean True if previous sibling should be returned.
-	 * @param      boolean True if sibling should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getSiblingNode(\$prev = false, \$querydb = false, PropelPDO \$con = null)
-	{
-		\$nidx = \$this->getNodeIndex();
-
-		if (\$this->isRootNode())
-		{
-			return null;
-		}
-		else if (\$prev)
-		{
-			if (\$nidx > 1 && (\$parentNode = \$this->getParentNode(\$querydb, \$con)))
-				return \$parentNode->getChildNodeAt(\$nidx-1, \$querydb, \$con);
-			else
-				return null;
-		}
-		else
-		{
-			if (\$parentNode = \$this->getParentNode(\$querydb, \$con))
-				return \$parentNode->getChildNodeAt(\$nidx+1, \$querydb, \$con);
-			else
-				return null;
-		}
-	}
-";
-	}
-
-	protected function addGetParentNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Returns parent node. Loads from database if not cached yet.
-	 *
-	 * @param      boolean True if parent should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getParentNode(\$querydb = true, PropelPDO \$con = null)
-	{
-		if (\$querydb &&
-			\$this->parentNode === null &&
-			!\$this->isRootNode() &&
-			!\$this->obj->isNew() &&
-			!\$this->obj->isDeleted())
-		{
-			\$npath =& \$this->getNodePath();
-			\$sep = strrpos(\$npath, $nodePeerClassname::NPATH_SEP);
-			\$ppath = substr(\$npath, 0, \$sep);
-
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-			\$criteria->add($nodePeerClassname::NPATH_COLNAME, \$ppath, Criteria::EQUAL);
-
-			if (\$parentObj = $peerClassname::doSelectOne(\$criteria, \$con))
-			{
-				\$parentNode = new ".$this->getStubNodeBuilder()->getClassname()."(\$parentObj);
-				\$parentNode->attachChildNode(\$this);
-			}
-		}
-
-		return \$this->parentNode;
-	}
-";
-	}
-
-	protected function addGetAncestors(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns an array of all ancestor nodes, starting with the root node
-	 * first.
-	 *
-	 * @param      boolean True if ancestors should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     array
-	 */
-	public function getAncestors(\$querydb = false, PropelPDO \$con = null)
-	{
-		\$ancestors = array();
-		\$parentNode = \$this;
-
-		while (\$parentNode = \$parentNode->getParentNode(\$querydb, \$con))
-			array_unshift(\$ancestors, \$parentNode);
-
-		return \$ancestors;
-	}
-";
-	}
-
-	protected function addIsRootNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns true if node is the root node of the tree.
-	 * @return     boolean
-	 */
-	public function isRootNode()
-	{
-		return (\$this->getNodePath() === '1');
-	}
-";
-	}
-
-	protected function addSetNew(&$script)
-	{
-		$script .= "
-	/**
-	 * Changes the state of the object and its descendants to 'new'.
-	 * Also changes the node path to '0' to indicate that it is not a
-	 * stored node.
-	 *
-	 * @param      boolean
-	 * @return     void
-	 */
-	public function setNew(\$b)
-	{
-		\$this->adjustStatus('new', \$b);
-		\$this->adjustNodePath(\$this->getNodePath(), '0');
-	}
-";
-	}
-
-	protected function addSetDeleted(&$script)
-	{
-		$script .= "
-	/**
-	 * Changes the state of the object and its descendants to 'deleted'.
-	 *
-	 * @param      boolean
-	 * @return     void
-	 */
-	public function setDeleted(\$b)
-	{
-		\$this->adjustStatus('deleted', \$b);
-	}
-";
-	}
-
-	protected function addAddChildNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Adds the specified node (and its children) as a child to this node. If a
-	 * valid \$beforeNode is specified, the node will be inserted in front of
-	 * \$beforeNode. If \$beforeNode is not specified the node will be appended to
-	 * the end of the child nodes.
-	 *
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to add.
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to insert before.
-	 * @param      PropelPDO Connection to use.
-	 */
-	public function addChildNode(\$node, \$beforeNode = null, PropelPDO \$con = null)
-	{
-		if (\$this->obj->isNew() && !\$node->obj->isNew())
-			throw new PropelException('Cannot add stored nodes to a new node.');
-
-		if (\$this->obj->isDeleted() || \$node->obj->isDeleted())
-			throw new PropelException('Cannot add children in a deleted state.');
-
-		if (\$this->hasChildNode(\$node))
-			throw new PropelException('Node is already a child of this node.');
-
-		if (\$beforeNode && !\$this->hasChildNode(\$beforeNode))
-			throw new PropelException('Invalid beforeNode.');
-
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		
-		if (!\$this->obj->isNew()) \$con->beginTransaction();
-		
-		try {	
-			if (\$beforeNode)
-			{
-				// Inserting before a node.
-				\$childIdx = \$beforeNode->getNodeIndex();
-				\$this->shiftChildNodes(1, \$beforeNode->getNodeIndex(), \$con);
-			}
-			else
-			{
-				// Appending child node.
-				if (\$lastNode = \$this->getLastChildNode(true, \$con))
-					\$childIdx = \$lastNode->getNodeIndex()+1;
-				else
-					\$childIdx = 1;
-			}
-
-			// Add the child (and its children) at the specified index.
-
-			if (!\$this->obj->isNew() && \$node->obj->isNew())
-			{
-				\$this->insertNewChildNode(\$node, \$childIdx, \$con);
-			}
-			else
-			{
-				// \$this->isNew() && \$node->isNew() ||
-				// !\$this->isNew() && !node->isNew()
-
-				\$srcPath = \$node->getNodePath();
-				\$dstPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$childIdx;
-
-				if (!\$node->obj->isNew())
-				{
-					$nodePeerClassname::moveNodeSubTree(\$srcPath, \$dstPath, \$con);
-					\$parentNode = \$node->getParentNode(true, \$con);
-				}
-				else
-				{
-					\$parentNode = \$node->getParentNode();
-				}
-
-				if (\$parentNode)
-				{
-					\$parentNode->detachChildNode(\$node);
-					\$parentNode->shiftChildNodes(-1, \$node->getNodeIndex()+1, \$con);
-				}
-
-				\$node->adjustNodePath(\$srcPath, \$dstPath);
-			}
-
-			if (!\$this->obj->isNew()) \$con->commit();
-
-			\$this->attachChildNode(\$node);
-
-		} catch (SQLException \$e) {
-			if (!\$this->obj->isNew()) \$con->rollBack();
-			throw new PropelException(\$e);
-		}
-	}
-";
-	}
-
-	protected function addMoveChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Moves the specified child node in the specified direction.
-	 *
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to move.
-	 * @param      int Number of spaces to move among siblings (may be negative).
-	 * @param      PropelPDO Connection to use.
-	 * @throws     PropelException
-	 */
-	public function moveChildNode(\$node, \$direction, PropelPDO \$con = null)
-	{
-		throw new PropelException('moveChildNode() not implemented yet.');
-	}
-";
-	}
-
-
-	protected function addSave(&$script)
-	{
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Saves modified object data to the datastore.
-	 *
-	 * @param      boolean If true, descendants will be saved as well.
-	 * @param      PropelPDO Connection to use.
-	 */
-	public function save(\$recurse = false, PropelPDO \$con = null)
-	{
-		if (\$this->obj->isDeleted())
-			throw new PropelException('Cannot save deleted node.');
-
-		if (substr(\$this->getNodePath(), 0, 1) == '0')
-			throw new PropelException('Cannot save unattached node.');
-
-		if (\$this->obj->isColumnModified($nodePeerClassname::NPATH_COLNAME))
-			throw new PropelException('Cannot save manually modified node path.');
-
-		\$this->obj->save(\$con);
-
-		if (\$recurse)
-		{
-			foreach (\$this->childNodes as \$childNode)
-				\$childNode->save(\$recurse, \$con);
-		}
-	}
-";
-	}
-
-
-	protected function addDelete(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Removes this object and all descendants from datastore.
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function delete(PropelPDO \$con = null)
-	{
-		if (\$this->obj->isDeleted()) {
-			throw new PropelException('This node has already been deleted.');
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-			
-		if (!\$this->obj->isNew()) {
-			$nodePeerClassname::deleteNodeSubTree(\$this->getNodePath(), \$con);
-		}
-
-		if (\$parentNode = \$this->getParentNode(true, \$con)) {
-			\$parentNode->detachChildNode(\$this);
-			\$parentNode->shiftChildNodes(-1, \$this->getNodeIndex()+1, \$con);
-		}
-
-		\$this->setDeleted(true);
-	}
-";
-	}
-
-	protected function addEquals(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Compares the object wrapped by this node with that of another node. Use
-	 * this instead of equality operators to prevent recursive dependency
-	 * errors.
-	 *
-	 * @param      $nodeClassname Node to compare.
-	 * @param      boolean True if strict comparison should be used.
-	 * @return     boolean
-	 */
-	public function equals(\$node, \$strict = false)
-	{
-		if (\$strict) {
-			return (\$this->obj === \$node->obj);
-		} else {
-			return (\$this->obj == \$node->obj);
-		}
-	}
-";
-	}
-
-	protected function addAttachParentNode(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$script .= "
-	/**
-	 * This method is used internally when constructing the tree structure
-	 * from the database. To set the parent of a node, you should call
-	 * addChildNode() on the parent.
-	 *
-	 * @param      $nodeClassname Parent node to attach.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function attachParentNode(\$node)
-	{
-		if (!\$node->hasChildNode(\$this, true))
-			throw new PropelException('Failed to attach parent node for non-child.');
-
-		\$this->parentNode = \$node;
-	}
-";
-	}
-
-
-	protected function addAttachChildNode(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * This method is used internally when constructing the tree structure
-	 * from the database. To add a child to a node you should call the
-	 * addChildNode() method instead.
-	 *
-	 * @param      $nodeClassname Child node to attach.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function attachChildNode(\$node)
-	{
-		if (\$this->hasChildNode(\$node))
-			throw new PropelException('Failed to attach child node. Node already exists.');
-
-		if (\$this->obj->isDeleted() || \$node->obj->isDeleted())
-			throw new PropelException('Failed to attach node in deleted state.');
-
-		if (\$this->obj->isNew() && !\$node->obj->isNew())
-			throw new PropelException('Failed to attach non-new child to new node.');
-
-		if (!\$this->obj->isNew() && \$node->obj->isNew())
-			throw new PropelException('Failed to attach new child to non-new node.');
-
-		if (\$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$node->getNodeIndex() != \$node->getNodePath())
-			throw new PropelException('Failed to attach child node. Node path mismatch.');
-
-		\$this->childNodes[\$node->getNodeIndex()] = \$node;
-		ksort(\$this->childNodes);
-
-		\$node->attachParentNode(\$this);
-	}
-";
-	}
-
-	protected function addDetachParentNode(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$script .= "
-	/**
-	 * This method is used internally when deleting nodes. It is used to break
-	 * the link to this node's parent.
-	 * @param      $nodeClassname Parent node to detach from.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function detachParentNode(\$node)
-	{
-		if (!\$node->hasChildNode(\$this, true))
-			throw new PropelException('Failed to detach parent node from non-child.');
-
-		unset(\$node->childNodes[\$this->getNodeIndex()]);
-		\$this->parentNode = null;
-	}
-";
-	}
-
-	protected function addDetachChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * This method is used internally when deleting nodes. It is used to break
-	 * the link to this between this node and the specified child.
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Child node to detach.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function detachChildNode(\$node)
-	{
-		if (!\$this->hasChildNode(\$node, true))
-			throw new PropelException('Failed to detach non-existent child node.');
-
-		unset(\$this->childNodes[\$node->getNodeIndex()]);
-		\$node->parentNode = null;
-	}
-";
-	}
-
-	protected function addShiftChildNodes(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Shifts child nodes in the specified direction and offset index. This
-	 * method assumes that there is already space available in the
-	 * direction/offset indicated.
-	 *
-	 * @param      int Direction/# spaces to shift. 1=leftshift, 1=rightshift
-	 * @param      int Node index to start shift at.
-	 * @param      PropelPDO The connection to be used.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	protected function shiftChildNodes(\$direction, \$offsetIdx, PropelPDO \$con)
-	{
-		if (\$this->obj->isDeleted())
-			throw new PropelException('Cannot shift nodes for deleted object');
-
-		\$lastNode = \$this->getLastChildNode(true, \$con);
-		\$lastIdx = (\$lastNode !== null ? \$lastNode->getNodeIndex() : 0);
-
-		if (\$lastNode === null || \$offsetIdx > \$lastIdx)
-			return;
-
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME);
-
-		if (!\$this->obj->isNew())
-		{
-			// Shift nodes in database.
-			
-			\$con->beginTransaction();
-			
-			try {
-				\$n = \$lastIdx - \$offsetIdx + 1;
-				\$i = \$direction < 1 ? \$offsetIdx : \$lastIdx;
-
-				while (\$n--)
-				{
-					\$srcPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$i;			  // 1.2.2
-					\$dstPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . (\$i+\$direction); // 1.2.3
-
-					$nodePeerClassname::moveNodeSubTree(\$srcPath, \$dstPath, \$con);
-
-					\$i -= \$direction;
-				}
-
-				\$con->commit();
-
-			} catch (SQLException \$e) {
-				\$con->rollBack();
-				throw new PropelException(\$e);
-			}
-		}
-
-		// Shift the in-memory objects.
-
-		\$n = \$lastIdx - \$offsetIdx + 1;
-		\$i = \$direction < 1 ? \$offsetIdx : \$lastIdx;
-
-		while (\$n--)
-		{
-			if (isset(\$this->childNodes[\$i]))
-			{
-				\$srcPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$i;			  // 1.2.2
-				\$dstPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . (\$i+\$direction); // 1.2.3
-
-				\$this->childNodes[\$i+\$direction] = \$this->childNodes[\$i];
-				\$this->childNodes[\$i+\$direction]->adjustNodePath(\$srcPath, \$dstPath);
-
-				unset(\$this->childNodes[\$i]);
-			}
-
-			\$i -= \$direction;
-		}
-
-		ksort(\$this->childNodes);
-	}
-";
-	}
-
-	protected function addInsertNewChildNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Inserts the node and its children at the specified childIdx.
-	 *
-	 * @param      $nodeClassname Node to insert.
-	 * @param      int One-based child index to insert at.
-	 * @param      PropelPDO Connection to use.
-	 * @param      void
-	 */
-	protected function insertNewChildNode(\$node, \$childIdx, PropelPDO \$con)
-	{
-		if (!\$node->obj->isNew())
-			throw new PropelException('Failed to insert non-new node.');
-
-		\$setNodePath = 'set' . $nodePeerClassname::NPATH_PHPNAME;
-
-		\$node->obj->\$setNodePath(\$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$childIdx);
-		\$node->obj->save(\$con);
-
-		\$i = 1;
-		foreach (\$node->childNodes as \$childNode)
-			\$node->insertNewChildNode(\$childNode, \$i++, \$con);
-	}
-";
-	}
-
-	protected function addAdjustStatus(&$script)
-	{
-		$script .= "
-	/**
-	 * Adjust new/deleted status of node and all children.
-	 *
-	 * @param      string Status to change ('New' or 'Deleted')
-	 * @param      boolean Value for status.
-	 * @return     void
-	 */
-	protected function adjustStatus(\$status, \$b)
-	{
-		\$setStatus = 'set' . \$status;
-
-		\$this->obj->\$setStatus(\$b);
-
-		foreach (\$this->childNodes as \$childNode)
-			\$childNode->obj->\$setStatus(\$b);
-	}
-";
-	}
-
-	protected function addAdjustNodePath(&$script)
-	{
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adjust path of node and all children. This is used internally when
-	 * inserting/moving nodes.
-	 *
-	 * @param      string Section of old path to change.
-	 * @param      string New section to replace old path with.
-	 * @return     void
-	 */
-	protected function adjustNodePath(\$oldBasePath, \$newBasePath)
-	{
-		\$setNodePath = 'set' . $nodePeerClassname::NPATH_PHPNAME;
-
-		\$this->obj->\$setNodePath(\$newBasePath .  substr(\$this->getNodePath(), strlen(\$oldBasePath)));
-		\$this->obj->resetModified($nodePeerClassname::NPATH_COLNAME);
-
-		foreach (\$this->childNodes as \$childNode)
-			\$childNode->adjustNodePath(\$oldBasePath, \$newBasePath);
-	}
-";
-	}
-
-} // PHP5NodeObjectBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php
deleted file mode 100644
index 58a3f6d..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php
+++ /dev/null
@@ -1,765 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5NodePeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates a PHP5 tree node Peer class for user object model (OM).
- *
- * This class produces the base tree node object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * This class replaces the Node.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NodePeerBuilder extends PeerBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubNodePeerBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base  static class for performing query operations on the tree contained by the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		// FIXME
-		// - Probably the build needs to be customized for supporting
-		// tables that are "aliases".  -- definitely a fringe usecase, though.
-
-		$this->addConstants($script);
-
-		$this->addIsCodeBase($script);
-
-		$this->addRetrieveMethods($script);
-
-		$this->addCreateNewRootNode($script);
-		$this->addInsertNewRootNode($script);
-		$this->addMoveNodeSubTree($script);
-		$this->addDeleteNodeSubTree($script);
-
-		$this->addBuildFamilyCriteria($script);
-		$this->addBuildTree($script);
-
-		$this->addPopulateNodes($script);
-
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-	protected function addConstants(&$script)
-	{
-		$table = $this->getTable();
-
-		$npath_colname = '';
-		$npath_phpname = '';
-		$npath_len = 0;
-		$npath_sep = '';
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNodeKey()) {
-				$npath_colname = $table->getName() . '.' . strtoupper($col->getName());
-				$npath_phpname = $col->getPhpName();
-				$npath_len = $col->getSize();
-				$npath_sep = $col->getNodeKeySep();
-				break;
-			}
-		}
-		$script .= "
-	const NPATH_COLNAME = '$npath_colname';
-	const NPATH_PHPNAME = '$npath_phpname';
-	const NPATH_SEP		= '$npath_sep';
-	const NPATH_LEN		= $npath_len;
-";
-	}
-
-
-	protected function addIsCodeBase(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Temp function for CodeBase hacks that will go away.
-	 */
-	public static function isCodeBase(\$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME);
-
-		return (get_class(\$con) == 'ODBCConnection' &&
-				get_class(\$con->getAdapter()) == 'CodeBaseAdapter');
-	}
-";
-	}
-
-
-	protected function addCreateNewRootNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Create a new Node at the top of tree. This method will destroy any
-	 * existing root node (along with its children).
-	 *
-	 * Use at your own risk!
-	 *
-	 * @param      $objectClassname Object wrapped by new node.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $nodeObjectClassname
-	 * @throws     PropelException
-	 */
-	public static function createNewRootNode(\$obj, PropelPDO \$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		
-		\$con->beginTransaction();
-		
-		try {
-			self::deleteNodeSubTree('1', \$con);
-
-			\$setNodePath = 'set' . self::NPATH_PHPNAME;
-
-			\$obj->\$setNodePath('1');
-			\$obj->save(\$con);
-
-			\$con->commit();
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-
-		return new $nodeObjectClassname(\$obj);
-	}
-";
-	}
-
-	protected function addInsertNewRootNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Inserts a new Node at the top of tree. Any existing root node (along with
-	 * its children) will be made a child of the new root node. This is a
-	 * safer alternative to createNewRootNode().
-	 *
-	 * @param      $objectClassname Object wrapped by new node.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $nodeObjectClassname
-	 * @throws     PropelException
-	 */
-	public static function insertNewRootNode(\$obj, PropelPDO \$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		
-		\$con->beginTransaction();
-		try {
-			// Move root tree to an invalid node path.
-			$nodePeerClassname::moveNodeSubTree('1', '0', \$con);
-
-			\$setNodePath = 'set' . self::NPATH_PHPNAME;
-
-			// Insert the new root node.
-			\$obj->\$setNodePath('1');
-			\$obj->save(\$con);
-
-			// Move the old root tree as a child of the new root.
-			$nodePeerClassname::moveNodeSubTree('0', '1' . self::NPATH_SEP . '1', \$con);
-
-			\$con->commit();
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-
-		return new $nodeObjectClassname(\$obj);
-	}
-";
-	}
-
-	/**
-	 * Adds the methods for retrieving nodes.
-	 */
-	protected function addRetrieveMethods(&$script)
-	{
-		$this->addRetrieveNodes($script);
-		$this->addRetrieveNodeByPK($script);
-		$this->addRetrieveNodeByNP($script);
-		$this->addRetrieveRootNode($script);
-
-	}
-
-	protected function addRetrieveNodes(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Retrieves an array of tree nodes based on specified criteria. Optionally
-	 * includes all parent and/or child nodes of the matching nodes.
-	 *
-	 * @param      Criteria Criteria to use.
-	 * @param      boolean True if ancestors should also be retrieved.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     array Array of root nodes.
-	 */
-	public static function retrieveNodes(\$criteria, \$ancestors = false, \$descendants = false, PropelPDO \$con = null)
-	{
-		\$criteria = $nodePeerClassname::buildFamilyCriteria(\$criteria, \$ancestors, \$descendants);
-		\$stmt = ".$this->getStubPeerBuilder()->getClassname()."::doSelectStmt(\$criteria, \$con);
-		return self::populateNodes(\$stmt, \$criteria);
-	}
-";
-	}
-
-	protected function addRetrieveNodeByPK(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Retrieves a tree node based on a primary key. Optionally includes all
-	 * parent and/or child nodes of the matching node.
-	 *
-	 * @param      mixed $objectClassname primary key (array for composite keys)
-	 * @param      boolean True if ancestors should also be retrieved.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $nodeObjectClassname
-	 */
-	public static function retrieveNodeByPK(\$pk, \$ancestors = false, \$descendants = false, PropelPDO \$con = null)
-	{
-		throw new PropelException('retrieveNodeByPK() not implemented yet.');
-	}
-";
-	}
-
-	protected function addRetrieveNodeByNP(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Retrieves a tree node based on a node path. Optionally includes all
-	 * parent and/or child nodes of the matching node.
-	 *
-	 * @param      string Node path to retrieve.
-	 * @param      boolean True if ancestors should also be retrieved.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $objectClassname
-	 */
-	public static function retrieveNodeByNP(\$np, \$ancestors = false, \$descendants = false, PropelPDO \$con = null)
-	{
-		\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criteria->add(self::NPATH_COLNAME, \$np, Criteria::EQUAL);
-		\$criteria = self::buildFamilyCriteria(\$criteria, \$ancestors, \$descendants);
-		\$stmt = $peerClassname::doSelectStmt(\$criteria, \$con);
-		\$nodes = self::populateNodes(\$stmt, \$criteria);
-		return (count(\$nodes) == 1 ? \$nodes[0] : null);
-	}
-";
-	}
-
-	protected function addRetrieveRootNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Retrieves the root node.
-	 *
-	 * @param      string Node path to retrieve.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public static function retrieveRootNode(\$descendants = false, PropelPDO \$con = null)
-	{
-		return self::retrieveNodeByNP('1', false, \$descendants, \$con);
-	}
-";
-	}
-
-	protected function addMoveNodeSubTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Moves the node subtree at srcpath to the dstpath. This method is intended
-	 * for internal use by the BaseNode object. Note that it does not check for
-	 * preexisting nodes at the dstpath. It also does not update the  node path
-	 * of any Node objects that might currently be in memory.
-	 *
-	 * Use at your own risk!
-	 *
-	 * @param      string Source node path to move (root of the src subtree).
-	 * @param      string Destination node path to move to (root of the dst subtree).
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 * @todo       This is currently broken for simulated 'onCascadeDelete's.
-	 * @todo       Need to abstract the SQL better. The CONCAT sql function doesn't
-	 *       seem to be standardized (i.e. mssql), so maybe it needs to be moved
-	 *       to DBAdapter.
-	 */
-	public static function moveNodeSubTree(\$srcPath, \$dstPath, PropelPDO \$con = null)
-	{
-		if (substr(\$dstPath, 0, strlen(\$srcPath)) == \$srcPath)
-			throw new PropelException('Cannot move a node subtree within itself.');
-
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-
-		/**
-		 * Example:
-		 * UPDATE table
-		 * SET npath = CONCAT('1.3', SUBSTRING(npath, 6, 74))
-		 * WHERE npath = '1.2.2' OR npath LIKE '1.2.2.%'
-		 */
-
-		\$npath = $nodePeerClassname::NPATH_COLNAME;
-		//the following dot isn`t mean`t a nodeKeySeperator
-		\$setcol = substr(\$npath, strrpos(\$npath, '.')+1);
-		\$setcollen = $nodePeerClassname::NPATH_LEN;
-		\$db = Propel::getDb($peerClassname::DATABASE_NAME);
-
-		// <hack>
-		if ($nodePeerClassname::isCodeBase(\$con))
-		{
-			// This is a hack to get CodeBase working. It will eventually be removed.
-			// It is a workaround for the following CodeBase bug:
-			//   -Prepared statement parameters cannot be embedded in SQL functions (i.e. CONCAT)
-			\$sql = \"UPDATE \" . $peerClassname::TABLE_NAME . \" \" .
-				   \"SET \$setcol=\" . \$db->concatString(\"'\$dstPath'\", \$db->subString(\$npath, strlen(\$srcPath)+1, \$setcollen)) . \" \" .
-				   \"WHERE \$npath = '\$srcPath' OR \$npath LIKE '\" . \$srcPath . $nodePeerClassname::NPATH_SEP . \"%'\";
-
-			\$con->executeUpdate(\$sql);
-		}
-		else
-		{
-		// </hack>
-			\$sql = \"UPDATE \" . $peerClassname::TABLE_NAME . \" \" .
-				   \"SET \$setcol=\" . \$db->concatString('?', \$db->subString(\$npath, '?', '?')) . \" \" .
-				   \"WHERE \$npath = ? OR \$npath LIKE ?\";
-
-			\$stmt = \$con->prepare(\$sql);
-			\$stmt->bindValue(1, \$dstPath); // string
-			\$srcPathPlus1 = strlen(\$srcPath)+1;
-			\$stmt->bindValue(2, \$srcPathPlus1); // int
-			\$stmt->bindValue(3, \$setcollen);// int
-			\$stmt->bindValue(4, \$srcPath);// string
-			\$srcPathWC = \$srcPath . $nodePeerClassname::NPATH_SEP . '%';
-			\$stmt->bindValue(5, \$srcPathWC); // string
-			\$stmt->execute();			
-		// <hack>
-		}
-	}
-";
-	}
-
-	protected function addDeleteNodeSubTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Deletes the node subtree at the specified node path from the database.
-	 *
-	 * @param      string Node path to delete
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 * @todo       This is currently broken for simulated 'onCascadeDelete's.
-	 */
-	public static function deleteNodeSubTree(\$nodePath, PropelPDO \$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-
-		/**
-		 * DELETE FROM table
-		 * WHERE npath = '1.2.2' OR npath LIKE '1.2.2.%'
-		 */
-
-		\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criteria->add($nodePeerClassname::NPATH_COLNAME, \$nodePath, Criteria::EQUAL);
-		\$criteria->addOr($nodePeerClassname::NPATH_COLNAME, \$nodePath . self::NPATH_SEP . '%', Criteria::LIKE);
-		{$this->basePeerClassname}::doDelete(\$criteria, \$con);
-	}
-";
-	}
-
-	protected function addBuildFamilyCriteria(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Builds the criteria needed to retrieve node ancestors and/or descendants.
-	 *
-	 * @param      Criteria Criteria to start with
-	 * @param      boolean True if ancestors should be retrieved.
-	 * @param      boolean True if descendants should be retrieved.
-	 * @return     Criteria
-	 */
-	public static function buildFamilyCriteria(\$criteria, \$ancestors = false, \$descendants = false)
-	{
-		/*
-			Example SQL to retrieve nodepath '1.2.3' with both ancestors and descendants:
-
-			SELECT L.NPATH, L.LABEL, test.NPATH, UCASE(L.NPATH)
-			FROM test L, test
-			WHERE test.NPATH='1.2.3' AND
-				 (L.NPATH=SUBSTRING(test.NPATH, 1, LENGTH(L.NPATH)) OR
-				  test.NPATH=SUBSTRING(L.NPATH, 1, LENGTH(test.NPATH)))
-			ORDER BY UCASE(L.NPATH) ASC
-		*/
-
-		if (\$criteria === null)
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-
-		if (!\$criteria->getSelectColumns())
-			$peerClassname::addSelectColumns(\$criteria);
-
-		\$db = Propel::getDb(\$criteria->getDbName());
-
-		if ((\$ancestors || \$descendants) && \$criteria->size())
-		{
-			// If we are retrieving ancestors/descendants, we need to do a
-			// self-join to locate them. The exception to this is if no search
-			// criteria is specified. In this case we're retrieving all nodes
-			// anyway, so there is no need to do a self-join.
-
-			// The left-side of the self-join will contain the columns we'll
-			// use to build node objects (target node records along with their
-			// ancestors and/or descendants). The right-side of the join will
-			// contain the target node records specified by the initial criteria.
-			// These are used to match the appropriate ancestor/descendant on
-			// the left.
-
-			// Specify an alias for the left-side table to use.
-			\$criteria->addAlias('L', $peerClassname::TABLE_NAME);
-
-			// Make sure we have select columns to begin with.
-			if (!\$criteria->getSelectColumns())
-				$peerClassname::addSelectColumns(\$criteria);
-
-			// Replace any existing columns for the right-side table with the
-			// left-side alias.
-			\$selectColumns = \$criteria->getSelectColumns();
-			\$criteria->clearSelectColumns();
-			foreach (\$selectColumns as \$colName)
-				\$criteria->addSelectColumn(str_replace($peerClassname::TABLE_NAME, 'L', \$colName));
-
-			\$a = null;
-			\$d = null;
-
-			\$npathL = $peerClassname::alias('L', $nodePeerClassname::NPATH_COLNAME);
-			\$npathR = $nodePeerClassname::NPATH_COLNAME;
-			\$npath_len = $nodePeerClassname::NPATH_LEN;
-
-			if (\$ancestors)
-			{
-				// For ancestors, match left-side node paths which are contained
-				// by right-side node paths.
-				\$a = \$criteria->getNewCriterion(\$npathL,
-								                \"\$npathL=\" . \$db->subString(\$npathR, 1, \$db->strLength(\$npathL), \$npath_len),
-								                Criteria::CUSTOM);
-			}
-
-			if (\$descendants)
-			{
-				// For descendants, match left-side node paths which contain
-				// right-side node paths.
-				\$d = \$criteria->getNewCriterion(\$npathR,
-								                \"\$npathR=\" . \$db->subString(\$npathL, 1, \$db->strLength(\$npathR), \$npath_len),
-								                Criteria::CUSTOM);
-			}
-
-			if (\$a)
-			{
-				if (\$d) \$a->addOr(\$d);
-				\$criteria->addAnd(\$a);
-			}
-			else if (\$d)
-			{
-				\$criteria->addAnd(\$d);
-			}
-
-			// Add the target node path column. This is used by populateNodes().
-			\$criteria->addSelectColumn(\$npathR);
-
-			// Sort by node path to speed up tree construction in populateNodes()
-			\$criteria->addAsColumn('npathlen', \$db->strLength(\$npathL));
-			\$criteria->addAscendingOrderByColumn('npathlen');
-			\$criteria->addAscendingOrderByColumn(\$npathL);
-		}
-		else
-		{
-			// Add the target node path column. This is used by populateNodes().
-			\$criteria->addSelectColumn($nodePeerClassname::NPATH_COLNAME);
-
-			// Sort by node path to speed up tree construction in populateNodes()
-			\$criteria->addAsColumn('npathlen', \$db->strLength($nodePeerClassname::NPATH_COLNAME));
-			\$criteria->addAscendingOrderByColumn('npathlen');
-			\$criteria->addAscendingOrderByColumn($nodePeerClassname::NPATH_COLNAME);
-		}
-
-		return \$criteria;
-	}
-";
-	}
-
-	protected function addBuildTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * This method reconstructs as much of the tree structure as possible from
-	 * the given array of objects. Depending on how you execute your query, it
-	 * is possible for the ResultSet to contain multiple tree fragments (i.e.
-	 * subtrees). The array returned by this method will contain one entry
-	 * for each subtree root node it finds. The remaining subtree nodes are
-	 * accessible from the $nodeObjectClassname methods of the
-	 * subtree root nodes.
-	 *
-	 * @param      array Array of $nodeObjectClassname objects
-	 * @return     array Array of $nodeObjectClassname objects
-	 */
-	public static function buildTree(\$nodes)
-	{
-		// Subtree root nodes to return
-		\$rootNodes = array();
-
-		// Build the tree relations
-		foreach (\$nodes as \$node)
-		{
-			\$sep = strrpos(\$node->getNodePath(), $nodePeerClassname::NPATH_SEP);
-			\$parentPath = (\$sep !== false ? substr(\$node->getNodePath(), 0, \$sep) : '');
-			\$parentNode = null;
-
-			// Scan other nodes for parent.
-			foreach (\$nodes as \$pnode)
-			{
-				if (\$pnode->getNodePath() === \$parentPath)
-				{
-					\$parentNode = \$pnode;
-					break;
-				}
-			}
-
-			// If parent was found, attach as child, otherwise its a subtree root
-			if (\$parentNode)
-				\$parentNode->attachChildNode(\$node);
-			else
-				\$rootNodes[] = \$node;
-		}
-
-		return \$rootNodes;
-	}
-";
-	}
-
-	protected function addPopulateNodes(&$script)
-	{
-		$table = $this->getTable();
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Populates the $objectClassname objects from the
-	 * specified ResultSet, wraps them in $nodeObjectClassname
-	 * objects and build the appropriate node relationships.
-	 * The array returned by this method will only include the initial targets
-	 * of the query, even if ancestors/descendants were also requested.
-	 * The ancestors/descendants will be cached in memory and are accessible via
-	 * the getNode() methods.
-	 *
-	 * @param      PDOStatement \$stmt	Executed PDOStatement
-	 * @param      Criteria
-	 * @return     array Array of $nodeObjectClassname objects.
-	 */
-	public static function populateNodes(PDOStatement \$stmt, \$criteria)
-	{
-		\$nodes = array();
-		\$targets = array();
-		\$targetfld = count(\$criteria->getSelectColumns());
-";
-
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = $peerClassname::getOMClass();
-		\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		// populate the object(s)
-		foreach(\$stmt->fetchAll() AS \$row)
-		{
-			if (!isset(\$nodes[\$row[0]]))
-			{
-";
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = $peerClassname::getOMClass(\$row, 1);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		" . $this->buildObjectInstanceCreationCode('$obj', '$cls') . "
-				\$obj->hydrate(\$row);
-
-				\$nodes[\$row[0]] = new $nodeObjectClassname(\$obj);
-			}
-
-			\$node = \$nodes[\$row[0]];
-
-			if (\$node->getNodePath() === \$row[\$targetfld])
-				\$targets[\$node->getNodePath()] = \$node;
-		}
-
-		$nodePeerClassname::buildTree(\$nodes);
-
-		return array_values(\$targets);
-	}
-";
-	}
-
-} // PHP5NodePeerBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php
deleted file mode 100644
index beb6fdc..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php
+++ /dev/null
@@ -1,4071 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ObjectBuilder.php 1639 2010-03-25 22:11:59Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates a PHP5 base Object class for user object model (OM).
- *
- * This class produces the base object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ObjectBuilder extends ObjectBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubObjectBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Validates the current table to make sure that it won't
-	 * result in generated code that will not parse.
-	 *
-	 * This method may emit warnings for code which may cause problems
-	 * and will throw exceptions for errors that will definitely cause
-	 * problems.
-	 */
-	protected function validateModel()
-	{
-		parent::validateModel();
-
-		$table = $this->getTable();
-
-		// Check to see whether any generated foreign key names
-		// will conflict with column names.
-
-		$colPhpNames = array();
-		$fkPhpNames = array();
-
-		foreach ($table->getColumns() as $col) {
-			$colPhpNames[] = $col->getPhpName();
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$fkPhpNames[] = $this->getFKPhpNameAffix($fk, $plural = false);
-		}
-
-		$intersect = array_intersect($colPhpNames, $fkPhpNames);
-		if (!empty($intersect)) {
-			throw new EngineException("One or more of your column names for [" . $table->getName() . "] table conflict with foreign key names (" . implode(", ", $intersect) . ")");
-		}
-
-		// Check foreign keys to see if there are any foreign keys that
-		// are also matched with an inversed referencing foreign key
-		// (this is currently unsupported behavior)
-		// see: http://propel.phpdb.org/trac/ticket/549
-
-		foreach ($table->getForeignKeys() as $fk) {
-			if ($fk->isMatchedByInverseFK()) {
-				throw new EngineException("The 1:1 relationship expressed by foreign key " . $fk->getName() . " is defined in both directions; Propel does not currently support this (if you must have both foreign key constraints, consider adding this constraint with a custom SQL file.)" );
-			}
-		}
-	}
-
-	/**
-	 * Returns the appropriate formatter (from platform) for a date/time column.
-	 * @param      Column $col
-	 * @return     string
-	 */
-	protected function getTemporalFormatter(Column $col)
-	{
-		$fmt = null;
-		if ($col->getType() === PropelTypes::DATE) {
-			$fmt = $this->getPlatform()->getDateFormatter();
-		} elseif ($col->getType() === PropelTypes::TIME) {
-			$fmt = $this->getPlatform()->getTimeFormatter();
-		} elseif ($col->getType() === PropelTypes::TIMESTAMP) {
-			$fmt = $this->getPlatform()->getTimestampFormatter();
-		}
-		return $fmt;
-	}
-
-	/**
-	 * Returns the type-casted and stringified default value for the specified Column.
-	 * This only works for scalar default values currently.
-	 * @return     string The default value or 'NULL' if there is none.
-	 */
-	protected function getDefaultValueString(Column $col)
-	{
-		$defaultValue = var_export(null, true);
-		if (($val = $col->getPhpDefaultValue()) !== null) {
-			if ($col->isTemporalType()) {
-				$fmt = $this->getTemporalFormatter($col);
-				try {
-					if (!($this->getPlatform() instanceof MysqlPlatform &&
-					($val === '0000-00-00 00:00:00' || $val === '0000-00-00'))) {
-						// while technically this is not a default value of NULL,
-						// this seems to be closest in meaning.
-						$defDt = new DateTime($val);
-						$defaultValue = var_export($defDt->format($fmt), true);
-					}
-				} catch (Exception $x) {
-					// prevent endless loop when timezone is undefined
-					date_default_timezone_set('America/Los_Angeles');
-					throw new EngineException("Unable to parse default temporal value for " . $col->getFullyQualifiedName() . ": " .$this->getDefaultValueString($col), $x);
-				}
-			} else {
-				if ($col->isPhpPrimitiveType()) {
-					settype($val, $col->getPhpType());
-					$defaultValue = var_export($val, true);
-				} elseif ($col->isPhpObjectType()) {
-					$defaultValue = 'new '.$col->getPhpType().'(' . var_export($val, true) . ')';
-				} else {
-					throw new EngineException("Cannot get default value string for " . $col->getFullyQualifiedName());
-				}
-			}
-		}
-		return $defaultValue;
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-		$interface = $this->getInterface();
-
-		$script .= "
-/**
- * Base class that represents a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." extends ".ClassTools::classname($this->getBaseClass())." ";
-
-		$interface = ClassTools::getInterface($table);
-		if ($interface) {
-			$script .= " implements " . ClassTools::classname($interface);
-		}
-
-		$script .= " {
-
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-		if (!$table->isAlias()) {
-			$this->addConstants($script);
-			$this->addAttributes($script);
-		}
-
-    if ($this->hasDefaultValues()) {
-      $this->addApplyDefaultValues($script);
-      $this->addConstructor($script);
-    }
-
-		$this->addColumnAccessorMethods($script);
-		$this->addColumnMutatorMethods($script);
-
-		$this->addHasOnlyDefaultValues($script);
-
-		$this->addHydrate($script);
-		$this->addEnsureConsistency($script);
-
-		if (!$table->isReadOnly()) {
-			$this->addManipulationMethods($script);
-		}
-
-    if ($this->isAddValidateMethod())
-    {
-      $this->addValidationMethods($script);
-    }
-
-		if ($this->isAddGenericAccessors()) {
-			$this->addGetByName($script);
-			$this->addGetByPosition($script);
-			$this->addToArray($script);
-		}
-
-		if ($this->isAddGenericMutators()) {
-			$this->addSetByName($script);
-			$this->addSetByPosition($script);
-			$this->addFromArray($script);
-		}
-
-		$this->addBuildCriteria($script);
-		$this->addBuildPkeyCriteria($script);
-		$this->addGetPrimaryKey($script);
-		$this->addSetPrimaryKey($script);
-
-		$this->addCopy($script);
-
-		if (!$table->isAlias()) {
-			$this->addGetPeer($script);
-		}
-
-		$this->addFKMethods($script);
-		$this->addRefFKMethods($script);
-		$this->addClearAllReferences($script);
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('objectMethods', $script, "	");
-		
-		$this->addPrimaryString($script);
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-    $this->applyBehaviorModifier('objectFilter', $script, "");
-	}
-
-	/**
-	 * Adds any constants to the class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addConstants(&$script)
-	{
-		// nothing to do here any more
-		// fieldnameTypeConstants have been moved to class BasePeer [sv]
-	}
-
-	/**
-	 * Adds class attributes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * The Peer class.
-	 * Instance provides a convenient way of calling static methods on a class
-	 * that calling code may not be able to identify.
-	 * @var        ".$this->getPeerClassname()."
-	 */
-	protected static \$peer;
-";
-		if (!$table->isAlias()) {
-			$this->addColumnAttributes($script);
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$this->addFKAttributes($script, $fk);
-		}
-
-		foreach ($table->getReferrers() as $refFK) {
-			// if ($refFK->getTable()->getName() != $table->getName()) {
-			$this->addRefFKAttributes($script, $refFK);
-			// }
-		}
-
-		$this->addAlreadyInSaveAttribute($script);
-		$this->addAlreadyInValidationAttribute($script);
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('objectAttributes', $script, "	");
-	}
-
-	/**
-	 * Adds variables that store column values.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addColumnNameConstants()
-	 */
-	protected function addColumnAttributes(&$script) {
-
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			$this->addColumnAttributeComment($script, $col);
-			$this->addColumnAttributeDeclaration($script, $col);
-			if ($col->isLazyLoad() ) {
-				$this->addColumnAttributeLoaderComment($script, $col);
-				$this->addColumnAttributeLoaderDeclaration($script, $col);
-			}
-		}
-	}
-
-	/**
-	 * Add comment about the attribute (variable) that stores column values
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeComment(&$script, Column $col) {
-		$cptype = $col->getPhpType();
-		$clo = strtolower($col->getName());
-
-		$script .= "
-	/**
-	 * The value for the $clo field.";
-		if ($col->getDefaultValue()) {
-			if ($col->getDefaultValue()->isExpression()) {
-				$script .= "
-	 * Note: this column has a database default value of: (expression) ".$col->getDefaultValue()->getValue();
-			} else {
-				$script .= "
-	 * Note: this column has a database default value of: ". $this->getDefaultValueString($col);
-			}
-		}
-		$script .= "
-	 * @var        $cptype
-	 */";
-	}
-
-	/**
-	 * Adds the declaration of a column value storage attribute
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeDeclaration(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$script .= "
-	protected \$" . $clo . ";
-";
-	}
-
-	/**
-	 * Adds the comment about the attribute keeping track if an attribute value has been loaded
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeLoaderComment(&$script, Column $col) {
-		$script .= "
-	/**
-	 * Whether the lazy-loaded $clo value has been loaded from database.
-	 * This is necessary to avoid repeated lookups if $clo column is NULL in the db.
-	 * @var        boolean
-	 */";
-	}
-
-	/**
-	 * Adds the declaration of the attribute keeping track of an attribute's loaded state
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeLoaderDeclaration(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$script .= "
-	protected \$".$clo."_isLoaded = false;
-";
-	}
-
-	/**
-	 * Adds the getPeer() method.
-	 * This is a convenient, non introspective way of getting the Peer class for a particular object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPeer(&$script)
-	{
-		$this->addGetPeerComment($script);
-		$this->addGetPeerFunctionOpen($script);
-		$this->addGetPeerFunctionBody($script);
-		$this->addGetPeerFunctionClose($script);
-	}
-
-	/**
-	 * Add the comment for the getPeer method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerComment(&$script) {
-		$script .= "
-	/**
-	 * Returns a peer instance associated with this om.
-	 *
-	 * Since Peer classes are not to have any instance attributes, this method returns the
-	 * same instance for all member of this class. The method could therefore
-	 * be static, but this would prevent one from overriding the behavior.
-	 *
-	 * @return     ".$this->getPeerClassname()."
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration (function opening) for the getPeer method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerFunctionOpen(&$script) {
-		$script .= "
-	public function getPeer()
-	{";
-	}
-
-	/**
-	 * Adds the body of the getPeer method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerFunctionBody(&$script) {
-		$script .= "
-		if (self::\$peer === null) {
-			" . $this->buildObjectInstanceCreationCode('self::$peer', $this->getPeerClassname()) . "
-		}
-		return self::\$peer;";
-	}
-
-	/**
-	 * Add the function close for the getPeer method
-	 * Note: this is just a } and the body ends with a return statement, so it's quite useless. But it's here anyway for consisency, cause there's a close function for all functions and in some other instances, they are useful
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerFunctionClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the constructor for this object.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addConstructor()
-	 */
-	protected function addConstructor(&$script)
-	{
-		$this->addConstructorComment($script);
-		$this->addConstructorOpen($script);
-		$this->addConstructorBody($script);
-		$this->addConstructorClose($script);
-	}
-
-	/**
-	 * Adds the comment for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorComment(&$script) {
-		$script .= "
-	/**
-	 * Initializes internal state of ".$this->getClassname()." object.
-	 * @see        applyDefaults()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorOpen(&$script) {
-		$script .= "
-	public function __construct()
-	{";
-	}
-
-	/**
-	 * Adds the function body for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorBody(&$script) {
-		$script .= "
-		parent::__construct();
-		\$this->applyDefaultValues();";
-	}
-
-	/**
-	 * Adds the function close for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the applyDefaults() method, which is called from the constructor.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addConstructor()
-	 */
-	protected function addApplyDefaultValues(&$script)
-	{
-		$this->addApplyDefaultValuesComment($script);
-		$this->addApplyDefaultValuesOpen($script);
-		$this->addApplyDefaultValuesBody($script);
-		$this->addApplyDefaultValuesClose($script);
-	}
-
-	/**
-	 * Adds the comment for the applyDefaults method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesComment(&$script) {
-		$script .= "
-	/**
-	 * Applies default values to this object.
-	 * This method should be called from the object's constructor (or
-	 * equivalent initialization method).
-	 * @see        __construct()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the applyDefaults method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesOpen(&$script) {
-		 $script .= "
-	public function applyDefaultValues()
-	{";
-	}
-
-	/**
-	 * Adds the function body of the applyDefault method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesBody(&$script) {
-		$table = $this->getTable();
-		// FIXME - Apply support for PHP default expressions here
-		// see: http://propel.phpdb.org/trac/ticket/378
-
-		$colsWithDefaults = array();
-		foreach ($table->getColumns() as $col) {
-			$def = $col->getDefaultValue();
-			if ($def !== null && !$def->isExpression()) {
-				$colsWithDefaults[] = $col;
-			}
-		}
-
-		$colconsts = array();
-		foreach ($colsWithDefaults as $col) {
-			$clo = strtolower($col->getName());
-			$script .= "
-		\$this->".$clo." = ".$this->getDefaultValueString($col).";";
-
-		}
-	}
-
-
-	/**
-	 * Adds the function close for the applyDefaults method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	// --------------------------------------------------------------
-	//
-	// A C C E S S O R    M E T H O D S
-	//
-	// --------------------------------------------------------------
-
-	/**
-	 * Adds a date/time/timestamp getter method.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnAccessors()
-	 */
-	protected function addTemporalAccessor(&$script, Column $col)
-	{
-		$this->addTemporalAccessorComment($script, $col);
-		$this->addTemporalAccessorOpen($script, $col);
-		$this->addTemporalAccessorBody($script, $col);
-		$this->addTemporalAccessorClose($script, $col);
-	} // addTemporalAccessor
-
-
-	/**
-	 * Adds the comment for a temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessor
-	 **/
-	protected function addTemporalAccessorComment(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$useDateTime = $this->getBuildProperty('useDateTimeClass');
-
-		$dateTimeClass = $this->getBuildProperty('dateTimeClass');
-		if (!$dateTimeClass) {
-			$dateTimeClass = 'DateTime';
-		}
-
-		$handleMysqlDate = false;
-		if ($this->getPlatform() instanceof MysqlPlatform) {
-			if ($col->getType() === PropelTypes::TIMESTAMP) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00 00:00:00';
-			} elseif ($col->getType() === PropelTypes::DATE) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00';
-			}
-			// 00:00:00 is a valid time, so no need to check for that.
-		}
-
-		$script .= "
-	/**
-	 * Get the [optionally formatted] temporal [$clo] column value.
-	 * ".$col->getDescription();
-		if (!$useDateTime) {
-			$script .= "
-	 * This accessor only only work with unix epoch dates.  Consider enabling the propel.useDateTimeClass
-	 * option in order to avoid converstions to integers (which are limited in the dates they can express).";
-		}
-		$script .= "
-	 *
-	 * @param      string \$format The date/time format string (either date()-style or strftime()-style).
-	 *							If format is NULL, then the raw ".($useDateTime ? 'DateTime object' : 'unix timestamp integer')." will be returned.";
-		if ($useDateTime) {
-			$script .= "
-	 * @return     mixed Formatted date/time value as string or $dateTimeClass object (if format is NULL), NULL if column is NULL" .($handleMysqlDate ? ', and 0 if column value is ' . $mysqlInvalidDateString : '');
-		} else {
-			$script .= "
-	 * @return     mixed Formatted date/time value as string or (integer) unix timestamp (if format is NULL), NULL if column is NULL".($handleMysqlDate ? ', and 0 if column value is ' . $mysqlInvalidDateString : '');
-		}
-		$script .= "
-	 * @throws     PropelException - if unable to parse/validate the date/time value.
-	 */";
-	}
-
-
-	/**
-	 * Adds the function declaration for a temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessor
-	 **/
-	protected function addTemporalAccessorOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-
-		$defaultfmt = null;
-				$visibility = $col->getAccessorVisibility();
-
-		// Default date/time formatter strings are specified in build.properties
-		if ($col->getType() === PropelTypes::DATE) {
-			$defaultfmt = $this->getBuildProperty('defaultDateFormat');
-		} elseif ($col->getType() === PropelTypes::TIME) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeFormat');
-		} elseif ($col->getType() === PropelTypes::TIMESTAMP) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeStampFormat');
-		}
-		if (empty($defaultfmt)) { $defaultfmt = null; }
-
-		$script .= "
-	".$visibility." function get$cfc(\$format = ".var_export($defaultfmt, true)."";
-		if ($col->isLazyLoad()) $script .= ", \$con = null";
-		$script .= ")
-	{";
-	}
-
-	/**
-	 * Adds the body of the temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessor
-	 **/
-	protected function addTemporalAccessorBody(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-
-		$useDateTime = $this->getBuildProperty('useDateTimeClass');
-
-		$dateTimeClass = $this->getBuildProperty('dateTimeClass');
-		if (!$dateTimeClass) {
-			$dateTimeClass = 'DateTime';
-		}
-
-		$defaultfmt = null;
-
-		// Default date/time formatter strings are specified in build.properties
-		if ($col->getType() === PropelTypes::DATE) {
-			$defaultfmt = $this->getBuildProperty('defaultDateFormat');
-		} elseif ($col->getType() === PropelTypes::TIME) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeFormat');
-		} elseif ($col->getType() === PropelTypes::TIMESTAMP) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeStampFormat');
-		}
-		if (empty($defaultfmt)) { $defaultfmt = null; }
-
-		$handleMysqlDate = false;
-		if ($this->getPlatform() instanceof MysqlPlatform) {
-			if ($col->getType() === PropelTypes::TIMESTAMP) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00 00:00:00';
-			} elseif ($col->getType() === PropelTypes::DATE) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00';
-			}
-			// 00:00:00 is a valid time, so no need to check for that.
-		}
-
-		if ($col->isLazyLoad()) {
-			$script .= "
-		if (!\$this->".$clo."_isLoaded && \$this->$clo === null && !\$this->isNew()) {
-			\$this->load$cfc(\$con);
-		}
-";
-		}
-		$script .= "
-		if (\$this->$clo === null) {
-			return null;
-		}
-
-";
-		if ($handleMysqlDate) {
-			$script .= "
-		if (\$this->$clo === '$mysqlInvalidDateString') {
-			// while technically this is not a default value of NULL,
-			// this seems to be closest in meaning.
-			return null;
-		} else {
-			try {
-				\$dt = new $dateTimeClass(\$this->$clo);
-			} catch (Exception \$x) {
-				throw new PropelException(\"Internally stored date/time/timestamp value could not be converted to $dateTimeClass: \" . var_export(\$this->$clo, true), \$x);
-			}
-		}
-";
-		} else {
-			$script .= "
-
-		try {
-			\$dt = new $dateTimeClass(\$this->$clo);
-		} catch (Exception \$x) {
-			throw new PropelException(\"Internally stored date/time/timestamp value could not be converted to $dateTimeClass: \" . var_export(\$this->$clo, true), \$x);
-		}
-";
-		} // if handleMyqlDate
-
-		$script .= "
-		if (\$format === null) {";
-		if ($useDateTime) {
-			$script .= "
-			// Because propel.useDateTimeClass is TRUE, we return a $dateTimeClass object.
-			return \$dt;";
-		} else {
-			$script .= "
-			// We cast here to maintain BC in API; obviously we will lose data if we're dealing with pre-/post-epoch dates.
-			return (int) \$dt->format('U');";
-		}
-		$script .= "
-		} elseif (strpos(\$format, '%') !== false) {
-			return strftime(\$format, \$dt->format('U'));
-		} else {
-			return \$dt->format(\$format);
-		}";
-	}
-
-
-	/**
-	 * Adds the body of the temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessorClose
-	 **/
-	protected function addTemporalAccessorClose(&$script, Column $col) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds a normal (non-temporal) getter method.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnAccessors()
-	 */
-	protected function addDefaultAccessor(&$script, Column $col)
-	{
-		$this->addDefaultAccessorComment($script, $col);
-		$this->addDefaultAccessorOpen($script, $col);
-		$this->addDefaultAccessorBody($script, $col);
-		$this->addDefaultAccessorClose($script, $col);
-	}
-
-	/**
-	 * Add the comment for a default accessor method (a getter)
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorComment(&$script, Column $col) {
-		$clo=strtolower($col->getName());
-
-		$script .= "
-	/**
-	 * Get the [$clo] column value.
-	 * ".$col->getDescription();
-		if ($col->isLazyLoad()) {
-			$script .= "
-	 * @param      PropelPDO An optional PropelPDO connection to use for fetching this lazy-loaded column.";
-		}
-		$script .= "
-	 * @return     ".$col->getPhpType()."
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for a default accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$visibility = $col->getAccessorVisibility();
-
-		$script .= "
-	".$visibility." function get$cfc(";
-		if ($col->isLazyLoad()) $script .= "PropelPDO \$con = null";
-		$script .= ")
-	{";
-	}
-
-	/**
-	 * Adds the function body for a default accessor method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorBody(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-		if ($col->isLazyLoad()) {
-			$script .= "
-		if (!\$this->".$clo."_isLoaded && \$this->$clo === null && !\$this->isNew()) {
-			\$this->load$cfc(\$con);
-		}
-";
-		}
-
-		$script .= "
-		return \$this->$clo;";
-	}
-
-	/**
-	 * Adds the function close for a default accessor method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorClose(&$script, Column $col) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the lazy loader method.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnAccessors()
-	 */
-	protected function addLazyLoader(&$script, Column $col)
-	{
-		$this->addLazyLoaderComment($script, $col);
-		$this->addLazyLoaderOpen($script, $col);
-		$this->addLazyLoaderBody($script, $col);
-		$this->addLazyLoaderClose($script, $col);
-	}
-
-	/**
-	 * Adds the comment for the lazy loader method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderComment(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-
-		$script .= "
-	/**
-	 * Load the value for the lazy-loaded [$clo] column.
-	 *
-	 * This method performs an additional query to return the value for
-	 * the [$clo] column, since it is not populated by
-	 * the hydrate() method.
-	 *
-	 * @param      \$con PropelPDO (optional) The PropelPDO connection to use.
-	 * @return     void
-	 * @throws     PropelException - any underlying error will be wrapped and re-thrown.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the lazy loader method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$script .= "
-	protected function load$cfc(PropelPDO \$con = null)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the lazy loader method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderBody(&$script, Column $col) {
-		$platform = $this->getPlatform();
-		$clo = strtolower($col->getName());
-
-		$script .= "
-		\$c = \$this->buildPkeyCriteria();
-		\$c->addSelectColumn(".$this->getColumnConstant($col).");
-		try {
-			\$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$c, \$con);
-			\$row = \$stmt->fetch(PDO::FETCH_NUM);
-			\$stmt->closeCursor();";
-
-		if ($col->isLobType() && !$platform->hasStreamBlobImpl()) {
-			$script .= "
-			if (\$row[0] !== null) {
-				\$this->$clo = fopen('php://memory', 'r+');
-				fwrite(\$this->$clo, \$row[0]);
-				rewind(\$this->$clo);
-			} else {
-				\$this->$clo = null;
-			}";
-		} elseif ($col->isPhpPrimitiveType()) {
-			$script .= "
-			\$this->$clo = (\$row[0] !== null) ? (".$col->getPhpType().") \$row[0] : null;";
-		} elseif ($col->isPhpObjectType()) {
-			$script .= "
-			\$this->$clo = (\$row[0] !== null) ? new ".$col->getPhpType()."(\$row[0]) : null;";
-		} else {
-			$script .= "
-			\$this->$clo = \$row[0];";
-		}
-
-		$script .= "
-			\$this->".$clo."_isLoaded = true;
-		} catch (Exception \$e) {
-			throw new PropelException(\"Error loading value for [$clo] column on demand.\", \$e);
-		}";
-	}
-
-	/**
-	 * Adds the function close for the lazy loader
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderClose(&$script, Column $col) {
-		$script .= "
-	}";
-	} // addLazyLoader()
-
-	// --------------------------------------------------------------
-	//
-	// M U T A T O R    M E T H O D S
-	//
-	// --------------------------------------------------------------
-
-	/**
-	 * Adds the open of the mutator (setter) method for a column.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 */
-	protected function addMutatorOpen(&$script, Column $col)
-	{
-		$this->addMutatorComment($script, $col);
-		$this->addMutatorOpenOpen($script, $col);
-		$this->addMutatorOpenBody($script, $col);
-	}
-
-	/**
-	 * Adds the comment for a mutator
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorOpen()
-	 **/
-	protected function addMutatorComment(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$script .= "
-	/**
-	 * Set the value of [$clo] column.
-	 * ".$col->getDescription()."
-	 * @param      ".$col->getPhpType()." \$v new value
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 */";
-	}
-
-	/**
-	 * Adds the mutator function declaration
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorOpen()
-	 **/
-	protected function addMutatorOpenOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$visibility = $col->getMutatorVisibility();
-
-		$script .= "
-	".$visibility." function set$cfc(\$v)
-	{";
-	}
-
-	/**
-	 * Adds the mutator open body part
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorOpen()
-	 **/
-	protected function addMutatorOpenBody(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-				$cfc = $col->getPhpName();
-		if ($col->isLazyLoad()) {
-			$script .= "
-		// explicitly set the is-loaded flag to true for this lazy load col;
-		// it doesn't matter if the value is actually set or not (logic below) as
-		// any attempt to set the value means that no db lookup should be performed
-		// when the get$cfc() method is called.
-		\$this->".$clo."_isLoaded = true;
-";
-		}
-	}
-
-	/**
-	 * Adds the close of the mutator (setter) method for a column.
-	 *
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 */
-	protected function addMutatorClose(&$script, Column $col)
-	{
-		$this->addMutatorCloseBody($script, $col);
-		$this->addMutatorCloseClose($script, $col);
-	}
-
-	/**
-	 * Adds the body of the close part of a mutator
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorClose()
-	 **/
-	protected function addMutatorCloseBody(&$script, Column $col) {
-		$table = $this->getTable();
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-
-		if ($col->isForeignKey()) {
-
-			foreach ($col->getForeignKeys() as $fk) {
-
-				$tblFK =  $table->getDatabase()->getTable($fk->getForeignTableName());
-				$colFK = $tblFK->getColumn($fk->getMappedForeignColumn($col->getName()));
-
-				$varName = $this->getFKVarName($fk);
-
-				$script .= "
-		if (\$this->$varName !== null && \$this->".$varName."->get".$colFK->getPhpName()."() !== \$v) {
-			\$this->$varName = null;
-		}
-";
-			} // foreach fk
-		} /* if col is foreign key */
-
-		foreach ($col->getReferrers() as $refFK) {
-
-			$tblFK = $this->getDatabase()->getTable($refFK->getForeignTableName());
-
-			if ( $tblFK->getName() != $table->getName() ) {
-
-				foreach ($col->getForeignKeys() as $fk) {
-
-					$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-					$colFK = $tblFK->getColumn($fk->getMappedForeignColumn($col->getName()));
-
-					if ($refFK->isLocalPrimaryKey()) {
-						$varName = $this->getPKRefFKVarName($refFK);
-						$script .= "
-		// update associated ".$tblFK->getPhpName()."
-		if (\$this->$varName !== null) {
-			\$this->{$varName}->set".$colFK->getPhpName()."(\$v);
-		}
-";
-					} else {
-						$collName = $this->getRefFKCollVarName($refFK);
-						$script .= "
-
-		// update associated ".$tblFK->getPhpName()."
-		if (\$this->$collName !== null) {
-			foreach (\$this->$collName as \$referrerObject) {
-				  \$referrerObject->set".$colFK->getPhpName()."(\$v);
-			  }
-		  }
-";
-					} // if (isLocalPrimaryKey
-				} // foreach col->getPrimaryKeys()
-			} // if tablFk != table
-
-		} // foreach
-	}
-
-	/**
-	 * Adds the close for the mutator close
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorClose()
-	 **/
-	protected function addMutatorCloseClose(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$script .= "
-		return \$this;
-	} // set$cfc()
-";
-	}
-
-	/**
-	 * Adds a setter for BLOB columns.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnMutators()
-	 */
-	protected function addLobMutator(&$script, Column $col)
-	{
-		$this->addMutatorOpen($script, $col);
-		$clo = strtolower($col->getName());
-		$script .= "
-		// Because BLOB columns are streams in PDO we have to assume that they are
-		// always modified when a new value is passed in.  For example, the contents
-		// of the stream itself may have changed externally.
-		if (!is_resource(\$v) && \$v !== null) {
-			\$this->$clo = fopen('php://memory', 'r+');
-			fwrite(\$this->$clo, \$v);
-			rewind(\$this->$clo);
-		} else { // it's already a stream
-			\$this->$clo = \$v;
-		}
-		\$this->modifiedColumns[] = ".$this->getColumnConstant($col).";
-";
-		$this->addMutatorClose($script, $col);
-	} // addLobMutatorSnippet
-
-	/**
-	 * Adds a setter method for date/time/timestamp columns.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnMutators()
-	 */
-	protected function addTemporalMutator(&$script, Column $col)
-	{
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-		$visibility = $col->getMutatorVisibility();
-
-		$dateTimeClass = $this->getBuildProperty('dateTimeClass');
-		if (!$dateTimeClass) {
-			$dateTimeClass = 'DateTime';
-		}
-
-		$script .= "
-	/**
-	 * Sets the value of [$clo] column to a normalized version of the date/time value specified.
-	 * ".$col->getDescription()."
-	 * @param      mixed \$v string, integer (timestamp), or DateTime value.  Empty string will
-	 *						be treated as NULL for temporal objects.
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 */
-	".$visibility." function set$cfc(\$v)
-	{";
-		if ($col->isLazyLoad()) {
-			$script .= "
-		// explicitly set the is-loaded flag to true for this lazy load col;
-		// it doesn't matter if the value is actually set or not (logic below) as
-		// any attempt to set the value means that no db lookup should be performed
-		// when the get$cfc() method is called.
-		\$this->".$clo."_isLoaded = true;
-";
-		}
-
-		$fmt = var_export($this->getTemporalFormatter($col), true);
-
-		$script .= "
-		// we treat '' as NULL for temporal objects because DateTime('') == DateTime('now')
-		// -- which is unexpected, to say the least.
-		if (\$v === null || \$v === '') {
-			\$dt = null;
-		} elseif (\$v instanceof DateTime) {
-			\$dt = \$v;
-		} else {
-			// some string/numeric value passed; we normalize that so that we can
-			// validate it.
-			try {
-				if (is_numeric(\$v)) { // if it's a unix timestamp
-					\$dt = new $dateTimeClass('@'.\$v, new DateTimeZone('UTC'));
-					// We have to explicitly specify and then change the time zone because of a
-					// DateTime bug: http://bugs.php.net/bug.php?id=43003
-					\$dt->setTimeZone(new DateTimeZone(date_default_timezone_get()));
-				} else {
-					\$dt = new $dateTimeClass(\$v);
-				}
-			} catch (Exception \$x) {
-				throw new PropelException('Error parsing date/time value: ' . var_export(\$v, true), \$x);
-			}
-		}
-
-		if ( \$this->$clo !== null || \$dt !== null ) {
-			// (nested ifs are a little easier to read in this case)
-
-			\$currNorm = (\$this->$clo !== null && \$tmpDt = new $dateTimeClass(\$this->$clo)) ? \$tmpDt->format($fmt) : null;
-			\$newNorm = (\$dt !== null) ? \$dt->format($fmt) : null;
-
-			if ( (\$currNorm !== \$newNorm) // normalized values don't match ";
-
-		if (($def = $col->getDefaultValue()) !== null && !$def->isExpression()) {
-			$defaultValue = $this->getDefaultValueString($col);
-			$script .= "
-					|| (\$dt->format($fmt) === $defaultValue) // or the entered value matches the default";
-		}
-
-		$script .= "
-					)
-			{
-				\$this->$clo = (\$dt ? \$dt->format($fmt) : null);
-				\$this->modifiedColumns[] = ".$this->getColumnConstant($col).";
-			}
-		} // if either are not null
-";
-		$this->addMutatorClose($script, $col);
-	}
-
-	/**
-	 * Adds setter method for "normal" columns.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnMutators()
-	 */
-	protected function addDefaultMutator(&$script, Column $col)
-	{
-		$clo = strtolower($col->getName());
-
-		$this->addMutatorOpen($script, $col);
-
-		// Perform type-casting to ensure that we can use type-sensitive
-		// checking in mutators.
-		if ($col->isPhpPrimitiveType()) {
-			$script .= "
-		if (\$v !== null) {
-			\$v = (".$col->getPhpType().") \$v;
-		}
-";
-		}
-
-		$script .= "
-		if (\$this->$clo !== \$v";
-		if (($def = $col->getDefaultValue()) !== null && !$def->isExpression()) {
-			$script .= " || \$this->isNew()";
-		}
-		$script .= ") {
-			\$this->$clo = \$v;
-			\$this->modifiedColumns[] = ".$this->getColumnConstant($col).";
-		}
-";
-		$this->addMutatorClose($script, $col);
-	}
-
-	/**
-	 * Adds the hasOnlyDefaultValues() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addHasOnlyDefaultValues(&$script)
-	{
-		$this->addHasOnlyDefaultValuesComment($script);
-		$this->addHasOnlyDefaultValuesOpen($script);
-		$this->addHasOnlyDefaultValuesBody($script);
-		$this->addHasOnlyDefaultValuesClose($script);
-	}
-
-	/**
-	 * Adds the comment for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesComment(&$script) {
-		$script .= "
-	/**
-	 * Indicates whether the columns in this object are only set to default values.
-	 *
-	 * This method can be used in conjunction with isModified() to indicate whether an object is both
-	 * modified _and_ has some values set which are non-default.
-	 *
-	 * @return     boolean Whether the columns in this object are only been set with default values.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesOpen(&$script) {
-		$script .= "
-	public function hasOnlyDefaultValues()
-	{";
-	}
-
-	/**
-	 * Adds the function body for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesBody(&$script) {
-		$table = $this->getTable();
-		$colsWithDefaults = array();
-		foreach ($table->getColumns() as $col) {
-			$def = $col->getDefaultValue();
-			if ($def !== null && !$def->isExpression()) {
-				$colsWithDefaults[] = $col;
-			}
-		}
-
-		foreach ($colsWithDefaults as $col) {
-
-			$clo = strtolower($col->getName());
-			$def = $col->getDefaultValue();
-
-			$script .= "
-			if (\$this->$clo !== " . $this->getDefaultValueString($col).") {
-				return false;
-			}
-";
-		}
-	}
-
-	/**
-	 * Adds the function close for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesClose(&$script) {
-		$script .= "
-		// otherwise, everything was equal, so return TRUE
-		return true;";
-		$script .= "
-	} // hasOnlyDefaultValues()
-";
-	}
-
-	/**
-	 * Adds the hydrate() method, which sets attributes of the object based on a ResultSet.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addHydrate(&$script)
-	{
-		$this->addHydrateComment($script);
-		$this->addHydrateOpen($script);
-		$this->addHydrateBody($script);
-		$this->addHydrateClose($script);
-	}
-
-	/**
-	 * Adds the comment for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateComment(&$script) {
-		$script .= "
-	/**
-	 * Hydrates (populates) the object variables with values from the database resultset.
-	 *
-	 * An offset (0-based \"start column\") is specified so that objects can be hydrated
-	 * with a subset of the columns in the resultset rows.  This is needed, for example,
-	 * for results of JOIN queries where the resultset row includes columns from two or
-	 * more tables.
-	 *
-	 * @param      array \$row The row returned by PDOStatement->fetch(PDO::FETCH_NUM)
-	 * @param      int \$startcol 0-based offset column which indicates which restultset column to start with.
-	 * @param      boolean \$rehydrate Whether this object is being re-hydrated from the database.
-	 * @return     int next starting column
-	 * @throws     PropelException  - Any caught Exception will be rewrapped as a PropelException.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateOpen(&$script) {
-		$script .= "
-	public function hydrate(\$row, \$startcol = 0, \$rehydrate = false)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateBody(&$script) {
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$script .= "
-		try {
-";
-		$n = 0;
-		foreach ($table->getColumns() as $col) {
-			if (!$col->isLazyLoad()) {
-				$clo = strtolower($col->getName());
-				if ($col->isLobType() && !$platform->hasStreamBlobImpl()) {
-					$script .= "
-			if (\$row[\$startcol + $n] !== null) {
-				\$this->$clo = fopen('php://memory', 'r+');
-				fwrite(\$this->$clo, \$row[\$startcol + $n]);
-				rewind(\$this->$clo);
-			} else {
-				\$this->$clo = null;
-			}";
-				} elseif ($col->isPhpPrimitiveType()) {
-					$script .= "
-			\$this->$clo = (\$row[\$startcol + $n] !== null) ? (".$col->getPhpType().") \$row[\$startcol + $n] : null;";
-				} elseif ($col->isPhpObjectType()) {
-					$script .= "
-			\$this->$clo = (\$row[\$startcol + $n] !== null) ? new ".$col->getPhpType()."(\$row[\$startcol + $n]) : null;";
-				} else {
-					$script .= "
-			\$this->$clo = \$row[\$startcol + $n];";
-				}
-				$n++;
-			} // if col->isLazyLoad()
-		} /* foreach */
-
-		if ($this->getBuildProperty("addSaveMethod")) {
-			$script .= "
-			\$this->resetModified();
-";
-		}
-
-		$script .= "
-			\$this->setNew(false);
-
-			if (\$rehydrate) {
-				\$this->ensureConsistency();
-			}
-
-			// FIXME - using NUM_COLUMNS may be clearer.
-			return \$startcol + $n; // $n = ".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS).
-
-		} catch (Exception \$e) {
-			throw new PropelException(\"Error populating ".$this->getStubObjectBuilder()->getClassname()." object\", \$e);
-		}";
-	}
-
-	/**
-	 * Adds the function close for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addBuildPkeyCriteria(&$script) {
-		$this->addBuildPkeyCriteriaComment($script);
-		$this->addBuildPkeyCriteriaOpen($script);
-		$this->addBuildPkeyCriteriaBody($script);
-		$this->addBuildPkeyCriteriaClose($script);
-	}
-
-	/**
-	 * Adds the comment for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaComment(&$script) {
-		$script .= "
-	/**
-	 * Builds a Criteria object containing the primary key for this object.
-	 *
-	 * Unlike buildCriteria() this method includes the primary key values regardless
-	 * of whether or not they have been modified.
-	 *
-	 * @return     Criteria The Criteria object containing value(s) for primary key(s).
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaOpen(&$script) {
-		$script .= "
-	public function buildPkeyCriteria()
-	{";
-	}
-
-	/**
-	 * Adds the function body for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaBody(&$script) {
-		$script .= "
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-";
-		foreach ($this->getTable()->getColumns() as $col) {
-			$clo = strtolower($col->getName());
-			if ($col->isPrimaryKey()) {
-				$script .= "
-		\$criteria->add(".$this->getColumnConstant($col).", \$this->$clo);";
-			}
-		}
-	}
-
-	/**
-	 * Adds the function close for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaClose(&$script) {
-		$script .= "
-
-		return \$criteria;
-	}
-";
-	}
-
-	/**
-	 * Adds the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addBuildCriteria(&$script)
-	{
-		$this->addBuildCriteriaComment($script);
-		$this->addBuildCriteriaOpen($script);
-		$this->addBuildCriteriaBody($script);
-		$this->addBuildCriteriaClose($script);
-	}
-
-	/**
-	 * Adds comment for the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaComment(&$script) {
-		$script .= "
-	/**
-	 * Build a Criteria object containing the values of all modified columns in this object.
-	 *
-	 * @return     Criteria The Criteria object containing all modified values.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration of the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaOpen(&$script) {
-		$script .= "
-	public function buildCriteria()
-	{";
-	}
-
-	/**
-	 * Adds the function body of the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaBody(&$script) {
-		$script .= "
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-";
-		foreach ($this->getTable()->getColumns() as $col) {
-			$clo = strtolower($col->getName());
-			$script .= "
-		if (\$this->isColumnModified(".$this->getColumnConstant($col).")) \$criteria->add(".$this->getColumnConstant($col).", \$this->$clo);";
-		}
-	}
-
-	/**
-	 * Adds the function close of the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaClose(&$script) {
-		$script .= "
-
-		return \$criteria;
-	}
-";
-	}
-
-	/**
-	 * Adds the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addToArray(&$script)
-	{
-		$this->addToArrayComment($script);
-		$this->addToArrayOpen($script);
-		$this->addToArrayBody($script);
-		$this->addToArrayClose($script);
-	}
-
-	/**
-	 * Adds the comment of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayComment(&$script) {
-		$script .= "
-	/**
-	 * Exports the object as an array.
-	 *
-	 * You can specify the key type of the array by passing one of the class
-	 * type constants.
-	 *
-	 * @param      string \$keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                        BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. Defaults to BasePeer::TYPE_PHPNAME.
-	 * @param      boolean \$includeLazyLoadColumns (optional) Whether to include lazy loaded columns.  Defaults to TRUE.
-	 * @return     an associative array containing the field names (as keys) and field values
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayOpen(&$script) {
-		$script .= "
-	public function toArray(\$keyType = BasePeer::TYPE_PHPNAME, \$includeLazyLoadColumns = true)
-	{";
-	}
-
-	/**
-	 * Adds the function body of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayBody(&$script) {
-		$script .= "
-		\$keys = ".$this->getPeerClassname()."::getFieldNames(\$keyType);
-		\$result = array(";
-		foreach ($this->getTable()->getColumns() as $num => $col) {
-			if ($col->isLazyLoad()) {
-				 $script .= "
-			\$keys[$num] => (\$includeLazyLoadColumns) ? \$this->get".$col->getPhpName()."() : null,";
-			} else {
-				$script .= "
-			\$keys[$num] => \$this->get".$col->getPhpName()."(),";
-			}
-		}
-		$script .= "
-		);";
-	}
-
-	/**
-	 * Adds the function close of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayClose(&$script) {
-		$script .= "
-		return \$result;
-	}
-";
-	} // addToArray()
-
-	/**
-	 * Adds the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetByName(&$script)
-	{
-		$this->addGetByNameComment($script);
-		$this->addGetByNameOpen($script);
-		$this->addGetByNameBody($script);
-		$this->addGetByNameClose($script);
-	}
-
-	/**
-	 * Adds the comment for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameComment(&$script) {
-		$script .= "
-	/**
-	 * Retrieves a field from the object by name passed in as a string.
-	 *
-	 * @param      string \$name name
-	 * @param      string \$type The type of fieldname the \$name is of:
-	 *                     one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                     BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @return     mixed Value of field.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameOpen(&$script) {
-		$script .= "
-	public function getByName(\$name, \$type = BasePeer::TYPE_PHPNAME)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameBody(&$script) {
-		$script .= "
-		\$pos = ".$this->getPeerClassname()."::translateFieldName(\$name, \$type, BasePeer::TYPE_NUM);
-		\$field = \$this->getByPosition(\$pos);";
-	}
-
-	/**
-	 * Adds the function close for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameClose(&$script) {
-		$script .= "
-		return \$field;
-	}
-";
-	}
-
-	/**
-	 * Adds the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetByPosition(&$script)
-	{
-		$this->addGetByPositionComment($script);
-		$this->addGetByPositionOpen($script);
-		$this->addGetByPositionBody($script);
-		$this->addGetByPositionClose($script);
-	}
-
-	/**
-	 * Adds comment for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionComment(&$script) {
-		$script .= "
-	/**
-	 * Retrieves a field from the object by Position as specified in the xml schema.
-	 * Zero-based.
-	 *
-	 * @param      int \$pos position in xml schema
-	 * @return     mixed Value of field at \$pos
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionOpen(&$script) {
-		$script .= "
-	public function getByPosition(\$pos)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionBody(&$script) {
-		$table = $this->getTable();
-		$script .= "
-		switch(\$pos) {";
-		$i = 0;
-		foreach ($table->getColumns() as $col) {
-			$cfc = $col->getPhpName();
-			$cptype = $col->getPhpType();// not safe to use it because some methods may return objects (Blob)
-			$script .= "
-			case $i:
-				return \$this->get$cfc();
-				break;";
-			$i++;
-		} /* foreach */
-		$script .= "
-			default:
-				return null;
-				break;
-		} // switch()";
-	}
-
-	/**
-	 * Adds the function close for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	protected function addSetByName(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Sets a field from the object by name passed in as a string.
-	 *
-	 * @param      string \$name peer name
-	 * @param      mixed \$value field value
-	 * @param      string \$type The type of fieldname the \$name is of:
-	 *                     one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                     BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @return     void
-	 */
-	public function setByName(\$name, \$value, \$type = BasePeer::TYPE_PHPNAME)
-	{
-		\$pos = ".$this->getPeerClassname()."::translateFieldName(\$name, \$type, BasePeer::TYPE_NUM);
-		return \$this->setByPosition(\$pos, \$value);
-	}
-";
-	}
-
-	protected function addSetByPosition(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Sets a field from the object by Position as specified in the xml schema.
-	 * Zero-based.
-	 *
-	 * @param      int \$pos position in xml schema
-	 * @param      mixed \$value field value
-	 * @return     void
-	 */
-	public function setByPosition(\$pos, \$value)
-	{
-		switch(\$pos) {";
-		$i = 0;
-		foreach ($table->getColumns() as $col) {
-			$cfc = $col->getPhpName();
-			$cptype = $col->getPhpType();
-			$script .= "
-			case $i:
-				\$this->set$cfc(\$value);
-				break;";
-			$i++;
-		} /* foreach */
-		$script .= "
-		} // switch()
-	}
-";
-	} // addSetByPosition()
-
-	protected function addFromArray(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Populates the object using an array.
-	 *
-	 * This is particularly useful when populating an object from one of the
-	 * request arrays (e.g. \$_POST).  This method goes through the column
-	 * names, checking to see whether a matching key exists in populated
-	 * array. If so the setByName() method is called for that column.
-	 *
-	 * You can specify the key type of the array by additionally passing one
-	 * of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME,
-	 * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM.
-	 * The default key type is the column's phpname (e.g. 'AuthorId')
-	 *
-	 * @param      array  \$arr     An array to populate the object from.
-	 * @param      string \$keyType The type of keys the array uses.
-	 * @return     void
-	 */
-	public function fromArray(\$arr, \$keyType = BasePeer::TYPE_PHPNAME)
-	{
-		\$keys = ".$this->getPeerClassname()."::getFieldNames(\$keyType);
-";
-		foreach ($table->getColumns() as $num => $col) {
-			$cfc = $col->getPhpName();
-			$cptype = $col->getPhpType();
-			$script .= "
-		if (array_key_exists(\$keys[$num], \$arr)) \$this->set$cfc(\$arr[\$keys[$num]]);";
-		} /* foreach */
-		$script .= "
-	}
-";
-	} // addFromArray
-
-	/**
-	 * Adds a delete() method to remove the object form the datastore.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDelete(&$script)
-	{
-		$this->addDeleteComment($script);
-		$this->addDeleteOpen($script);
-		$this->addDeleteBody($script);
-		$this->addDeleteClose($script);
-	}
-
-	/**
-	 * Adds the comment for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteComment(&$script) {
-		$script .= "
-	/**
-	 * Removes this object from datastore and sets delete attribute.
-	 *
-	 * @param      PropelPDO \$con
-	 * @return     void
-	 * @throws     PropelException
-	 * @see        BaseObject::setDeleted()
-	 * @see        BaseObject::isDeleted()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteOpen(&$script) {
-		$script .= "
-	public function delete(PropelPDO \$con = null)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteBody(&$script) {
-		$script .= "
-		if (\$this->isDeleted()) {
-			throw new PropelException(\"This object has already been deleted.\");
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-		
-		\$con->beginTransaction();
-		try {";
-		if($this->getGeneratorConfig()->getBuildProperty('addHooks')) {
-			$script .= "
-			\$ret = \$this->preDelete(\$con);";
-			// apply behaviors
-			$this->applyBehaviorModifier('preDelete', $script, "			");
-			$script .= "
-			if (\$ret) {
-				".$this->getPeerClassname()."::doDelete(\$this, \$con);
-				\$this->postDelete(\$con);";
-			// apply behaviors
-			$this->applyBehaviorModifier('postDelete', $script, "				");
-			$script .= "
-				\$this->setDeleted(true);
-				\$con->commit();
-			} else {
-				\$con->commit();
-			}";
-		} else {
-			// apply behaviors
-			$this->applyBehaviorModifier('preDelete', $script, "			");
-			$script .= "
-			".$this->getPeerClassname()."::doDelete(\$this, \$con);";
-			// apply behaviors
-			$this->applyBehaviorModifier('postDelete', $script, "			");
-			$script .= "
-			\$this->setDeleted(true);
-			\$con->commit();";
-		}
-
-		$script .= "
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}";
-	}
-
-	/**
-	 * Adds the function close for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteClose(&$script) {
-		$script .= "
-	}
-";
-	} // addDelete()
-
-	/**
-	 * Adds a reload() method to re-fetch the data for this object from the database.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addReload(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
-	 *
-	 * This will only work if the object has been saved and has a valid primary key set.
-	 *
-	 * @param      boolean \$deep (optional) Whether to also de-associated any related objects.
-	 * @param      PropelPDO \$con (optional) The PropelPDO connection to use.
-	 * @return     void
-	 * @throws     PropelException - if this object is deleted, unsaved or doesn't have pk match in db
-	 */
-	public function reload(\$deep = false, PropelPDO \$con = null)
-	{
-		if (\$this->isDeleted()) {
-			throw new PropelException(\"Cannot reload a deleted object.\");
-		}
-
-		if (\$this->isNew()) {
-			throw new PropelException(\"Cannot reload an unsaved object.\");
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		// We don't need to alter the object instance pool; we're just modifying this instance
-		// already in the pool.
-
-		\$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$this->buildPkeyCriteria(), \$con);
-		\$row = \$stmt->fetch(PDO::FETCH_NUM);
-		\$stmt->closeCursor();
-		if (!\$row) {
-			throw new PropelException('Cannot find matching row in the database to reload object values.');
-		}
-		\$this->hydrate(\$row, 0, true); // rehydrate
-";
-
-		// support for lazy load columns
-		foreach ($table->getColumns() as $col) {
-			if ($col->isLazyLoad()) {
-				$clo = strtolower($col->getName());
-				$script .= "
-		// Reset the $clo lazy-load column
-		\$this->" . $clo . " = null;
-		\$this->".$clo."_isLoaded = false;
-";
-			}
-		}
-
-		$script .= "
-		if (\$deep) {  // also de-associate any related objects?
-";
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$varName = $this->getFKVarName($fk);
-			$script .= "
-			\$this->".$varName." = null;";
-		}
-
-		foreach ($table->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$script .= "
-			\$this->".$this->getPKRefFKVarName($refFK)." = null;
-";
-			} else {
-				$script .= "
-			\$this->".$this->getRefFKCollVarName($refFK)." = null;
-			\$this->".$this->getRefFKLastCriteriaVarName($refFK)." = null;
-";
-			}
-		}
-
-		$script .= "
-		} // if (deep)
-	}
-";
-	} // addReload()
-
-	/**
-	 * Adds the methods related to refreshing, saving and deleting the object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addManipulationMethods(&$script)
-	{
-		$this->addReload($script);
-		$this->addDelete($script);
-		$this->addSave($script);
-		$this->addDoSave($script);
-	}
-
-	/**
-	 * Adds the methods related to validationg the object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addValidationMethods(&$script)
-	{
-		$this->addValidationFailuresAttribute($script);
-		$this->addGetValidationFailures($script);
-		$this->addValidate($script);
-		$this->addDoValidate($script);
-	}
-
-	/**
-	 * Adds the $validationFailures attribute to store ValidationFailed objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addValidationFailuresAttribute(&$script)
-	{
-		$script .= "
-	/**
-	 * Array of ValidationFailed objects.
-	 * @var        array ValidationFailed[]
-	 */
-	protected \$validationFailures = array();
-";
-	}
-
-	/**
-	 * Adds the getValidationFailures() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetValidationFailures(&$script)
-	{
-		$script .= "
-	/**
-	 * Gets any ValidationFailed objects that resulted from last call to validate().
-	 *
-	 *
-	 * @return     array ValidationFailed[]
-	 * @see        validate()
-	 */
-	public function getValidationFailures()
-	{
-		return \$this->validationFailures;
-	}
-";
-	} // addGetValidationFailures()
-
-	/**
-	 * Adds the correct getPrimaryKey() method for this object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKey(&$script)
-	{
-		$pkeys = $this->getTable()->getPrimaryKey();
-		if (count($pkeys) == 1) {
-			$this->addGetPrimaryKey_SinglePK($script);
-		} elseif (count($pkeys) > 1) {
-			$this->addGetPrimaryKey_MultiPK($script);
-		} else {
-			// no primary key -- this is deprecated, since we don't *need* this method anymore
-			$this->addGetPrimaryKey_NoPK($script);
-		}
-	}
-
-	/**
-	 * Adds the getPrimaryKey() method for tables that contain a single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKey_SinglePK(&$script)
-	{
-		$table = $this->getTable();
-		$pkeys = $table->getPrimaryKey();
-		$cptype = $pkeys[0]->getPhpType();
-
-		$script .= "
-	/**
-	 * Returns the primary key for this object (row).
-	 * @return     $cptype
-	 */
-	public function getPrimaryKey()
-	{
-		return \$this->get".$pkeys[0]->getPhpName()."();
-	}
-";
-	} // addetPrimaryKey_SingleFK
-
-	/**
-	 * Adds the setPrimaryKey() method for tables that contain a multi-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKey_MultiPK(&$script)
-	{
-
-		$script .= "
-	/**
-	 * Returns the composite primary key for this object.
-	 * The array elements will be in same order as specified in XML.
-	 * @return     array
-	 */
-	public function getPrimaryKey()
-	{
-		\$pks = array();
-";
-		$i = 0;
-		foreach ($this->getTable()->getPrimaryKey() as $pk) {
-			$script .= "
-		\$pks[$i] = \$this->get".$pk->getPhpName()."();
-";
-			$i++;
-		} /* foreach */
-		$script .= "
-		return \$pks;
-	}
-";
-	} // addGetPrimaryKey_MultiFK()
-
-	/**
-	 * Adds the getPrimaryKey() method for objects that have no primary key.
-	 * This "feature" is dreprecated, since the getPrimaryKey() method is not required
-	 * by the Persistent interface (or used by the templates).  Hence, this method is also
-	 * deprecated.
-	 * @param      string &$script The script will be modified in this method.
-	 * @deprecated
-	 */
-	protected function addGetPrimaryKey_NoPK(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns NULL since this table doesn't have a primary key.
-	 * This method exists only for BC and is deprecated!
-	 * @return     null
-	 */
-	public function getPrimaryKey()
-	{
-		return null;
-	}
-";
-	}
-	/**
-	 * Adds the correct setPrimaryKey() method for this object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSetPrimaryKey(&$script)
-	{
-		$pkeys = $this->getTable()->getPrimaryKey();
-		if (count($pkeys) == 1) {
-			$this->addSetPrimaryKey_SinglePK($script);
-		} elseif (count($pkeys) > 1) {
-			$this->addSetPrimaryKey_MultiPK($script);
-		} else {
-			// no primary key -- this is deprecated, since we don't *need* this method anymore
-			$this->addSetPrimaryKey_NoPK($script);
-		}
-	}
-
-	/**
-	 * Adds the setPrimaryKey() method for tables that contain a single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSetPrimaryKey_SinglePK(&$script)
-	{
-
-		$pkeys = $this->getTable()->getPrimaryKey();
-		$col = $pkeys[0];
-		$clo=strtolower($col->getName());
-		$ctype = $col->getPhpType();
-
-		$script .= "
-	/**
-	 * Generic method to set the primary key ($clo column).
-	 *
-	 * @param      $ctype \$key Primary key.
-	 * @return     void
-	 */
-	public function setPrimaryKey(\$key)
-	{
-		\$this->set".$col->getPhpName()."(\$key);
-	}
-";
-	} // addSetPrimaryKey_SinglePK
-
-	/**
-	 * Adds the setPrimaryKey() method for tables that contain a multi-columnprimary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSetPrimaryKey_MultiPK(&$script)
-	{
-
-		$script .="
-	/**
-	 * Set the [composite] primary key.
-	 *
-	 * @param      array \$keys The elements of the composite key (order must match the order in XML file).
-	 * @return     void
-	 */
-	public function setPrimaryKey(\$keys)
-	{
-";
-		$i = 0;
-		foreach ($this->getTable()->getPrimaryKey() as $pk) {
-			$pktype = $pk->getPhpType();
-			$script .= "
-		\$this->set".$pk->getPhpName()."(\$keys[$i]);
-";
-			$i++;
-		} /* foreach ($table->getPrimaryKey() */
-		$script .= "
-	}
-";
-	} // addSetPrimaryKey_MultiPK
-
-	/**
-	 * Adds the setPrimaryKey() method for objects that have no primary key.
-	 * This "feature" is dreprecated, since the setPrimaryKey() method is not required
-	 * by the Persistent interface (or used by the templates).  Hence, this method is also
-	 * deprecated.
-	 * @param      string &$script The script will be modified in this method.
-	 * @deprecated
-	 */
-	protected function addSetPrimaryKey_NoPK(&$script)
-	{
-		$script .="
-	/**
-	 * Dummy primary key setter.
-	 *
-	 * This function only exists to preserve backwards compatibility.  It is no longer
-	 * needed or required by the Persistent interface.  It will be removed in next BC-breaking
-	 * release of Propel.
-	 *
-	 * @deprecated
-	 */
-	 public function setPrimaryKey(\$pk)
-	 {
-		 // do nothing, because this object doesn't have any primary keys
-	 }
-";
-	}
-
-	// --------------------------------------------------------------------
-	// Complex OM Methods
-	// --------------------------------------------------------------------
-
-	/**
-	 * Constructs variable name for fkey-related objects.
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getFKVarName(ForeignKey $fk)
-	{
-		return 'a' . $this->getFKPhpNameAffix($fk, $plural = false);
-	}
-
-	/**
-	 * Constructs variable name for objects which referencing current table by specified foreign key.
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getRefFKCollVarName(ForeignKey $fk)
-	{
-		return 'coll' . $this->getRefFKPhpNameAffix($fk, $plural = true);
-	}
-
-	/**
-	 * Constructs variable name for single object which references current table by specified foreign key
-	 * which is ALSO a primary key (hence one-to-one relationship).
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getPKRefFKVarName(ForeignKey $fk)
-	{
-		return 'single' . $this->getRefFKPhpNameAffix($fk, $plural = false);
-	}
-
-	/**
-	 * Gets variable name for the Criteria which was used to fetch the objects which
-	 * referencing current table by specified foreign key.
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getRefFKLastCriteriaVarName(ForeignKey $fk)
-	{
-		return 'last' . $this->getRefFKPhpNameAffix($fk, $plural = false) . 'Criteria';
-	}
-
-	// ----------------------------------------------------------------
-	//
-	// F K    M E T H O D S
-	//
-	// ----------------------------------------------------------------
-
-	/**
-	 * Adds the methods that get & set objects related by foreign key to the current object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKMethods(&$script)
-	{
-		foreach ($this->getTable()->getForeignKeys() as $fk) {
-			$this->addFKMutator($script, $fk);
-			$this->addFKAccessor($script, $fk);
-		} // foreach fk
-	}
-
-	/**
-	 * Adds the class attributes that are needed to store fkey related objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKAttributes(&$script, ForeignKey $fk)
-	{
-		$className = $this->getForeignTable($fk)->getPhpName();
-		$varName = $this->getFKVarName($fk);
-
-		$script .= "
-	/**
-	 * @var        $className
-	 */
-	protected $".$varName.";
-";
-	}
-
-	/**
-	 * Adds the mutator (setter) method for setting an fkey related object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKMutator(&$script, ForeignKey $fk)
-	{
-		$table = $this->getTable();
-		$tblFK = $this->getForeignTable($fk);
-
-		$joinTableObjectBuilder = $this->getNewObjectBuilder($tblFK);
-
-		$className = $joinTableObjectBuilder->getObjectClassname();
-		$varName = $this->getFKVarName($fk);
-
-		$script .= "
-	/**
-	 * Declares an association between this object and a $className object.
-	 *
-	 * @param      $className \$v
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function set".$this->getFKPhpNameAffix($fk, $plural = false)."($className \$v = null)
-	{";
-		foreach ($fk->getLocalColumns() as $columnName) {
-			$column = $table->getColumn($columnName);
-			$lfmap = $fk->getLocalForeignMapping();
-			$colFKName = $lfmap[$columnName];
-			$colFK = $tblFK->getColumn($colFKName);
-			$script .= "
-		if (\$v === null) {
-			\$this->set".$column->getPhpName()."(".$this->getDefaultValueString($column).");
-		} else {
-			\$this->set".$column->getPhpName()."(\$v->get".$colFK->getPhpName()."());
-		}
-";
-
-		} /* foreach local col */
-
-		$script .= "
-		\$this->$varName = \$v;
-";
-
-		// Now add bi-directional relationship binding, taking into account whether this is
-		// a one-to-one relationship.
-
-		if ($fk->isLocalPrimaryKey()) {
-			$script .= "
-		// Add binding for other direction of this 1:1 relationship.
-		if (\$v !== null) {
-			\$v->set".$this->getRefFKPhpNameAffix($fk, $plural = false)."(\$this);
-		}
-";
-		} else {
-			$script .= "
-		// Add binding for other direction of this n:n relationship.
-		// If this object has already been added to the $className object, it will not be re-added.
-		if (\$v !== null) {
-			\$v->add".$this->getRefFKPhpNameAffix($fk, $plural = false)."(\$this);
-		}
-";
-
-		}
-
-		$script .= "
-		return \$this;
-	}
-";
-	}
-
-	/**
-	 * Adds the accessor (getter) method for getting an fkey related object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKAccessor(&$script, ForeignKey $fk)
-	{
-		$table = $this->getTable();
-
-		$varName = $this->getFKVarName($fk);
-		$pCollName = $this->getFKPhpNameAffix($fk, $plural = true);
-		
-		$fkPeerBuilder = $this->getNewPeerBuilder($this->getForeignTable($fk));
-		$fkObjectBuilder = $this->getNewObjectBuilder($this->getForeignTable($fk))->getStubObjectBuilder();
-		$className = $fkObjectBuilder->getClassname(); // get the Classname that has maybe a prefix
-		
-		$and = "";
-		$comma = "";
-		$conditional = "";
-		$argmap = array(); // foreign -> local mapping
-		$argsize = 0;
-		foreach ($fk->getLocalColumns() as $columnName) {
-			
-			$lfmap = $fk->getLocalForeignMapping();
-			
-			$localColumn = $table->getColumn($columnName);
-			$foreignColumn = $fk->getForeignTable()->getColumn($lfmap[$columnName]);
-			
-			$column = $table->getColumn($columnName);
-			$cptype = $column->getPhpType();
-			$clo = strtolower($column->getName());
-			
-			if ($cptype == "integer" || $cptype == "float" || $cptype == "double") {
-				$conditional .= $and . "\$this->". $clo ." != 0";
-			} elseif ($cptype == "string") {
-				$conditional .= $and . "(\$this->" . $clo ." !== \"\" && \$this->".$clo." !== null)";
-			} else {
-				$conditional .= $and . "\$this->" . $clo ." !== null";
-			}
-			
-			$argmap[] = array('foreign' => $foreignColumn, 'local' => $localColumn);
-			$and = " && ";
-			$comma = ", ";
-			$argsize = $argsize + 1;
-		}
-		
-		// If the related column is a primary kay and if it's a simple association,
-		// The use retrieveByPk() instead of doSelect() to take advantage of instance pooling
-		$useRetrieveByPk = count($argmap) == 1 && $argmap[0]['foreign']->isPrimaryKey();
-
-		$script .= "
-
-	/**
-	 * Get the associated $className object
-	 *
-	 * @param      PropelPDO Optional Connection object.
-	 * @return     $className The associated $className object.
-	 * @throws     PropelException
-	 */
-	public function get".$this->getFKPhpNameAffix($fk, $plural = false)."(PropelPDO \$con = null)
-	{";
-		$script .= "
-		if (\$this->$varName === null && ($conditional)) {";
-		if ($useRetrieveByPk) {
-			$script .= "
-			\$this->$varName = ".$fkPeerBuilder->getPeerClassname()."::retrieveByPk(\$this->$clo);";
-		} else {
-			$script .= "
-			\$c = new Criteria(".$fkPeerBuilder->getPeerClassname()."::DATABASE_NAME);";
-			foreach ($argmap as $el) {
-				$fcol = $el['foreign'];
-				$lcol = $el['local'];
-				$clo = strtolower($lcol->getName());
-				$script .= "
-			\$c->add(".$fkPeerBuilder->getColumnConstant($fcol).", \$this->".$clo.");";
-			}
-			$script .= "
-			\$this->$varName = ".$fkPeerBuilder->getPeerClassname()."::doSelectOne(\$c, \$con);";
-		}
-		if ($fk->isLocalPrimaryKey()) {
-			$script .= "
-			// Because this foreign key represents a one-to-one relationship, we will create a bi-directional association.
-			\$this->{$varName}->set".$this->getRefFKPhpNameAffix($fk, $plural = false)."(\$this);";
-		} else {
-			$script .= "
-			/* The following can be used additionally to
-			   guarantee the related object contains a reference
-			   to this object.  This level of coupling may, however, be
-			   undesirable since it could result in an only partially populated collection
-			   in the referenced object.
-			   \$this->{$varName}->add".$this->getRefFKPhpNameAffix($fk, $plural = true)."(\$this);
-			 */";
-		}
-
-		$script .= "
-		}
-		return \$this->$varName;
-	}
-";
-
-	} // addFKAccessor
-
-	/**
-	 * Adds a convenience method for setting a related object by specifying the primary key.
-	 * This can be used in conjunction with the getPrimaryKey() for systems where nothing is known
-	 * about the actual objects being related.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKByKeyMutator(&$script, ForeignKey $fk)
-	{
-		$table = $this->getTable();
-
-		#$className = $this->getForeignTable($fk)->getPhpName();
-		$methodAffix = $this->getFKPhpNameAffix($fk);
-		#$varName = $this->getFKVarName($fk);
-
-		$script .= "
-	/**
-	 * Provides convenient way to set a relationship based on a
-	 * key.  e.g.
-	 * <code>\$bar->setFooKey(\$foo->getPrimaryKey())</code>
-	 *";
-		if (count($fk->getLocalColumns()) > 1) {
-			$script .= "
-	 * Note: It is important that the xml schema used to create this class
-	 * maintains consistency in the order of related columns between
-	 * ".$table->getName()." and ". $tblFK->getName().".
-	 * If for some reason this is impossible, this method should be
-	 * overridden in <code>".$table->getPhpName()."</code>.";
-		}
-		$script .= "
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function set".$methodAffix."Key(\$key)
-	{
-";
-		if (count($fk->getLocalColumns()) > 1) {
-			$i = 0;
-			foreach ($fk->getLocalColumns() as $colName) {
-				$col = $table->getColumn($colName);
-				$fktype = $col->getPhpType();
-				$script .= "
-			\$this->set".$col->getPhpName()."( ($fktype) \$key[$i] );
-";
-				$i++;
-			} /* foreach */
-		} else {
-			$lcols = $fk->getLocalColumns();
-			$colName = $lcols[0];
-			$col = $table->getColumn($colName);
-			$fktype = $col->getPhpType();
-			$script .= "
-		\$this->set".$col->getPhpName()."( ($fktype) \$key);
-";
-		}
-		$script .= "
-		return \$this;
-	}
-";
-	} // addFKByKeyMutator()
-
-	/**
-	 * Adds the method that fetches fkey-related (referencing) objects but also joins in data from another table.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKGetJoinMethods(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-		$join_behavior = $this->getGeneratorConfig()->getBuildProperty('useLeftJoinsInDoJoinMethods') ? 'Criteria::LEFT_JOIN' : 'Criteria::INNER_JOIN';
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural=true);
-		$collName = $this->getRefFKCollVarName($refFK);
-		$lastCriteriaName = $this->getRefFKLastCriteriaVarName($refFK);
-
-		$fkPeerBuilder = $this->getNewPeerBuilder($tblFK);
-
-		$lastTable = "";
-		foreach ($tblFK->getForeignKeys() as $fk2) {
-
-			$tblFK2 = $this->getForeignTable($fk2);
-			$doJoinGet = !$tblFK2->isForReferenceOnly();
-
-			// it doesn't make sense to join in rows from the curent table, since we are fetching
-			// objects related to *this* table (i.e. the joined rows will all be the same row as current object)
-			if ($this->getTable()->getPhpName() == $tblFK2->getPhpName()) {
-				$doJoinGet = false;
-			}
-
-			$relCol2 = $this->getFKPhpNameAffix($fk2, $plural = false);
-
-			if ( $this->getRelatedBySuffix($refFK) != "" &&
-			($this->getRelatedBySuffix($refFK) == $this->getRelatedBySuffix($fk2))) {
-				$doJoinGet = false;
-			}
-
-			if ($doJoinGet) {
-				$script .= "
-
-	/**
-	 * If this collection has already been initialized with
-	 * an identical criteria, it returns the collection.
-	 * Otherwise if this ".$table->getPhpName()." is new, it will return
-	 * an empty collection; or if this ".$table->getPhpName()." has previously
-	 * been saved, it will retrieve related $relCol from storage.
-	 *
-	 * This method is protected by default in order to keep the public
-	 * api reasonable.  You can provide public methods for those you
-	 * actually need in ".$table->getPhpName().".
-	 */
-	public function get".$relCol."Join".$relCol2."(\$criteria = null, \$con = null, \$join_behavior = $join_behavior)
-	{";
-				$script .= "
-		if (\$criteria === null) {
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		}
-		elseif (\$criteria instanceof Criteria)
-		{
-			\$criteria = clone \$criteria;
-		}
-
-		if (\$this->$collName === null) {
-			if (\$this->isNew()) {
-				\$this->$collName = array();
-			} else {
-";
-				foreach ($refFK->getForeignColumns() as $columnName) {
-					$column = $table->getColumn($columnName);
-					$flMap = $refFK->getForeignLocalMapping();
-					$colFKName = $flMap[$columnName];
-					$colFK = $tblFK->getColumn($colFKName);
-					if ($colFK === null) {
-						throw new EngineException("Column $colFKName not found in " . $tblFK->getName());
-					}
-					$clo = strtolower($column->getName());
-					$script .= "
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-				} // end foreach ($fk->getForeignColumns()
-
-				$script .= "
-				\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelectJoin$relCol2(\$criteria, \$con, \$join_behavior);
-			}
-		} else {
-			// the following code is to determine if a new query is
-			// called for.  If the criteria is the same as the last
-			// one, just return the collection.
-";
-				foreach ($refFK->getForeignColumns() as $columnName) {
-					$column = $table->getColumn($columnName);
-					$flMap = $refFK->getForeignLocalMapping();
-					$colFKName = $flMap[$columnName];
-					$colFK = $tblFK->getColumn($colFKName);
-					$clo = strtolower($column->getName());
-					$script .= "
-			\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-				} /* end foreach ($fk->getForeignColumns() */
-
-				$script .= "
-			if (!isset(\$this->$lastCriteriaName) || !\$this->".$lastCriteriaName."->equals(\$criteria)) {
-				\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelectJoin$relCol2(\$criteria, \$con, \$join_behavior);
-			}
-		}
-		\$this->$lastCriteriaName = \$criteria;
-
-		return \$this->$collName;
-	}
-";
-			} /* end if ($doJoinGet) */
-
-		} /* end foreach ($tblFK->getForeignKeys() as $fk2) { */
-
-	} // function
-
-
-	// ----------------------------------------------------------------
-	//
-	// R E F E R R E R    F K    M E T H O D S
-	//
-	// ----------------------------------------------------------------
-
-	/**
-	 * Adds the attributes used to store objects that have referrer fkey relationships to this object.
-	 * <code>protected collVarName;</code>
-	 * <code>private lastVarNameCriteria = null;</code>
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKAttributes(&$script, ForeignKey $refFK)
-	{
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		if ($refFK->isLocalPrimaryKey()) {
-			$script .= "
-	/**
-	 * @var        $className one-to-one related $className object
-	 */
-	protected $".$this->getPKRefFKVarName($refFK).";
-";
-		} else {
-			$script .= "
-	/**
-	 * @var        array {$className}[] Collection to store aggregation of $className objects.
-	 */
-	protected $".$this->getRefFKCollVarName($refFK).";
-
-	/**
-	 * @var        Criteria The criteria used to select the current contents of ".$this->getRefFKCollVarName($refFK).".
-	 */
-	private $".$this->getRefFKLastCriteriaVarName($refFK)." = null;
-";
-		}
-	}
-
-	/**
-	 * Adds the methods for retrieving, initializing, adding objects that are related to this one by foreign keys.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKMethods(&$script)
-	{
-		foreach ($this->getTable()->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$this->addPKRefFKGet($script, $refFK);
-				$this->addPKRefFKSet($script, $refFK);
-			} else {
-				$this->addRefFKClear($script, $refFK);
-				$this->addRefFKInit($script, $refFK);
-				$this->addRefFKGet($script, $refFK);
-				$this->addRefFKCount($script, $refFK);
-				$this->addRefFKAdd($script, $refFK);
-				$this->addRefFKGetJoinMethods($script, $refFK);
-			}
-		}
-	}
-
-	/**
-	 * Adds the method that clears the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKClear(&$script, ForeignKey $refFK) {
-
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-		$collName = $this->getRefFKCollVarName($refFK);
-
-		$script .= "
-	/**
-	 * Clears out the $collName collection (array).
-	 *
-	 * This does not modify the database; however, it will remove any associated objects, causing
-	 * them to be refetched by subsequent calls to accessor method.
-	 *
-	 * @return     void
-	 * @see        add$relCol()
-	 */
-	public function clear$relCol()
-	{
-		\$this->$collName = null; // important to set this to NULL since that means it is uninitialized
-	}
-";
-	} // addRefererClear()
-
-	/**
-	 * Adds the method that initializes the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKInit(&$script, ForeignKey $refFK) {
-
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-		$collName = $this->getRefFKCollVarName($refFK);
-
-		$script .= "
-	/**
-	 * Initializes the $collName collection (array).
-	 *
-	 * By default this just sets the $collName collection to an empty array (like clear$collName());
-	 * however, you may wish to override this method in your stub class to provide setting appropriate
-	 * to your application -- for example, setting the initial array to the values stored in database.
-	 *
-	 * @return     void
-	 */
-	public function init$relCol()
-	{
-		\$this->$collName = array();
-	}
-";
-	} // addRefererInit()
-
-	/**
-	 * Adds the method that adds an object into the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKAdd(&$script, ForeignKey $refFK)
-	{
-		$tblFK = $refFK->getTable();
-
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		$collName = $this->getRefFKCollVarName($refFK);
-
-		$script .= "
-	/**
-	 * Method called to associate a $className object to this object
-	 * through the $className foreign key attribute.
-	 *
-	 * @param      $className \$l $className
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function add".$this->getRefFKPhpNameAffix($refFK, $plural = false)."($className \$l)
-	{
-		if (\$this->$collName === null) {
-			\$this->init".$this->getRefFKPhpNameAffix($refFK, $plural = true)."();
-		}
-		if (!in_array(\$l, \$this->$collName, true)) { // only add it if the **same** object is not already associated
-			array_push(\$this->$collName, \$l);
-			\$l->set".$this->getFKPhpNameAffix($refFK, $plural = false)."(\$this);
-		}
-	}
-";
-	} // addRefererAdd
-
-	/**
-	 * Adds the method that returns the size of the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKCount(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-
-		$fkPeerBuilder = $this->getNewPeerBuilder($refFK->getTable());
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-
-		$collName = $this->getRefFKCollVarName($refFK);
-		$lastCriteriaName = $this->getRefFKLastCriteriaVarName($refFK);
-
-		$className = $fkPeerBuilder->getObjectClassname();
-
-		$script .= "
-	/**
-	 * Returns the number of related $className objects.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct
-	 * @param      PropelPDO \$con
-	 * @return     int Count of related $className objects.
-	 * @throws     PropelException
-	 */
-	public function count$relCol(Criteria \$criteria = null, \$distinct = false, PropelPDO \$con = null)
-	{";
-
-		$script .= "
-		if (\$criteria === null) {
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		} else {
-			\$criteria = clone \$criteria;
-		}
-
-		if (\$distinct) {
-			\$criteria->setDistinct();
-		}
-
-		\$count = null;
-
-		if (\$this->$collName === null) {
-			if (\$this->isNew()) {
-				\$count = 0;
-			} else {
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-			$clo = strtolower($localColumn->getName());
-			$script .= "
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // end foreach ($fk->getForeignColumns()
-
-		$script .= "
-				\$count = ".$fkPeerBuilder->getPeerClassname()."::doCount(\$criteria, false, \$con);
-			}
-		} else {
-			// criteria has no effect for a new object
-			if (!\$this->isNew()) {
-				// the following code is to determine if a new query is
-				// called for.  If the criteria is the same as the last
-				// one, just return count of the collection.
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-			$clo = strtolower($localColumn->getName());
-			$script .= "
-
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // foreach ($fk->getForeignColumns()
-		$script .= "
-				if (!isset(\$this->$lastCriteriaName) || !\$this->".$lastCriteriaName."->equals(\$criteria)) {
-					\$count = ".$fkPeerBuilder->getPeerClassname()."::doCount(\$criteria, false, \$con);
-				} else {
-					\$count = count(\$this->$collName);
-				}
-			} else {
-				\$count = count(\$this->$collName);
-			}
-		}
-		return \$count;
-	}
-";
-	} // addRefererCount
-
-	/**
-	 * Adds the method that returns the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKGet(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$fkPeerBuilder = $this->getNewPeerBuilder($refFK->getTable());
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-
-		$collName = $this->getRefFKCollVarName($refFK);
-		$lastCriteriaName = $this->getRefFKLastCriteriaVarName($refFK);
-
-		$className = $fkPeerBuilder->getObjectClassname();
-
-		$script .= "
-	/**
-	 * Gets an array of $className objects which contain a foreign key that references this object.
-	 *
-	 * If this collection has already been initialized with an identical Criteria, it returns the collection.
-	 * Otherwise if this ".$this->getObjectClassname()." has previously been saved, it will retrieve
-	 * related $relCol from storage. If this ".$this->getObjectClassname()." is new, it will return
-	 * an empty collection or the current collection, the criteria is ignored on a new object.
-	 *
-	 * @param      PropelPDO \$con
-	 * @param      Criteria \$criteria
-	 * @return     array {$className}[]
-	 * @throws     PropelException
-	 */
-	public function get$relCol(\$criteria = null, PropelPDO \$con = null)
-	{";
-
-		$script .= "
-		if (\$criteria === null) {
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		}
-		elseif (\$criteria instanceof Criteria)
-		{
-			\$criteria = clone \$criteria;
-		}
-
-		if (\$this->$collName === null) {
-			if (\$this->isNew()) {
-			   \$this->$collName = array();
-			} else {
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-
-			$clo = strtolower($localColumn->getName());
-
-			$script .= "
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // end foreach ($fk->getForeignColumns()
-
-		$script .= "
-				".$fkPeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-				\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelect(\$criteria, \$con);
-			}
-		} else {
-			// criteria has no effect for a new object
-			if (!\$this->isNew()) {
-				// the following code is to determine if a new query is
-				// called for.  If the criteria is the same as the last
-				// one, just return the collection.
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-			$clo = strtolower($localColumn->getName());
-			$script .= "
-
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // foreach ($fk->getForeignColumns()
-		$script .= "
-				".$fkPeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-				if (!isset(\$this->$lastCriteriaName) || !\$this->".$lastCriteriaName."->equals(\$criteria)) {
-					\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelect(\$criteria, \$con);
-				}
-			}
-		}
-		\$this->$lastCriteriaName = \$criteria;
-		return \$this->$collName;
-	}
-";
-	} // addRefererGet()
-
-	/**
-	 * Adds the method that gets a one-to-one related referrer fkey.
-	 * This is for one-to-one relationship special case.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addPKRefFKGet(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$joinedTablePeerBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		$varName = $this->getPKRefFKVarName($refFK);
-
-		$script .= "
-	/**
-	 * Gets a single $className object, which is related to this object by a one-to-one relationship.
-	 *
-	 * @param      PropelPDO \$con
-	 * @return     $className
-	 * @throws     PropelException
-	 */
-	public function get".$this->getRefFKPhpNameAffix($refFK, $plural = false)."(PropelPDO \$con = null)
-	{
-";
-		$script .= "
-		if (\$this->$varName === null && !\$this->isNew()) {";
-
-		$lfmap = $refFK->getLocalForeignMapping();
-
-		// remember: this object represents the foreign table,
-		// so we need foreign columns of the reffk to know the local columns
-		// that we need to set :)
-
-		$localcols = $refFK->getForeignColumns();
-
-		// we know that at least every column in the primary key of the foreign table
-		// is represented in this foreign key
-
-		$params = array();
-		foreach ($tblFK->getPrimaryKey() as $col) {
-			$localColumn = $table->getColumn($lfmap[$col->getName()]);
-			$clo = strtolower($localColumn->getName());
-			$params[] = "\$this->$clo";
-		}
-
-		$script .= "
-			\$this->$varName = ".$joinedTableObjectBuilder->getPeerClassname()."::retrieveByPK(".implode(", ", $params).", \$con);
-		}
-
-		return \$this->$varName;
-	}
-";
-	} // addPKRefFKGet()
-
-	/**
-	 * Adds the method that sets a one-to-one related referrer fkey.
-	 * This is for one-to-one relationships special case.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      ForeignKey $refFK The referencing foreign key.
-	 */
-	protected function addPKRefFKSet(&$script, ForeignKey $refFK)
-	{
-		$tblFK = $refFK->getTable();
-
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		$varName = $this->getPKRefFKVarName($refFK);
-
-		$script .= "
-	/**
-	 * Sets a single $className object as related to this object by a one-to-one relationship.
-	 *
-	 * @param      $className \$l $className
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function set".$this->getRefFKPhpNameAffix($refFK, $plural = false)."($className \$v)
-	{
-		\$this->$varName = \$v;
-
-		// Make sure that that the passed-in $className isn't already associated with this object
-		if (\$v->get".$this->getFKPhpNameAffix($refFK, $plural = false)."() === null) {
-			\$v->set".$this->getFKPhpNameAffix($refFK, $plural = false)."(\$this);
-		}
-
-		return \$this;
-	}
-";
-	} // addPKRefFKSet
-
-	// ----------------------------------------------------------------
-	//
-	// M A N I P U L A T I O N    M E T H O D S
-	//
-	// ----------------------------------------------------------------
-
-	/**
-	 * Adds the workhourse doSave() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSave(&$script)
-	{
-		$table = $this->getTable();
-
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-
-		$script .= "
-	/**
-	 * Performs the work of inserting or updating the row in the database.
-	 *
-	 * If the object is new, it inserts it; otherwise an update is performed.
-	 * All related objects are also updated in this method.
-	 *
-	 * @param      PropelPDO \$con";
-		if ($reloadOnUpdate || $reloadOnInsert) {
-			$script .= "
-	 * @param      boolean \$skipReload Whether to skip the reload for this object from database.";
-		}
-		$script .= "
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
-	 * @throws     PropelException
-	 * @see        save()
-	 */
-	protected function doSave(PropelPDO \$con".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload = false" : "").")
-	{
-		\$affectedRows = 0; // initialize var to track total num of affected rows
-		if (!\$this->alreadyInSave) {
-			\$this->alreadyInSave = true;
-";
-		if ($reloadOnInsert || $reloadOnUpdate) {
-			$script .= "
-			\$reloadObject = false;
-";
-		}
-
-		if (count($table->getForeignKeys())) {
-
-			$script .= "
-			// We call the save method on the following object(s) if they
-			// were passed to this object by their coresponding set
-			// method.  This object relates to these object(s) by a
-			// foreign key reference.
-";
-
-			foreach ($table->getForeignKeys() as $fk)
-			{
-				$aVarName = $this->getFKVarName($fk);
-				$script .= "
-			if (\$this->$aVarName !== null) {
-				if (\$this->".$aVarName."->isModified() || \$this->".$aVarName."->isNew()) {
-					\$affectedRows += \$this->".$aVarName."->save(\$con);
-				}
-				\$this->set".$this->getFKPhpNameAffix($fk, $plural = false)."(\$this->$aVarName);
-			}
-";
-			} // foreach foreign k
-		} // if (count(foreign keys))
-		
-		if ($table->hasAutoIncrementPrimaryKey() ) {
-		$script .= "
-			if (\$this->isNew() ) {
-				\$this->modifiedColumns[] = " . $this->getColumnConstant($table->getAutoIncrementPrimaryKey() ) . ";
-			}";
-		}
-
-		$script .= "
-
-			// If this object has been modified, then save it to the database.
-			if (\$this->isModified()";
-
-		$script .= ") {
-				if (\$this->isNew()) {
-					\$pk = ".$this->getPeerClassname()."::doInsert(\$this, \$con);";
-		if ($reloadOnInsert) {
-			$script .= "
-					if (!\$skipReload) {
-						\$reloadObject = true;
-					}";
-		}
-		$script .= "
-					\$affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
-										 // should always be true here (even though technically
-										 // BasePeer::doInsert() can insert multiple rows).
-";
-		if ($table->getIdMethod() != IDMethod::NO_ID_METHOD) {
-
-			if (count($pks = $table->getPrimaryKey())) {
-				foreach ($pks as $pk) {
-					if ($pk->isAutoIncrement()) {
-						$script .= "
-					\$this->set".$pk->getPhpName()."(\$pk);  //[IMV] update autoincrement primary key
-";
-					}
-				}
-			}
-		} // if (id method != "none")
-
-		$script .= "
-					\$this->setNew(false);
-				} else {";
-		if ($reloadOnUpdate) {
-			$script .= "
-					if (!\$skipReload) {
-						\$reloadObject = true;
-					}";
-		}
-		$script .= "
-					\$affectedRows += ".$this->getPeerClassname()."::doUpdate(\$this, \$con);
-				}
-";
-
-		// We need to rewind any LOB columns
-		foreach ($table->getColumns() as $col) {
-			$clo = strtolower($col->getName());
-			if ($col->isLobType()) {
-				$script .= "
-				// Rewind the $clo LOB column, since PDO does not rewind after inserting value.
-				if (\$this->$clo !== null && is_resource(\$this->$clo)) {
-					rewind(\$this->$clo);
-				}
-";
-			}
-		}
-
-		$script .= "
-				\$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
-			}
-";
-
-		foreach ($table->getReferrers() as $refFK) {
-
-			if ($refFK->isLocalPrimaryKey()) {
-				$varName = $this->getPKRefFKVarName($refFK);
-				$script .= "
-			if (\$this->$varName !== null) {
-				if (!\$this->{$varName}->isDeleted()) {
-						\$affectedRows += \$this->{$varName}->save(\$con);
-				}
-			}
-";
-			} else {
-				$collName = $this->getRefFKCollVarName($refFK);
-				$script .= "
-			if (\$this->$collName !== null) {
-				foreach (\$this->$collName as \$referrerFK) {
-					if (!\$referrerFK->isDeleted()) {
-						\$affectedRows += \$referrerFK->save(\$con);
-					}
-				}
-			}
-";
-			} // if refFK->isLocalPrimaryKey()
-
-		} /* foreach getReferrers() */
-		$script .= "
-			\$this->alreadyInSave = false;
-";
-		if ($reloadOnInsert || $reloadOnUpdate) {
-			$script .= "
-			if (\$reloadObject) {
-				\$this->reload(\$con);
-			}
-";
-		}
-		$script .= "
-		}
-		return \$affectedRows;
-	} // doSave()
-";
-
-	}
-
-	/**
-	 * Adds the $alreadyInSave attribute, which prevents attempting to re-save the same object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAlreadyInSaveAttribute(&$script)
-	{
-		$script .= "
-	/**
-	 * Flag to prevent endless save loop, if this object is referenced
-	 * by another object which falls in this transaction.
-	 * @var        boolean
-	 */
-	protected \$alreadyInSave = false;
-";
-	}
-
-	/**
-	 * Adds the save() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSave(&$script)
-	{
-		$this->addSaveComment($script);
-		$this->addSaveOpen($script);
-		$this->addSaveBody($script);
-		$this->addSaveClose($script);
-	}
-
-	/**
-	 * Adds the comment for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveComment(&$script) {
-		$table = $this->getTable();
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-
-		$script .= "
-	/**
-	 * Persists this object to the database.
-	 *
-	 * If the object is new, it inserts it; otherwise an update is performed.
-	 * All modified related objects will also be persisted in the doSave()
-	 * method.  This method wraps all precipitate database operations in a
-	 * single transaction.";
-		if ($reloadOnUpdate) {
-			$script .= "
-	 *
-	 * Since this table was configured to reload rows on update, the object will
-	 * be reloaded from the database if an UPDATE operation is performed (unless
-	 * the \$skipReload parameter is TRUE).";
-		}
-		if ($reloadOnInsert) {
-			$script .= "
-	 *
-	 * Since this table was configured to reload rows on insert, the object will
-	 * be reloaded from the database if an INSERT operation is performed (unless
-	 * the \$skipReload parameter is TRUE).";
-		}
-		$script .= "
-	 *
-	 * @param      PropelPDO \$con";
-		if ($reloadOnUpdate || $reloadOnInsert) {
-			$script .= "
-	 * @param      boolean \$skipReload Whether to skip the reload for this object from database.";
-		}
-		$script .= "
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
-	 * @throws     PropelException
-	 * @see        doSave()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveOpen(&$script) {
-		$table = $this->getTable();
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-		$script .= "
-	public function save(PropelPDO \$con = null".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload = false" : "").")
-	{";
-	}
-
-	/**
-	 * Adds the function body for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveBody(&$script) {
-		$table = $this->getTable();
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-
-		$script .= "
-		if (\$this->isDeleted()) {
-			throw new PropelException(\"You cannot save an object that has been deleted.\");
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-		
-		\$con->beginTransaction();
-		\$isInsert = \$this->isNew();
-		try {";
-		
-		if($this->getGeneratorConfig()->getBuildProperty('addHooks')) {
-			// save with runtime hools
-			$script .= "
-			\$ret = \$this->preSave(\$con);";
-			$this->applyBehaviorModifier('preSave', $script, "			");
-			$script .= "
-			if (\$isInsert) {
-				\$ret = \$ret && \$this->preInsert(\$con);";
-			$this->applyBehaviorModifier('preInsert', $script, "				");
-			$script .= "
-			} else {
-				\$ret = \$ret && \$this->preUpdate(\$con);";
-			$this->applyBehaviorModifier('preUpdate', $script, "				");
-			$script .= "
-			}
-			if (\$ret) {
-				\$affectedRows = \$this->doSave(\$con".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload" : "").");
-				if (\$isInsert) {
-					\$this->postInsert(\$con);";
-			$this->applyBehaviorModifier('postInsert', $script, "					");
-			$script .= "
-				} else {
-					\$this->postUpdate(\$con);";
-			$this->applyBehaviorModifier('postUpdate', $script, "					");
-			$script .= "
-				}
-				\$this->postSave(\$con);";
-				$this->applyBehaviorModifier('postSave', $script, "				");
-				$script .= "
-				".$this->getPeerClassname()."::addInstanceToPool(\$this);
-			} else {
-				\$affectedRows = 0;
-			}
-			\$con->commit();
-			return \$affectedRows;";
-		} else {
-			// save without runtime hooks
-	    $this->applyBehaviorModifier('preSave', $script, "			");
-			if ($this->hasBehaviorModifier('preUpdate'))
-			{
-			  $script .= "
-			if(!\$isInsert) {";
-	      $this->applyBehaviorModifier('preUpdate', $script, "				");
-	      $script .= "
-			}";
-			}
-			if ($this->hasBehaviorModifier('preInsert'))
-			{
-			  $script .= "
-			if(\$isInsert) {";
-	    	$this->applyBehaviorModifier('preInsert', $script, "				");
-	      $script .= "
-			}";
-			}
-			$script .= "
-			\$affectedRows = \$this->doSave(\$con".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload" : "").");";
-	    $this->applyBehaviorModifier('postSave', $script, "			");
-			if ($this->hasBehaviorModifier('postUpdate'))
-			{
-			  $script .= "
-			if(!\$isInsert) {";
-	      $this->applyBehaviorModifier('postUpdate', $script, "				");
-	      $script .= "
-			}";
-			}
-			if ($this->hasBehaviorModifier('postInsert'))
-			{
-			  $script .= "
-			if(\$isInsert) {";
-	      $this->applyBehaviorModifier('postInsert', $script, "				");
-	      $script .= "
-			}";
-			}
-			$script .= "
-			\$con->commit();
-			".$this->getPeerClassname()."::addInstanceToPool(\$this);
-			return \$affectedRows;";
-		}
-		
-		$script .= "
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}";
-	}
-
-	/**
-	 * Adds the function close for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the $alreadyInValidation attribute, which prevents attempting to re-validate the same object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAlreadyInValidationAttribute(&$script)
-	{
-		$script .= "
-	/**
-	 * Flag to prevent endless validation loop, if this object is referenced
-	 * by another object which falls in this transaction.
-	 * @var        boolean
-	 */
-	protected \$alreadyInValidation = false;
-";
-	}
-
-	/**
-	 * Adds the validate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addValidate(&$script)
-	{
-		$script .= "
-	/**
-	 * Validates the objects modified field values and all objects related to this table.
-	 *
-	 * If \$columns is either a column name or an array of column names
-	 * only those columns are validated.
-	 *
-	 * @param      mixed \$columns Column name or an array of column names.
-	 * @return     boolean Whether all columns pass validation.
-	 * @see        doValidate()
-	 * @see        getValidationFailures()
-	 */
-	public function validate(\$columns = null)
-	{
-		\$res = \$this->doValidate(\$columns);
-		if (\$res === true) {
-			\$this->validationFailures = array();
-			return true;
-		} else {
-			\$this->validationFailures = \$res;
-			return false;
-		}
-	}
-";
-	} // addValidate()
-
-	/**
-	 * Adds the workhourse doValidate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoValidate(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * This function performs the validation work for complex object models.
-	 *
-	 * In addition to checking the current object, all related objects will
-	 * also be validated.  If all pass then <code>true</code> is returned; otherwise
-	 * an aggreagated array of ValidationFailed objects will be returned.
-	 *
-	 * @param      array \$columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
-	 */
-	protected function doValidate(\$columns = null)
-	{
-		if (!\$this->alreadyInValidation) {
-			\$this->alreadyInValidation = true;
-			\$retval = null;
-
-			\$failureMap = array();
-";
-		if (count($table->getForeignKeys()) != 0) {
-			$script .= "
-
-			// We call the validate method on the following object(s) if they
-			// were passed to this object by their coresponding set
-			// method.  This object relates to these object(s) by a
-			// foreign key reference.
-";
-			foreach ($table->getForeignKeys() as $fk) {
-				$aVarName = $this->getFKVarName($fk);
-				$script .= "
-			if (\$this->".$aVarName." !== null) {
-				if (!\$this->".$aVarName."->validate(\$columns)) {
-					\$failureMap = array_merge(\$failureMap, \$this->".$aVarName."->getValidationFailures());
-				}
-			}
-";
-			} /* for () */
-		} /* if count(fkeys) */
-
-		$script .= "
-
-			if ((\$retval = ".$this->getPeerClassname()."::doValidate(\$this, \$columns)) !== true) {
-				\$failureMap = array_merge(\$failureMap, \$retval);
-			}
-
-";
-
-		foreach ($table->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$varName = $this->getPKRefFKVarName($refFK);
-				$script .= "
-				if (\$this->$varName !== null) {
-					if (!\$this->".$varName."->validate(\$columns)) {
-						\$failureMap = array_merge(\$failureMap, \$this->".$varName."->getValidationFailures());
-					}
-				}
-";
-			} else {
-				$collName = $this->getRefFKCollVarName($refFK);
-				$script .= "
-				if (\$this->$collName !== null) {
-					foreach (\$this->$collName as \$referrerFK) {
-						if (!\$referrerFK->validate(\$columns)) {
-							\$failureMap = array_merge(\$failureMap, \$referrerFK->getValidationFailures());
-						}
-					}
-				}
-";
-			}
-		} /* foreach getReferrers() */
-
-		$script .= "
-
-			\$this->alreadyInValidation = false;
-		}
-
-		return (!empty(\$failureMap) ? \$failureMap : true);
-	}
-";
-	} // addDoValidate()
-
-	/**
-	 * Adds the ensureConsistency() method to ensure that internal state is correct.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addEnsureConsistency(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Checks and repairs the internal consistency of the object.
-	 *
-	 * This method is executed after an already-instantiated object is re-hydrated
-	 * from the database.  It exists to check any foreign keys to make sure that
-	 * the objects related to the current object are correct based on foreign key.
-	 *
-	 * You can override this method in the stub class, but you should always invoke
-	 * the base method from the overridden method (i.e. parent::ensureConsistency()),
-	 * in case your model changes.
-	 *
-	 * @throws     PropelException
-	 */
-	public function ensureConsistency()
-	{
-";
-		foreach ($table->getColumns() as $col) {
-
-			$clo=strtolower($col->getName());
-
-			if ($col->isForeignKey()) {
-				foreach ($col->getForeignKeys() as $fk) {
-
-					$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-					$colFK = $tblFK->getColumn($fk->getMappedForeignColumn($col->getName()));
-					$varName = $this->getFKVarName($fk);
-
-					$script .= "
-		if (\$this->".$varName." !== null && \$this->$clo !== \$this->".$varName."->get".$colFK->getPhpName()."()) {
-			\$this->$varName = null;
-		}";
-				} // foraech
-			} /* if col is foreign key */
-
-		} // foreach
-
-		$script .= "
-	} // ensureConsistency
-";
-	} // addCheckRelConsistency
-
-	/**
-	 * Adds the copy() method, which (in complex OM) includes the $deepCopy param for making copies of related objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addCopy(&$script)
-	{
-		$this->addCopyInto($script);
-
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Makes a copy of this object that will be inserted as a new row in table when saved.
-	 * It creates a new object filling in the simple attributes, but skipping any primary
-	 * keys that are defined for the table.
-	 *
-	 * If desired, this method can also make copies of all associated (fkey referrers)
-	 * objects.
-	 *
-	 * @param      boolean \$deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-	 * @return     ".$this->getObjectClassname()." Clone of current object.
-	 * @throws     PropelException
-	 */
-	public function copy(\$deepCopy = false)
-	{
-		// we use get_class(), because this might be a subclass
-		\$clazz = get_class(\$this);
-		" . $this->buildObjectInstanceCreationCode('$copyObj', '$clazz') . "
-		\$this->copyInto(\$copyObj, \$deepCopy);
-		return \$copyObj;
-	}
-";
-	} // addCopy()
-
-	/**
-	 * Adds the copyInto() method, which takes an object and sets contents to match current object.
-	 * In complex OM this method includes the $deepCopy param for making copies of related objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addCopyInto(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Sets contents of passed object to values from current object.
-	 *
-	 * If desired, this method can also make copies of all associated (fkey referrers)
-	 * objects.
-	 *
-	 * @param      object \$copyObj An object of ".$this->getObjectClassname()." (or compatible) type.
-	 * @param      boolean \$deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-	 * @throws     PropelException
-	 */
-	public function copyInto(\$copyObj, \$deepCopy = false)
-	{
-";
-
-		$autoIncCols = array();
-		foreach ($table->getColumns() as $col) {
-			/* @var        $col Column */
-			if ($col->isAutoIncrement()) {
-				$autoIncCols[] = $col;
-			}
-		}
-
-		foreach ($table->getColumns() as $col) {
-			if (!in_array($col, $autoIncCols, true)) {
-				$script .= "
-		\$copyObj->set".$col->getPhpName()."(\$this->".strtolower($col->getName()).");
-";
-			}
-		} // foreach
-
-		// Avoid useless code by checking to see if there are any referrers
-		// to this table:
-		if (count($table->getReferrers()) > 0) {
-			$script .= "
-
-		if (\$deepCopy) {
-			// important: temporarily setNew(false) because this affects the behavior of
-			// the getter/setter methods for fkey referrer objects.
-			\$copyObj->setNew(false);
-";
-			foreach ($table->getReferrers() as $fk) {
-				//HL: commenting out self-referrential check below
-				//		it seems to work as expected and is probably desireable to have those referrers from same table deep-copied.
-				//if ( $fk->getTable()->getName() != $table->getName() ) {
-
-				if ($fk->isLocalPrimaryKey()) {
-
-					$afx = $this->getRefFKPhpNameAffix($fk, $plural = false);
-					$script .= "
-			\$relObj = \$this->get$afx();
-			if (\$relObj) {
-				\$copyObj->set$afx(\$relObj->copy(\$deepCopy));
-			}
-";
-				} else {
-
-					$script .= "
-			foreach (\$this->get".$this->getRefFKPhpNameAffix($fk, true)."() as \$relObj) {
-				if (\$relObj !== \$this) {  // ensure that we don't try to copy a reference to ourselves
-					\$copyObj->add".$this->getRefFKPhpNameAffix($fk)."(\$relObj->copy(\$deepCopy));
-				}
-			}
-";
-				}
-				// HL: commenting out close of self-referential check
-				// } /* if tblFK != table */
-			} /* foreach */
-			$script .= "
-		} // if (\$deepCopy)
-";
-		} /* if (count referrers > 0 ) */
-
-		$script .= "
-
-		\$copyObj->setNew(true);
-";
-
-		// Note: we're no longer resetting non-autoincrement primary keys to default values
-		// due to: http://propel.phpdb.org/trac/ticket/618
-		foreach ($autoIncCols as $col) {
-				$coldefval = $col->getPhpDefaultValue();
-				$coldefval = var_export($coldefval, true);
-				$script .= "
-		\$copyObj->set".$col->getPhpName() ."($coldefval); // this is a auto-increment column, so set to default value
-";
-		} // foreach
-		$script .= "
-	}
-";
-	} // addCopyInto()
-
-
-	/**
-	 * Adds clearAllReferencers() method which resets all the collections of referencing
-	 * fk objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClearAllReferences(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Resets all collections of referencing foreign keys.
-	 *
-	 * This method is a user-space workaround for PHP's inability to garbage collect objects
-	 * with circular references.  This is currently necessary when using Propel in certain
-	 * daemon or large-volumne/high-memory operations.
-	 *
-	 * @param      boolean \$deep Whether to also clear the references on all associated objects.
-	 */
-	public function clearAllReferences(\$deep = false)
-	{
-		if (\$deep) {";
-		$vars = array();
-		foreach ($this->getTable()->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$varName = $this->getPKRefFKVarName($refFK);
-				$vars[] = $varName;
-				$script .= "
-			if (\$this->$varName) {
-				\$this->{$varName}->clearAllReferences(\$deep);
-			}";
-			} else {
-				$varName = $this->getRefFKCollVarName($refFK);
-				$vars[] = $varName;
-				$script .= "
-			if (\$this->$varName) {
-				foreach ((array) \$this->$varName as \$o) {
-					\$o->clearAllReferences(\$deep);
-				}
-			}";
-			}
-		}
-
-		$script .= "
-		} // if (\$deep)
-";
-
-		foreach ($vars as $varName) {
-			$script .= "
-		\$this->$varName = null;";
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$className = $this->getForeignTable($fk)->getPhpName();
-			$varName = $this->getFKVarName($fk);
-			$script .= "
-			\$this->$varName = null;";
-		}
-
-		$script .= "
-	}
-";
-	}
-
-  /**
-   * Adds a magic __toString() method if a string column was defined as primary string
-	 * @param      string &$script The script will be modified in this method.
-   */
-  protected function addPrimaryString(&$script)
-  {
-    foreach ($this->getTable()->getColumns() as $column) {
-      if ($column->isPrimaryString()) {
-        $script .= "
-	/**
-	 * Return the string representation of this object
-	 *
-	 * @return string The value of the '{$column->getName()}' column
-	 */
-  public function __toString()
-  {
-    return (string) \$this->get{$column->getPhpName()}();
-  }
-";
-        break;
-      }
-    }
-  }
-} // PHP5ObjectBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php
deleted file mode 100644
index fa29313..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php
+++ /dev/null
@@ -1,2645 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5PeerBuilder.php 1450 2010-01-12 21:19:00Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates a PHP5 base Peer class for user object model (OM).
- *
- * This class produces the base peer class (e.g. BaseMyPeer) which contains all
- * the custom-built query and manipulator methods.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5PeerBuilder extends PeerBuilder {
-
-	/**
-	 * Validates the current table to make sure that it won't
-	 * result in generated code that will not parse.
-	 *
-	 * This method may emit warnings for code which may cause problems
-	 * and will throw exceptions for errors that will definitely cause
-	 * problems.
-	 */
-	protected function validateModel()
-	{
-		parent::validateModel();
-
-		$table = $this->getTable();
-
-		// Check to see if any of the column constants are PHP reserved words.
-		$colConstants = array();
-
-		foreach ($table->getColumns() as $col) {
-			$colConstants[] = $this->getColumnName($col);
-		}
-
-		$reservedConstants = array_map('strtoupper', ClassTools::getPhpReservedWords());
-
-		$intersect = array_intersect($reservedConstants, $colConstants);
-		if (!empty($intersect)) {
-			throw new EngineException("One or more of your column names for [" . $table->getName() . "] table conflict with a PHP reserved word (" . implode(", ", $intersect) . ")");
-		}
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubPeerBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Gets the package for the [base] peer classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script) {
-
-		$tableName = $this->getTable()->getName();
-		$tableDesc = $this->getTable()->getDescription();
-
-		$script .= "
-/**
- * Base static class for performing query and update operations on the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-
-		$extendingPeerClass = '';
-		if ($this->basePeerClassname !== 'BasePeer') {
-			$extendingPeerClass = ' extends ' . $this->basePeerClassname;
-		}
-
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname(). $extendingPeerClass . " {
-";
-	}
-
-	/**
-	 * Closes class.
-	 * Adds closing brace at end of class and the static map builder registration code.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addStaticTableMapRegistration()
-	 */
-	protected function addClassClose(&$script)
-	{
-	  // apply behaviors
-    $this->applyBehaviorModifier('staticMethods', $script, "	");
-		
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->addStaticTableMapRegistration($script);
-	}
-
-	/**
-	 * Adds the static map builder registration code.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addStaticTableMapRegistration(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-".$this->getClassName()."::buildTableMap();
-
-";
-    $this->applyBehaviorModifier('peerFilter', $script, "");
-	}
-
-  public function getTableMapClass()
-  {
-    return $this->getTablePhpName() . 'TableMap';
-  }
-  
-  public function getTablePhpName()
-  {
-  	return ($this->getTable()->isAbstract() ? '' : $this->getStubObjectBuilder()->getClassname());
-  }
-
-	/**
-	 * Adds constant and variable declarations that go at the top of the class.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addColumnNameConstants()
-	 */
-	protected function addConstantsAndAttributes(&$script)
-	{
-		$dbName = $this->getDatabase()->getName();
-	  $tableName = $this->prefixTableName($this->getTable()->getName());
-	  $tablePhpName = $this->getTablePhpName();
-		$script .= "
-	/** the default database name for this class */
-	const DATABASE_NAME = '$dbName';
-
-	/** the table name for this class */
-	const TABLE_NAME = '$tableName';
-
-	/** the related Propel class for this table */
-	const OM_CLASS = '$tablePhpName';
-
-	/** A class that can be returned by this peer. */
-	const CLASS_DEFAULT = '".$this->getStubObjectBuilder()->getClasspath()."';
-
-	/** the related TableMap class for this table */
-	const TM_CLASS = '".$this->getTableMapClass()."';
-	
-	/** The total number of columns. */
-	const NUM_COLUMNS = ".$this->getTable()->getNumColumns().";
-
-	/** The number of lazy-loaded columns. */
-	const NUM_LAZY_LOAD_COLUMNS = ".$this->getTable()->getNumLazyLoadColumns().";
-";
-		$this->addColumnNameConstants($script);
-		$this->addInheritanceColumnConstants($script);
-
-		$script .= "
-	/**
-	 * An identiy map to hold any loaded instances of ".$this->getObjectClassname()." objects.
-	 * This must be public so that other peer classes can access this when hydrating from JOIN
-	 * queries.
-	 * @var        array ".$this->getObjectClassname()."[]
-	 */
-	public static \$instances = array();
-
-";
-
-		// apply behaviors
-    $this->applyBehaviorModifier('staticAttributes', $script, "	");
-		
-		$this->addFieldNamesAttribute($script);
-		$this->addFieldKeysAttribute($script);
-	}
-
-	/**
-	 * Adds the COLUMN_NAME contants to the class definition.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addColumnNameConstants(&$script)
-	{
-		foreach ($this->getTable()->getColumns() as $col) {
-			$script .= "
-	/** the column name for the ".strtoupper($col->getName()) ." field */
-	const ".$this->getColumnName($col) ." = '".$this->prefixTablename($this->getTable()->getName()).".".strtoupper($col->getName())."';
-";
-		} // foreach
-	}
-
-	protected function addFieldNamesAttribute(&$script)
-	{
-		$table = $this->getTable();
-
-		$tableColumns = $table->getColumns();
-
-		$script .= "
-	/**
-	 * holds an array of fieldnames
-	 *
-	 * first dimension keys are the type constants
-	 * e.g. self::\$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-	 */
-	private static \$fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= "'".$col->getPhpName()."', ";
-		}
-		$script .= "),
-		BasePeer::TYPE_STUDLYPHPNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= "'".$col->getStudlyPhpName()."', ";
-		}
-		$script .= "),
-		BasePeer::TYPE_COLNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= $this->getColumnConstant($col, 'self').", ";
-		}
-		$script .= "),
-		BasePeer::TYPE_FIELDNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= "'".$col->getName()."', ";
-		}
-		$script .= "),
-		BasePeer::TYPE_NUM => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "$num, ";
-		}
-		$script .= ")
-	);
-";
-	}
-
-	protected function addFieldKeysAttribute(&$script)
-	{
-		$table = $this->getTable();
-
-		$tableColumns = $table->getColumns();
-
-		$script .= "
-	/**
-	 * holds an array of keys for quick access to the fieldnames array
-	 *
-	 * first dimension keys are the type constants
-	 * e.g. self::\$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
-	 */
-	private static \$fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "'".$col->getPhpName()."' => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_STUDLYPHPNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "'".$col->getStudlyPhpName()."' => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_COLNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= $this->getColumnConstant($col, 'self')." => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_FIELDNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "'".$col->getName()."' => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_NUM => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "$num, ";
-		}
-		$script .= ")
-	);
-";
-	} // addFielKeysAttribute
-
-
-	protected function addGetFieldNames(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns an array of field names.
-	 *
-	 * @param      string \$type The type of fieldnames to return:
-	 *                      One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                      BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @return     array A list of field names
-	 */
-
-	static public function getFieldNames(\$type = BasePeer::TYPE_PHPNAME)
-	{
-		if (!array_key_exists(\$type, self::\$fieldNames)) {
-			throw new PropelException('Method getFieldNames() expects the parameter \$type to be one of the class constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. ' . \$type . ' was given.');
-		}
-		return self::\$fieldNames[\$type];
-	}
-";
-
-	} // addGetFieldNames()
-
-	protected function addTranslateFieldName(&$script)
-	{
-		$script .= "
-	/**
-	 * Translates a fieldname to another type
-	 *
-	 * @param      string \$name field name
-	 * @param      string \$fromType One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                         BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @param      string \$toType   One of the class type constants
-	 * @return     string translated name of the field.
-	 * @throws     PropelException - if the specified name could not be found in the fieldname mappings.
-	 */
-	static public function translateFieldName(\$name, \$fromType, \$toType)
-	{
-		\$toNames = self::getFieldNames(\$toType);
-		\$key = isset(self::\$fieldKeys[\$fromType][\$name]) ? self::\$fieldKeys[\$fromType][\$name] : null;
-		if (\$key === null) {
-			throw new PropelException(\"'\$name' could not be found in the field names of type '\$fromType'. These are: \" . print_r(self::\$fieldKeys[\$fromType], true));
-		}
-		return \$toNames[\$key];
-	}
-";
-	} // addTranslateFieldName()
-
-	/**
-	 * Adds the buildTableMap() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addBuildTableMap(&$script)
-	{
-		$script .= "
-	/**
-	 * Add a TableMap instance to the database for this peer class.
-	 */
-	public static function buildTableMap()
-	{
-	  \$dbMap = Propel::getDatabaseMap(".$this->getClassname()."::DATABASE_NAME);
-	  if (!\$dbMap->hasTable(".$this->getClassname()."::TABLE_NAME))
-	  {
-	    \$dbMap->addTableObject(new ".$this->getTableMapClass()."());
-	  }
-	}
-";
-	}
-
-	/**
-	 * Adds the CLASSKEY_* and CLASSNAME_* constants used for inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	public function addInheritanceColumnConstants(&$script)
-	{
-		if ($this->getTable()->getChildrenColumn()) {
-
-			$col = $this->getTable()->getChildrenColumn();
-			$cfc = $col->getPhpName();
-
-			if ($col->isEnumeratedClasses()) {
-
-				if ($col->isPhpPrimitiveNumericType()) $quote = "";
-				else $quote = '"';
-
-				foreach ($col->getChildren() as $child) {
-					$childBuilder = $this->getMultiExtendObjectBuilder();
-					$childBuilder->setChild($child);
-
-					$script .= "
-	/** A key representing a particular subclass */
-	const CLASSKEY_".strtoupper($child->getKey())." = '" . $child->getKey() . "';
-";
-
-					if (strtoupper($child->getClassname()) != strtoupper($child->getKey())) {
-						$script .= "
-	/** A key representing a particular subclass */
-	const CLASSKEY_".strtoupper($child->getClassname())." = '" . $child->getKey() . "';
-";
-					}
-
-					$script .= "
-	/** A class that can be returned by this peer. */
-	const CLASSNAME_".strtoupper($child->getKey())." = '". $childBuilder->getClasspath() . "';
-";
-				} /* foreach children */
-			} /* if col->isenumerated...() */
-		} /* if table->getchildrencolumn() */
-
-	} //
-
-	/**
-	 * Adds the alias() utility method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAlias(&$script)
-	{
-		$script .= "
-	/**
-	 * Convenience method which changes table.column to alias.column.
-	 *
-	 * Using this method you can maintain SQL abstraction while using column aliases.
-	 * <code>
-	 *		\$c->addAlias(\"alias1\", TablePeer::TABLE_NAME);
-	 *		\$c->addJoin(TablePeer::alias(\"alias1\", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
-	 * </code>
-	 * @param      string \$alias The alias for the current table.
-	 * @param      string \$column The column name for current table. (i.e. ".$this->getPeerClassname()."::COLUMN_NAME).
-	 * @return     string
-	 */
-	public static function alias(\$alias, \$column)
-	{
-		return str_replace(".$this->getPeerClassname()."::TABLE_NAME.'.', \$alias.'.', \$column);
-	}
-";
-	} // addAliasMethod
-
-	/**
-	 * Adds the addSelectColumns() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAddSelectColumns(&$script)
-	{
-		$script .= "
-	/**
-	 * Add all the columns needed to create a new object.
-	 *
-	 * Note: any columns that were marked with lazyLoad=\"true\" in the
-	 * XML schema will not be added to the select list and only loaded
-	 * on demand.
-	 *
-	 * @param      criteria object containing the columns to add.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function addSelectColumns(Criteria \$criteria)
-	{";
-		foreach ($this->getTable()->getColumns() as $col) {
-			if (!$col->isLazyLoad()) {
-				$script .= "
-		\$criteria->addSelectColumn(".$this->getPeerClassname()."::".$this->getColumnName($col).");";
-			} // if !col->isLazyLoad
-		} // foreach
-		$script .="
-	}
-";
-	} // addAddSelectColumns()
-
-	/**
-	 * Adds the doCount() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCount(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns the number of rows matching criteria.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCount(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null)
-	{
-		// we may modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-
-		\$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-		\$criteria->setDbName(self::DATABASE_NAME); // Set the correct dbName
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}";
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('preSelect', $script);
-    
-		$script .= "
-		// BasePeer returns a PDOStatement
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}";
-	}
-
-	/**
-	 * Adds the doSelectOne() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectOne(&$script)
-	{
-		$script .= "
-	/**
-	 * Method to select one object from the DB.
-	 *
-	 * @param      Criteria \$criteria object used to create the SELECT statement.
-	 * @param      PropelPDO \$con
-	 * @return     ".$this->getObjectClassname()."
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectOne(Criteria \$criteria, PropelPDO \$con = null)
-	{
-		\$critcopy = clone \$criteria;
-		\$critcopy->setLimit(1);
-		\$objects = ".$this->getPeerClassname()."::doSelect(\$critcopy, \$con);
-		if (\$objects) {
-			return \$objects[0];
-		}
-		return null;
-	}";
-	}
-
-	/**
-	 * Adds the doSelect() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelect(&$script)
-	{
-		$script .= "
-	/**
-	 * Method to do selects.
-	 *
-	 * @param      Criteria \$criteria The Criteria object used to build the SELECT statement.
-	 * @param      PropelPDO \$con
-	 * @return     array Array of selected Objects
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelect(Criteria \$criteria, PropelPDO \$con = null)
-	{
-		return ".$this->getPeerClassname()."::populateObjects(".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con));
-	}";
-	}
-
-	/**
-	 * Adds the doSelectStmt() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectStmt(&$script)
-	{
-
-		$script .= "
-	/**
-	 * Prepares the Criteria object and uses the parent doSelect() method to execute a PDOStatement.
-	 *
-	 * Use this method directly if you want to work with an executed statement durirectly (for example
-	 * to perform your own object hydration).
-	 *
-	 * @param      Criteria \$criteria The Criteria object used to build the SELECT statement.
-	 * @param      PropelPDO \$con The connection to use
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 * @return     PDOStatement The executed PDOStatement object.
-	 * @see        ".$this->basePeerClassname."::doSelect()
-	 */
-	public static function doSelectStmt(Criteria \$criteria, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			\$criteria = clone \$criteria;
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);";
-		// apply behaviors
-		if ($this->hasBehaviorModifier('preSelect'))
-		{
-      $this->applyBehaviorModifier('preSelect', $script);
-		}
-		$script .= "
-
-		// BasePeer returns a PDOStatement
-		return ".$this->basePeerClassname."::doSelect(\$criteria, \$con);
-	}";
-	}
-
-	/**
-	 * Adds the PHP code to return a instance pool key for the passed-in primary key variable names.
-	 *
-	 * @param      array $pkphp An array of PHP var names / method calls representing complete pk.
-	 */
-	protected function getInstancePoolKeySnippet($pkphp)
-	{
-		$pkphp = (array) $pkphp; // make it an array if it is not.
-		$script = "";
-		if (count($pkphp) > 1) {
-			$script .= "serialize(array(";
-			$i = 0;
-			foreach ($pkphp as $pkvar) {
-				$script .= ($i++ ? ', ' : '') . "(string) $pkvar";
-			}
-			$script .= "))";
-		} else {
-			$script .= "(string) " . $pkphp[0];
-		}
-		return $script;
-	}
-
-	/**
-	 * Creates a convenience method to add objects to an instance pool.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAddInstanceToPool(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Adds an object to the instance pool.
-	 *
-	 * Propel keeps cached copies of objects in an instance pool when they are retrieved
-	 * from the database.  In some cases -- especially when you override doSelect*()
-	 * methods in your stub classes -- you may need to explicitly add objects
-	 * to the cache in order to ensure that the same objects are always returned by doSelect*()
-	 * and retrieveByPK*() calls.
-	 *
-	 * @param      ".$this->getObjectClassname()." \$value A ".$this->getObjectClassname()." object.
-	 * @param      string \$key (optional) key to use for instance map (for performance boost if key was already calculated externally).
-	 */
-	public static function addInstanceToPool(".$this->getObjectClassname()." \$obj, \$key = null)
-	{
-		if (Propel::isInstancePoolingEnabled()) {
-			if (\$key === null) {";
-
-		$pks = $this->getTable()->getPrimaryKey();
-
-		$php = array();
-		foreach ($pks as $pk) {
-			$php[] = '$obj->get' . $pk->getPhpName() . '()';
-		}
-		$script .= "
-				\$key = ".$this->getInstancePoolKeySnippet($php).";";
-		$script .= "
-			} // if key === null
-			self::\$instances[\$key] = \$obj;
-		}
-	}
-";
-	} // addAddInstanceToPool()
-
-	/**
-	 *  Creates a convenience method to remove objects form an instance pool.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRemoveInstanceFromPool(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Removes an object from the instance pool.
-	 *
-	 * Propel keeps cached copies of objects in an instance pool when they are retrieved
-	 * from the database.  In some cases -- especially when you override doDelete
-	 * methods in your stub classes -- you may need to explicitly remove objects
-	 * from the cache in order to prevent returning objects that no longer exist.
-	 *
-	 * @param      mixed \$value A ".$this->getObjectClassname()." object or a primary key value.
-	 */
-	public static function removeInstanceFromPool(\$value)
-	{";
-		$script .= "
-		if (Propel::isInstancePoolingEnabled() && \$value !== null) {";
-		$pks = $table->getPrimaryKey();
-
-		$script .= "
-			if (is_object(\$value) && \$value instanceof ".$this->getObjectClassname().") {";
-
-			$php = array();
-			foreach ($pks as $pk) {
-				$php[] = '$value->get' . $pk->getPhpName() . '()';
-			}
-			$script .= "
-				\$key = ".$this->getInstancePoolKeySnippet($php).";";
-
-		$script .= "
-			} elseif (".(count($pks) > 1 ? "is_array(\$value) && count(\$value) === " . count($pks) : "is_scalar(\$value)").") {
-				// assume we've been passed a primary key";
-
-		if (count($pks) > 1) {
-			$php = array();
-			for ($i=0; $i < count($pks); $i++) {
-				$php[] = "\$value[$i]";
-			}
-		} else {
-			$php = '$value';
-		}
-		$script .= "
-				\$key = ".$this->getInstancePoolKeySnippet($php).";";
-		$script .= "
-			} else {
-				\$e = new PropelException(\"Invalid value passed to removeInstanceFromPool().  Expected primary key or ".$this->getObjectClassname()." object; got \" . (is_object(\$value) ? get_class(\$value) . ' object.' : var_export(\$value,true)));
-				throw \$e;
-			}
-
-			unset(self::\$instances[\$key]);
-		}
-	} // removeInstanceFromPool()
-";
-	} // addRemoveFromInstancePool()
-
-	/**
-	 * Adds method to clear the instance pool.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClearInstancePool(&$script)
-	{
-		$script .= "
-	/**
-	 * Clear the instance pool.
-	 *
-	 * @return     void
-	 */
-	public static function clearInstancePool()
-	{
-		self::\$instances = array();
-	}
-	";
-	}
-
-	/**
-	 * Adds method to clear the instance pool of related tables.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClearRelatedInstancePool(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method to invalidate the instance pool of all tables related to " . $table->getName() . "
-	 * by a foreign key with ON DELETE CASCADE
-	 */
-	public static function clearRelatedInstancePool()
-	{";
-		// Handle ON DELETE CASCADE for updating instance pool
-
-		foreach ($table->getReferrers() as $fk) {
-
-			// $fk is the foreign key in the other table, so localTableName will
-			// actually be the table name of other table
-			$tblFK = $fk->getTable();
-
-			$joinedTablePeerBuilder = $this->getNewPeerBuilder($tblFK);
-			$tblFKPackage = $joinedTablePeerBuilder->getStubPeerBuilder()->getPackage();
-
-			if (!$tblFK->isForReferenceOnly()) {
-				// we can't perform operations on tables that are
-				// not within the schema (i.e. that we have no map for, etc.)
-
-				$fkClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-				// i'm not sure whether we can allow delete cascade for foreign keys
-				// within the same table?  perhaps we can?
-				if ( ($fk->getOnDelete() == ForeignKey::CASCADE || $fk->getOnDelete() == ForeignKey::SETNULL )
-				&& $tblFK->getName() != $table->getName()) {
-					$script .= "
-		// invalidate objects in ".$joinedTablePeerBuilder->getPeerClassname()." instance pool, since one or more of them may be deleted by ON DELETE CASCADE rule.
-		".$joinedTablePeerBuilder->getPeerClassname()."::clearInstancePool();
-";
-				} // if fk is on delete cascade
-			} // if (! for ref only)
-		} // foreach
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds method to get an the instance from the pool, given a key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetInstanceFromPool(&$script)
-	{
-		$script .= "
-	/**
-	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-	 *
-	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
-	 *
-	 * @param      string \$key The key (@see getPrimaryKeyHash()) for this instance.
-	 * @return     ".$this->getObjectClassname()." Found object or NULL if 1) no instance exists for specified key or 2) instance pooling has been disabled.
-	 * @see        getPrimaryKeyHash()
-	 */
-	public static function getInstanceFromPool(\$key)
-	{
-		if (Propel::isInstancePoolingEnabled()) {
-			if (isset(self::\$instances[\$key])) {
-				return self::\$instances[\$key];
-			}
-		}
-		return null; // just to be explicit
-	}
-	";
-	}
-
-	/**
-	 * Adds method to get a version of the primary key that can be used as a unique key for identifier map.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKeyHash(&$script)
-	{
-		$script .= "
-	/**
-	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-	 *
-	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
-	 *
-	 * @param      array \$row PropelPDO resultset row.
-	 * @param      int \$startcol The 0-based offset for reading from the resultset row.
-	 * @return     string A string version of PK or NULL if the components of primary key in result array are all null.
-	 */
-	public static function getPrimaryKeyHashFromRow(\$row, \$startcol = 0)
-	{";
-
-		// We have to iterate through all the columns so that we know the offset of the primary
-		// key columns.
-		$n = 0;
-		$pk = array();
-		$cond = array();
-		foreach ($this->getTable()->getColumns() as $col) {
-			if (!$col->isLazyLoad()) {
-				if ($col->isPrimaryKey()) {
-					$part = $n ? "\$row[\$startcol + $n]" : "\$row[\$startcol]";
-					$cond[] = $part . " === null";
-					$pk[] = $part;
-				}
-				$n++;
-			}
-		}
-
-		$script .= "
-		// If the PK cannot be derived from the row, return NULL.
-		if (".implode(' && ', $cond).") {
-			return null;
-		}
-		return ".$this->getInstancePoolKeySnippet($pk).";
-	}
-";
-	} // addGetPrimaryKeyHash
-
-	/**
-	 * Adds the populateObjects() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addPopulateObjects(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * The returned array will contain objects of the default type or
-	 * objects that inherit from the default.
-	 *
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function populateObjects(PDOStatement \$stmt)
-	{
-		\$results = array();
-	";
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = ".$this->getPeerClassname()."::getOMClass(false);";
-		}
-
-		$script .= "
-		// populate the object(s)
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj = ".$this->getPeerClassname()."::getInstanceFromPool(\$key))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj->hydrate(\$row, 0, true); // rehydrate
-				\$results[] = \$obj;
-			} else {";
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-				" . $this->buildObjectInstanceCreationCode('$obj', '$cls') . "
-				\$obj->hydrate(\$row);
-				\$results[] = \$obj;
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj, \$key);";
-		} else {
-			$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj', '$cls') . "
-				\$obj->hydrate(\$row);
-				\$results[] = \$obj;
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj, \$key);";
-		}
-		$script .= "
-			} // if key exists
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}";
-	}
-
-	/**
-	 * Adds a getOMClass() for non-abstract tables that have inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_Inheritance(&$script)
-	{
-		$col = $this->getTable()->getChildrenColumn();
-		$script .= "
-	/**
-	 * The returned Class will contain objects of the default type or
-	 * objects that inherit from the default.
-	 *
-	 * @param      array \$row PropelPDO result row.
-	 * @param      int \$colnum Column to examine for OM class information (first is 0).
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function getOMClass(\$row, \$colnum)
-	{
-		try {
-";
-		if ($col->isEnumeratedClasses()) {
-			$script .= "
-			\$omClass = null;
-			\$classKey = \$row[\$colnum + " . ($col->getPosition() - 1) . "];
-
-			switch(\$classKey) {
-";
-			foreach ($col->getChildren() as $child) {
-				$script .= "
-				case self::CLASSKEY_".strtoupper($child->getKey()).":
-					\$omClass = self::CLASSNAME_".strtoupper($child->getKey()).";
-					break;
-";
-			} /* foreach */
-			$script .= "
-				default:
-					\$omClass = self::CLASS_DEFAULT;
-";
-			$script .= "
-			} // switch
-";
-		} else { /* if not enumerated */
-			$script .= "
-			\$omClass = \$row[\$colnum + ".($col->getPosition()-1)."];
-			\$omClass = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-		}
-		$script .= "
-		} catch (Exception \$e) {
-			throw new PropelException('Unable to get OM class.', \$e);
-		}
-		return \$omClass;
-	}
-";
-	}
-
-	/**
-	 * Adds a getOMClass() signature for abstract tables that have inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_Inheritance_Abstract(&$script)
-	{
-		$script .= "
-	/**
-	 * The returned Class will contain objects of the default type or
-	 * objects that inherit from the default.
-	 *
-	 * This method must be overridden by the stub subclass, because
-	 * ".$this->getObjectClassname()." is declared abstract in the schema.
-	 *
-	 * @param      ResultSet \$rs ResultSet with pointer to record containing om class.
-	 * @param      int \$colnum Column to examine for OM class information (first is 1).
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	abstract public static function getOMClass();
-";
-	}
-
-	/**
-	 * Adds a getOMClass() for non-abstract tables that do note use inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_NoInheritance(&$script)
-	{
-		$script .= "
-	/**
-	 * The class that the Peer will make instances of.
-	 *
-	 * If \$withPrefix is true, the returned path
-	 * uses a dot-path notation which is tranalted into a path
-	 * relative to a location on the PHP include_path.
-	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-	 *
-	 * @param      boolean $withPrefix Whether or not to return the path wit hthe class name 
-	 * @return     string path.to.ClassName
-	 */
-	public static function getOMClass(\$withPrefix = true)
-	{
-		return \$withPrefix ? ".$this->getPeerClassname()."::CLASS_DEFAULT : ".$this->getPeerClassname()."::OM_CLASS;
-	}
-";
-	}
-
-	/**
-	 * Adds a getOMClass() signature for abstract tables that do not have inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_NoInheritance_Abstract(&$script)
-	{
-		$script .= "
-	/**
-	 * The class that the Peer will make instances of.
-	 *
-	 * This method must be overridden by the stub subclass, because
-	 * ".$this->getObjectClassname()." is declared abstract in the schema.
-	 */
-	abstract public static function getOMClass(\$withPrefix = true);
-";
-	}
-
-	/**
-	 * Adds the doInsert() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoInsert(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method perform an INSERT on the database, given a ".$this->getObjectClassname()." or Criteria object.
-	 *
-	 * @param      mixed \$values Criteria or ".$this->getObjectClassname()." object containing data that is used to create the INSERT statement.
-	 * @param      PropelPDO \$con the PropelPDO connection to use
-	 * @return     mixed The new primary key.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doInsert(\$values, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		if (\$values instanceof Criteria) {
-			\$criteria = clone \$values; // rename for clarity
-		} else {
-			\$criteria = \$values->buildCriteria(); // build Criteria from ".$this->getObjectClassname()." object
-		}
-";
-
-		foreach ($table->getColumns() as $col) {
-			$cfc = $col->getPhpName();
-			if ($col->isPrimaryKey() && $col->isAutoIncrement() && $table->getIdMethod() != "none" && !$table->isAllowPkInsert()) {
-				$script .= "
-		if (\$criteria->containsKey(".$this->getColumnConstant($col).") && \$criteria->keyContainsValue(" . $this->getColumnConstant($col) . ") ) {
-			throw new PropelException('Cannot insert a value for auto-increment primary key ('.".$this->getColumnConstant($col).".')');
-		}
-";
-				if (!$this->getPlatform()->supportsInsertNullPk())
-				{
-				  $script .= "
-		// remove pkey col since this table uses auto-increment and passing a null value for it is not valid 
-		\$criteria->remove(".$this->getColumnConstant($col).");
-";
-				}
-			} elseif ($col->isPrimaryKey() && $col->isAutoIncrement() && $table->getIdMethod() != "none" && $table->isAllowPkInsert() && !$this->getPlatform()->supportsInsertNullPk()) {
-				  $script .= "
-		// remove pkey col if it is null since this table does not accept that
-		if (\$criteria->containsKey(".$this->getColumnConstant($col).") && !\$criteria->keyContainsValue(" . $this->getColumnConstant($col) . ") ) {
-			\$criteria->remove(".$this->getColumnConstant($col).");
-		}
-";
-			}
-		}
-		$script .= "
-
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		try {
-			// use transaction because \$criteria could contain info
-			// for more than one table (I guess, conceivably)
-			\$con->beginTransaction();
-			\$pk = ".$this->basePeerClassname."::doInsert(\$criteria, \$con);
-			\$con->commit();
-		} catch(PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-
-		return \$pk;
-	}
-";
-	}
-
-	/**
-	 * Adds the doUpdate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoUpdate(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method perform an UPDATE on the database, given a ".$this->getObjectClassname()." or Criteria object.
-	 *
-	 * @param      mixed \$values Criteria or ".$this->getObjectClassname()." object containing data that is used to create the UPDATE statement.
-	 * @param      PropelPDO \$con The connection to use (specify PropelPDO connection object to exert more control over transactions).
-	 * @return     int The number of affected rows (if supported by underlying database driver).
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doUpdate(\$values, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		\$selectCriteria = new Criteria(self::DATABASE_NAME);
-
-		if (\$values instanceof Criteria) {
-			\$criteria = clone \$values; // rename for clarity
-";
-		foreach ($table->getColumns() as $col) {
-			if ($col->isPrimaryKey()) {
-				$script .= "
-			\$comparison = \$criteria->getComparison(".$this->getColumnConstant($col).");
-			\$selectCriteria->add(".$this->getColumnConstant($col).", \$criteria->remove(".$this->getColumnConstant($col)."), \$comparison);
-";
-			}  /* if col is prim key */
-		} /* foreach */
-
-		$script .= "
-		} else { // \$values is ".$this->getObjectClassname()." object
-			\$criteria = \$values->buildCriteria(); // gets full criteria
-			\$selectCriteria = \$values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
-		}
-
-		// set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		return {$this->basePeerClassname}::doUpdate(\$selectCriteria, \$criteria, \$con);
-	}
-";
-	}
-
-	/**
-	 * Adds the doDeleteAll() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoDeleteAll(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method to DELETE all rows from the ".$table->getName()." table.
-	 *
-	 * @return     int The number of affected rows (if supported by underlying database driver).
-	 */
-	public static function doDeleteAll(\$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-		\$affectedRows = 0; // initialize var to track total num of affected rows
-		try {
-			// use transaction because \$criteria could contain info
-			// for more than one table or we could emulating ON DELETE CASCADE, etc.
-			\$con->beginTransaction();
-			";
-		if ($this->isDeleteCascadeEmulationNeeded()) {
-			$script .="\$affectedRows += ".$this->getPeerClassname()."::doOnDeleteCascade(new Criteria(".$this->getPeerClassname()."::DATABASE_NAME), \$con);
-			";
-		}
-		if ($this->isDeleteSetNullEmulationNeeded()) {
-			$script .= $this->getPeerClassname() . "::doOnDeleteSetNull(new Criteria(".$this->getPeerClassname() . "::DATABASE_NAME), \$con);
-			";
-		}
-		$script .= "\$affectedRows += {$this->basePeerClassname}::doDeleteAll(".$this->getPeerClassname()."::TABLE_NAME, \$con);
-			// Because this db requires some delete cascade/set null emulation, we have to
-			// clear the cached instance *after* the emulation has happened (since
-			// instances get re-added by the select statement contained therein).
-			".$this->getPeerClassname()."::clearInstancePool();
-			".$this->getPeerClassname()."::clearRelatedInstancePool();
-			\$con->commit();
-			return \$affectedRows;
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-	}
-";
-	}
-
-	/**
-	 * Adds the doDelete() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoDelete(&$script)
-	{
-		$table = $this->getTable();
-		$emulateCascade = $this->isDeleteCascadeEmulationNeeded() || $this->isDeleteSetNullEmulationNeeded();
-		$script .= "
-	/**
-	 * Method perform a DELETE on the database, given a ".$this->getObjectClassname()." or Criteria object OR a primary key value.
-	 *
-	 * @param      mixed \$values Criteria or ".$this->getObjectClassname()." object or primary key or array of primary keys
-	 *              which is used to create the DELETE statement
-	 * @param      PropelPDO \$con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-	 *				if supported by native driver or if emulated using Propel.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	 public static function doDelete(\$values, PropelPDO \$con = null)
-	 {
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		if (\$values instanceof Criteria) {";
-		if (!$emulateCascade) {
-			$script .= "
-			// invalidate the cache for all objects of this type, since we have no
-			// way of knowing (without running a query) what objects should be invalidated
-			// from the cache based on this Criteria.
-			".$this->getPeerClassname()."::clearInstancePool();";
-		}
-		$script .= "
-			// rename for clarity
-			\$criteria = clone \$values;
-		} elseif (\$values instanceof ".$this->getObjectClassname().") { // it's a model object";
-		if (!$emulateCascade) {
-			$script .= "
-			// invalidate the cache for this single object
-			".$this->getPeerClassname()."::removeInstanceFromPool(\$values);";
-		}
-		if (count($table->getPrimaryKey()) > 0) {
-			$script .= "
-			// create criteria based on pk values
-			\$criteria = \$values->buildPkeyCriteria();";
-		} else {
-			$script .= "
-			// create criteria based on pk value
-			\$criteria = \$values->buildCriteria();";
-		}
-
-		$script .= "
-		} else { // it's a primary key, or an array of pks";
-		$script .= "
-			\$criteria = new Criteria(self::DATABASE_NAME);";
-
-		if (count($table->getPrimaryKey()) === 1) {
-			$pkey = $table->getPrimaryKey();
-			$col = array_shift($pkey);
-			$script .= "
-			\$criteria->add(".$this->getColumnConstant($col).", (array) \$values, Criteria::IN);";
-			if (!$emulateCascade) {
-				$script .= "
-			// invalidate the cache for this object(s)
-			foreach ((array) \$values as \$singleval) {
-				".$this->getPeerClassname()."::removeInstanceFromPool(\$singleval);
-			}";
-			}
-		} else {
-			$script .= "
-			// primary key is composite; we therefore, expect
-			// the primary key passed to be an array of pkey values
-			if (count(\$values) == count(\$values, COUNT_RECURSIVE)) {
-				// array is not multi-dimensional
-				\$values = array(\$values);
-			}
-			foreach (\$values as \$value) {";
-			$i=0;
-			foreach ($table->getPrimaryKey() as $col) {
-				if ($i == 0) {
-					$script .= "
-				\$criterion = \$criteria->getNewCriterion(".$this->getColumnConstant($col).", \$value[$i]);";
-				} else {
-					$script .= "
-				\$criterion->addAnd(\$criteria->getNewCriterion(".$this->getColumnConstant($col).", \$value[$i]));";
-				}
-				$i++;
-			}
-			$script .= "
-				\$criteria->addOr(\$criterion);";
-			if (!$emulateCascade) {
-				$script .= "
-				// we can invalidate the cache for this single PK
-				".$this->getPeerClassname()."::removeInstanceFromPool(\$value);";
-			}
-			$script .= "
-			}";
-		} /* if count(table->getPrimaryKeys()) */
-
-		$script .= "
-		}
-
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		\$affectedRows = 0; // initialize var to track total num of affected rows
-
-		try {
-			// use transaction because \$criteria could contain info
-			// for more than one table or we could emulating ON DELETE CASCADE, etc.
-			\$con->beginTransaction();
-			";
-
-		if ($this->isDeleteCascadeEmulationNeeded()) {
-			$script .= "\$affectedRows += ".$this->getPeerClassname()."::doOnDeleteCascade(\$criteria, \$con);
-			";
-		}
-		if ($this->isDeleteSetNullEmulationNeeded()) {
-			$script .= $this->getPeerClassname() . "::doOnDeleteSetNull(\$criteria, \$con);
-			";
-		}
-
-		if ($emulateCascade) {
-			$script .= "
-			// Because this db requires some delete cascade/set null emulation, we have to
-			// clear the cached instance *after* the emulation has happened (since
-			// instances get re-added by the select statement contained therein).
-			if (\$values instanceof Criteria) {
-				".$this->getPeerClassname()."::clearInstancePool();
-			} elseif (\$values instanceof ".$this->getObjectClassname().") { // it's a model object
-				".$this->getPeerClassname()."::removeInstanceFromPool(\$values);
-			} else { // it's a primary key, or an array of pks
-				foreach ((array) \$values as \$singleval) {
-					".$this->getPeerClassname()."::removeInstanceFromPool(\$singleval);
-				}
-			}
-			";
-		}
-
-		$script .= "
-			\$affectedRows += {$this->basePeerClassname}::doDelete(\$criteria, \$con);
-			".$this->getPeerClassname()."::clearRelatedInstancePool();
-			\$con->commit();
-			return \$affectedRows;
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-	}
-";
-	}
-
-	/**
-	 * Adds the doOnDeleteCascade() method, which provides ON DELETE CASCADE emulation.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoOnDeleteCascade(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * This is a method for emulating ON DELETE CASCADE for DBs that don't support this
-	 * feature (like MySQL or SQLite).
-	 *
-	 * This method is not very speedy because it must perform a query first to get
-	 * the implicated records and then perform the deletes by calling those Peer classes.
-	 *
-	 * This method should be used within a transaction if possible.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      PropelPDO \$con
-	 * @return     int The number of affected rows (if supported by underlying database driver).
-	 */
-	protected static function doOnDeleteCascade(Criteria \$criteria, PropelPDO \$con)
-	{
-		// initialize var to track total num of affected rows
-		\$affectedRows = 0;
-
-		// first find the objects that are implicated by the \$criteria
-		\$objects = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-		foreach (\$objects as \$obj) {
-";
-
-		foreach ($table->getReferrers() as $fk) {
-
-			// $fk is the foreign key in the other table, so localTableName will
-			// actually be the table name of other table
-			$tblFK = $fk->getTable();
-
-			$joinedTablePeerBuilder = $this->getNewPeerBuilder($tblFK);
-			$tblFKPackage = $joinedTablePeerBuilder->getStubPeerBuilder()->getPackage();
-
-			if (!$tblFK->isForReferenceOnly()) {
-				// we can't perform operations on tables that are
-				// not within the schema (i.e. that we have no map for, etc.)
-
-				$fkClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-				// i'm not sure whether we can allow delete cascade for foreign keys
-				// within the same table?  perhaps we can?
-				if ( $fk->getOnDelete() == ForeignKey::CASCADE && $tblFK->getName() != $table->getName()) {
-
-					// backwards on purpose
-					$columnNamesF = $fk->getLocalColumns();
-					$columnNamesL = $fk->getForeignColumns();
-
-					$script .= "
-
-			// delete related $fkClassName objects
-			\$criteria = new Criteria(".$joinedTablePeerBuilder->getPeerClassname()."::DATABASE_NAME);
-			";
-					for ($x=0,$xlen=count($columnNamesF); $x < $xlen; $x++) {
-						$columnFK = $tblFK->getColumn($columnNamesF[$x]);
-						$columnL = $table->getColumn($columnNamesL[$x]);
-
-						$script .= "
-			\$criteria->add(".$joinedTablePeerBuilder->getColumnConstant($columnFK) .", \$obj->get".$columnL->getPhpName()."());";
-					}
-
-					$script .= "
-			\$affectedRows += ".$joinedTablePeerBuilder->getPeerClassname()."::doDelete(\$criteria, \$con);";
-
-				} // if cascade && fkey table name != curr table name
-
-			} // if not for ref only
-		} // foreach foreign keys
-		$script .= "
-		}
-		return \$affectedRows;
-	}
-";
-	} // end addDoOnDeleteCascade
-
-	/**
-	 * Adds the doOnDeleteSetNull() method, which provides ON DELETE SET NULL emulation.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoOnDeleteSetNull(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * This is a method for emulating ON DELETE SET NULL DBs that don't support this
-	 * feature (like MySQL or SQLite).
-	 *
-	 * This method is not very speedy because it must perform a query first to get
-	 * the implicated records and then perform the deletes by calling those Peer classes.
-	 *
-	 * This method should be used within a transaction if possible.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      PropelPDO \$con
-	 * @return     void
-	 */
-	protected static function doOnDeleteSetNull(Criteria \$criteria, PropelPDO \$con)
-	{
-
-		// first find the objects that are implicated by the \$criteria
-		\$objects = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-		foreach (\$objects as \$obj) {
-";
-
-		// This logic is almost exactly the same as that in doOnDeleteCascade()
-		// it may make sense to refactor this, provided that thigns don't
-		// get too complicated.
-
-		foreach ($table->getReferrers() as $fk) {
-
-			// $fk is the foreign key in the other table, so localTableName will
-			// actually be the table name of other table
-			$tblFK = $fk->getTable();
-			$refTablePeerBuilder = $this->getNewPeerBuilder($tblFK);
-
-			if (!$tblFK->isForReferenceOnly()) {
-				// we can't perform operations on tables that are
-				// not within the schema (i.e. that we have no map for, etc.)
-
-				$fkClassName = $refTablePeerBuilder->getObjectClassname();
-
-				// i'm not sure whether we can allow delete setnull for foreign keys
-				// within the same table?  perhaps we can?
-				if ( $fk->getOnDelete() == ForeignKey::SETNULL &&
-				$fk->getTable()->getName() != $table->getName()) {
-
-					// backwards on purpose
-					$columnNamesF = $fk->getLocalColumns();
-					$columnNamesL = $fk->getForeignColumns(); // should be same num as foreign
-					$script .= "
-			// set fkey col in related $fkClassName rows to NULL
-			\$selectCriteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-			\$updateValues = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);";
-
-					for ($x=0,$xlen=count($columnNamesF); $x < $xlen; $x++) {
-						$columnFK = $tblFK->getColumn($columnNamesF[$x]);
-						$columnL = $table->getColumn($columnNamesL[$x]);
-						$script .= "
-			\$selectCriteria->add(".$refTablePeerBuilder->getColumnConstant($columnFK).", \$obj->get".$columnL->getPhpName()."());
-			\$updateValues->add(".$refTablePeerBuilder->getColumnConstant($columnFK).", null);
-";
-					}
-
-					$script .= "
-					{$this->basePeerClassname}::doUpdate(\$selectCriteria, \$updateValues, \$con); // use BasePeer because generated Peer doUpdate() methods only update using pkey
-";
-				} // if setnull && fkey table name != curr table name
-			} // if not for ref only
-		} // foreach foreign keys
-
-		$script .= "
-		}
-	}
-";
-	}
-
-	/**
-	 * Adds the doValidate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoValidate(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Validates all modified columns of given ".$this->getObjectClassname()." object.
-	 * If parameter \$columns is either a single column name or an array of column names
-	 * than only those columns are validated.
-	 *
-	 * NOTICE: This does not apply to primary or foreign keys for now.
-	 *
-	 * @param      ".$this->getObjectClassname()." \$obj The object to validate.
-	 * @param      mixed \$cols Column name or array of column names.
-	 *
-	 * @return     mixed TRUE if all columns are valid or the error message of the first invalid column.
-	 */
-	public static function doValidate(".$this->getObjectClassname()." \$obj, \$cols = null)
-	{
-		\$columns = array();
-
-		if (\$cols) {
-			\$dbMap = Propel::getDatabaseMap(".$this->getPeerClassname()."::DATABASE_NAME);
-			\$tableMap = \$dbMap->getTable(".$this->getPeerClassname()."::TABLE_NAME);
-
-			if (! is_array(\$cols)) {
-				\$cols = array(\$cols);
-			}
-
-			foreach (\$cols as \$colName) {
-				if (\$tableMap->containsColumn(\$colName)) {
-					\$get = 'get' . \$tableMap->getColumn(\$colName)->getPhpName();
-					\$columns[\$colName] = \$obj->\$get();
-				}
-			}
-		} else {
-";
-		foreach ($table->getValidators() as $val) {
-			$col = $val->getColumn();
-			if (!$col->isAutoIncrement()) {
-				$script .= "
-		if (\$obj->isNew() || \$obj->isColumnModified(".$this->getColumnConstant($col)."))
-			\$columns[".$this->getColumnConstant($col)."] = \$obj->get".$col->getPhpName()."();
-";
-			} // if
-		} // foreach
-
-		$script .= "
-		}
-
-		return {$this->basePeerClassname}::doValidate(".$this->getPeerClassname()."::DATABASE_NAME, ".$this->getPeerClassname()."::TABLE_NAME, \$columns);
-	}
-";
-	} // end addDoValidate()
-
-	/**
-	 * Adds the retrieveByPK method for tables with single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPK_SinglePK(&$script)
-	{
-		$table = $this->getTable();
-		$pks = $table->getPrimaryKey();
-		$col = $pks[0];
-
-		$script .= "
-	/**
-	 * Retrieve a single object by pkey.
-	 *
-	 * @param      ".$col->getPhpType()." \$pk the primary key.
-	 * @param      PropelPDO \$con the connection to use
-	 * @return     " .$this->getObjectClassname(). "
-	 */
-	public static function ".$this->getRetrieveMethodName()."(\$pk, PropelPDO \$con = null)
-	{
-
-		if (null !== (\$obj = ".$this->getPeerClassname()."::getInstanceFromPool(".$this->getInstancePoolKeySnippet('$pk')."))) {
-			return \$obj;
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-		\$criteria->add(".$this->getColumnConstant($col).", \$pk);
-
-		\$v = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-
-		return !empty(\$v) > 0 ? \$v[0] : null;
-	}
-";
-	}
-
-	/**
-	 * Adds the retrieveByPKs method for tables with single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPKs_SinglePK(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Retrieve multiple objects by pkey.
-	 *
-	 * @param      array \$pks List of primary keys
-	 * @param      PropelPDO \$con the connection to use
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function ".$this->getRetrieveMethodName()."s(\$pks, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		\$objs = null;
-		if (empty(\$pks)) {
-			\$objs = array();
-		} else {
-			\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);";
-		$k1 = $table->getPrimaryKey();
-		$script .= "
-			\$criteria->add(".$this->getColumnConstant($k1[0]).", \$pks, Criteria::IN);";
-		$script .= "
-			\$objs = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-		}
-		return \$objs;
-	}
-";
-	}
-
-	/**
-	 * Adds the retrieveByPK method for tables with multi-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPK_MultiPK(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Retrieve object using using composite pkey values.";
-		foreach ($table->getPrimaryKey() as $col) {
-			$clo = strtolower($col->getName());
-			$cptype = $col->getPhpType();
-			$script .= "
-	 * @param      $cptype $".$clo;
-		}
-		$script .= "
-	 * @param      PropelPDO \$con
-	 * @return     ".$this->getObjectClassname()."
-	 */
-	public static function ".$this->getRetrieveMethodName()."(";
-
-		$php = array();
-		foreach ($table->getPrimaryKey() as $col) {
-			$clo = strtolower($col->getName());
-			$php[] = '$' . $clo;
-		} /* foreach */
-
-		$script .= implode(', ', $php);
-
-		$script .= ", PropelPDO \$con = null) {
-		\$key = ".$this->getInstancePoolKeySnippet($php).";";
- 		$script .= "
- 		if (null !== (\$obj = ".$this->getPeerClassname()."::getInstanceFromPool(\$key))) {
- 			return \$obj;
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);";
-		foreach ($table->getPrimaryKey() as $col) {
-			$clo = strtolower($col->getName());
-			$script .= "
-		\$criteria->add(".$this->getColumnConstant($col).", $".$clo.");";
-		}
-		$script .= "
-		\$v = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-
-		return !empty(\$v) ? \$v[0] : null;
-	}";
-	}
-
-	/**
-	 * Adds the getTableMap() method which is a convenience method for apps to get DB metadata.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetTableMap(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns the TableMap related to this peer.
-	 * This method is not needed for general use but a specific application could have a need.
-	 * @return     TableMap
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function getTableMap()
-	{
-		return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);
-	}
-";
-	}
-
-	/**
-	 * Adds the complex OM methods to the base addSelectMethods() function.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        PeerBuilder::addSelectMethods()
-	 */
-	protected function addSelectMethods(&$script)
-	{
-		$table = $this->getTable();
-
-		parent::addSelectMethods($script);
-
-		$this->addDoCountJoin($script);
-		$this->addDoSelectJoin($script);
-
-		$countFK = count($table->getForeignKeys());
-
-		$includeJoinAll = true;
-
-		foreach ($this->getTable()->getForeignKeys() as $fk) {
-			$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-			if ($tblFK->isForReferenceOnly()) {
-				$includeJoinAll = false;
-			}
-		}
-
-		if ($includeJoinAll) {
-			if ($countFK > 0) {
-				$this->addDoCountJoinAll($script);
-				$this->addDoSelectJoinAll($script);
-			}
-			if ($countFK > 1) {
-				$this->addDoCountJoinAllExcept($script);
-				$this->addDoSelectJoinAllExcept($script);
-			}
-		}
-
-	}
-
-	/**
-	 * Get the column offsets of the primary key(s) for specified table.
-	 *
-	 * @param      Table $tbl
-	 * @return     array int[] The column offsets of the primary key(s).
-	 */
-	protected function getPrimaryKeyColOffsets(Table $tbl)
-	{
-		$offsets = array();
-		$idx = 0;
-		foreach ($tbl->getColumns() as $col) {
-			if ($col->isPrimaryKey()) {
-				$offsets[] = $idx;
-			}
-			$idx++;
-		}
-		return $offsets;
-	}
-
-  public function addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder)
-  {
-    $script = '';
-		$lfMap = $fk->getLocalForeignMapping();
-		$lftCols = $fk->getLocalColumns();
-		if (count($lftCols) == 1)
-		{
-		  // simple foreign key
-		  $lftCol = $lftCols[0];
-		  $script .= sprintf("
-		\$criteria->addJoin(%s, %s, \$join_behavior);\n",
-        $this->getColumnConstant($table->getColumn($lftCol) ),
-        $joinedTablePeerBuilder->getColumnConstant($joinTable->getColumn( $lfMap[$lftCol] ) ));
-		}
-		else
-		{
-		  // composite foreign key
-		  $script .= "
-		\$criteria->addMultipleJoin(array(\n";
-		  foreach ($lftCols as $columnName ) {
-		    $script .= sprintf("        array(%s, %s),\n", 
-				  $this->getColumnConstant($table->getColumn($columnName) ),
-				  $joinedTablePeerBuilder->getColumnConstant($joinTable->getColumn( $lfMap[$columnName] ) )
-				);
-			}
-			$script .= "      ), \$join_behavior);\n";
-		}
-		return $script;
-  }
-  
-	/**
-	 * Adds the doSelectJoin*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectJoin(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$countFK = count($table->getForeignKeys());
-		$join_behavior = $this->getJoinBehavior();
-
-		if ($countFK >= 1) {
-
-			foreach ($table->getForeignKeys() as $fk) {
-
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-				if (!$joinTable->isForReferenceOnly()) {
-
-					// This condition is necessary because Propel lacks a system for
-					// aliasing the table if it is the same table.
-					if ( $fk->getForeignTableName() != $table->getName() ) {
-
-						$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-						$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-						$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-						$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-
-						$script .= "
-
-	/**
-	 * Selects a collection of $className objects pre-filled with their $joinClassName objects.
-	 * @param      Criteria  \$criteria
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     array Array of $className objects.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$con = null, \$join_behavior = $join_behavior)
-	{
-		\$criteria = clone \$criteria;
-
-		// Set the correct dbName if it has not been overridden
-		if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-			\$criteria->setDbName(self::DATABASE_NAME);
-		}
-
-		".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol = (".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-		".$joinedTablePeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-";
-
-            $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-        		
-            // apply behaviors
-            $this->applyBehaviorModifier('preSelect', $script);
-						
-            $script .= "
-		\$stmt = ".$this->basePeerClassname."::doSelect(\$criteria, \$con);
-		\$results = array();
-
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key1 = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj1 = ".$this->getPeerClassname()."::getInstanceFromPool(\$key1))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj1->hydrate(\$row, 0, true); // rehydrate
-			} else {
-";
-						if ($table->getChildrenColumn()) {
-							$script .= "
-				\$omClass = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-						} else {
-							$script .= "
-				\$cls = ".$this->getPeerClassname()."::getOMClass(false);
-";
-						}
-						$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj1', '$cls') . "
-				\$obj1->hydrate(\$row);
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj1, \$key1);
-			} // if \$obj1 already loaded
-
-			\$key2 = ".$joinedTablePeerBuilder->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, \$startcol);
-			if (\$key2 !== null) {
-				\$obj2 = ".$joinedTablePeerBuilder->getPeerClassname()."::getInstanceFromPool(\$key2);
-				if (!\$obj2) {
-";
-						if ($joinTable->getChildrenColumn()) {
-							$script .= "
-					\$omClass = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(\$row, \$startcol);
-					\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-						} else {
-							$script .= "
-					\$cls = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(false);
-";
-						}
-
-						$script .= "
-					" . $this->buildObjectInstanceCreationCode('$obj2', '$cls') . "
-					\$obj2->hydrate(\$row, \$startcol);
-					".$joinedTablePeerBuilder->getPeerClassname()."::addInstanceToPool(\$obj2, \$key2);
-				} // if obj2 already loaded
-				
-				// Add the \$obj1 (".$this->getObjectClassname().") to \$obj2 (".$joinedTablePeerBuilder->getObjectClassname().")";
-					if ($fk->isLocalPrimaryKey()) {
-						$script .= "
-				// one to one relationship
-				\$obj1->set" . $joinedTablePeerBuilder->getObjectClassname() . "(\$obj2);";
-					} else {
-					$script .= "
-				\$obj2->add" . $joinedTableObjectBuilder->getRefFKPhpNameAffix($fk, $plural = false)."(\$obj1);";
-					}
-					$script .= "
-
-			} // if joined row was not null
-
-			\$results[] = \$obj1;
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}
-";
-					} // if fk table name != this table name
-				} // if ! is reference only
-			} // foreach column
-		} // if count(fk) > 1
-
-	} // addDoSelectJoin()
-
-	/**
-	 * Adds the doCountJoin*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCountJoin(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$countFK = count($table->getForeignKeys());
-		$join_behavior = $this->getJoinBehavior();
-
-		if ($countFK >= 1) {
-
-			foreach ($table->getForeignKeys() as $fk) {
-
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-				if (!$joinTable->isForReferenceOnly()) {
-
-					if ( $fk->getForeignTableName() != $table->getName() ) {
-
-						$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-						$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-						$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-						$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-
-						$script .= "
-
-	/**
-	 * Returns the number of rows matching criteria, joining the related ".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)." table
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCountJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null, \$join_behavior = $join_behavior)
-	{
-		// we're going to modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-		
-		\$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-		
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-";
-            $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-         		
-            // apply behaviors
-            $this->applyBehaviorModifier('preSelect', $script);
-            
-            $script .= "
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}
-";
-					} // if fk table name != this table name
-				} // if ! is reference only
-			} // foreach column
-		} // if count(fk) > 1
-
-	} // addDoCountJoin()
-
-	/**
-	 * Adds the doSelectJoinAll() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectJoinAll(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$join_behavior = $this->getJoinBehavior();
-
-		$script .= "
-
-	/**
-	 * Selects a collection of $className objects pre-filled with all related objects.
-	 *
-	 * @param      Criteria  \$criteria
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     array Array of $className objects.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectJoinAll(Criteria \$criteria, \$con = null, \$join_behavior = $join_behavior)
-	{
-		\$criteria = clone \$criteria;
-
-		// Set the correct dbName if it has not been overridden
-		if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-			\$criteria->setDbName(self::DATABASE_NAME);
-		}
-
-		".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol2 = (".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-		$index = 2;
-		foreach ($table->getForeignKeys() as $fk) {
-
-			// Want to cover this case, but the code is not there yet.
-			// Propel lacks a system for aliasing tables of the same name.
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-				$new_index = $index + 1;
-
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-				$joinClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-				$script .= "
-		".$joinedTablePeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol$new_index = \$startcol$index + (".$joinedTablePeerBuilder->getPeerClassname()."::NUM_COLUMNS - ".$joinedTablePeerBuilder->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-				$index = $new_index;
-
-			} // if fk->getForeignTableName != table->getName
-		} // foreach [sub] foreign keys
-
-		foreach ($table->getForeignKeys() as $fk) {
-			// want to cover this case, but the code is not there yet.
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-        $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-			}
-		}
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('preSelect', $script);
-		
-    $script .= "
-		\$stmt = ".$this->basePeerClassname."::doSelect(\$criteria, \$con);
-		\$results = array();
-
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key1 = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj1 = ".$this->getPeerClassname()."::getInstanceFromPool(\$key1))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj1->hydrate(\$row, 0, true); // rehydrate
-			} else {";
-
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				\$omClass = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-        \$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-		} else {
-			$script .= "
-				\$cls = ".$this->getPeerClassname()."::getOMClass(false);
-";
-		}
-
-		$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj1', '$cls') . "
-				\$obj1->hydrate(\$row);
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj1, \$key1);
-			} // if obj1 already loaded
-";
-
-		$index = 1;
-		foreach ($table->getForeignKeys() as $fk ) {
-			// want to cover this case, but the code is not there yet.
-			// Why not? -because we'd have to alias the tables in the JOIN
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-				$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-				$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-
-				$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-				$interfaceName = $joinClassName;
-
-				if ($joinTable->getInterface()) {
-					$interfaceName = $this->prefixClassname($joinTable->getInterface());
-				}
-
-				$index++;
-
-				$script .= "
-			// Add objects for joined $joinClassName rows
-
-			\$key$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, \$startcol$index);
-			if (\$key$index !== null) {
-				\$obj$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getInstanceFromPool(\$key$index);
-				if (!\$obj$index) {
-";
-				if ($joinTable->getChildrenColumn()) {
-					$script .= "
-					\$omClass = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(\$row, \$startcol$index);
-          \$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-				} else {
-					$script .= "
-					\$cls = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(false);
-";
-				} /* $joinTable->getChildrenColumn() */
-
-				$script .= "
-					" . $this->buildObjectInstanceCreationCode('$obj' . $index, '$cls') . "
-					\$obj".$index."->hydrate(\$row, \$startcol$index);
-					".$joinedTablePeerBuilder->getPeerClassname()."::addInstanceToPool(\$obj$index, \$key$index);
-				} // if obj$index loaded
-
-				// Add the \$obj1 (".$this->getObjectClassname().") to the collection in \$obj".$index." (".$joinedTablePeerBuilder->getObjectClassname().")";
-				if ($fk->isLocalPrimaryKey()) {
-					$script .= "
-				\$obj1->set".$joinedTablePeerBuilder->getObjectClassname()."(\$obj".$index.");";
-				} else {
-					$script .= "
-				\$obj".$index."->add".$joinedTableObjectBuilder->getRefFKPhpNameAffix($fk, $plural = false)."(\$obj1);";
-				}
-				$script .= "
-			} // if joined row not null
-";
-
-			} // $fk->getForeignTableName() != $table->getName()
-		} //foreach foreign key
-
-		$script .= "
-			\$results[] = \$obj1;
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}
-";
-
-	} // end addDoSelectJoinAll()
-
-
-	/**
-	 * Adds the doCountJoinAll() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCountJoinAll(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$join_behavior = $this->getJoinBehavior();
-
-		$script .= "
-
-	/**
-	 * Returns the number of rows matching criteria, joining all related tables
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCountJoinAll(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null, \$join_behavior = $join_behavior)
-	{
-		// we're going to modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-		
-		\$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-		
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-";
-
-		foreach ($table->getForeignKeys() as $fk) {
-			// want to cover this case, but the code is not there yet.
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-        $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-			} // if fk->getForeignTableName != table->getName
-		} // foreach [sub] foreign keys
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('preSelect', $script);
-		
-    $script .= "
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}";
-	} // end addDoCountJoinAll()
-
-	/**
-	 * Adds the doSelectJoinAllExcept*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectJoinAllExcept(&$script)
-	{
-		$table = $this->getTable();
-		$join_behavior = $this->getJoinBehavior();
-
-		// ------------------------------------------------------------------------
-		// doSelectJoinAllExcept*()
-		// ------------------------------------------------------------------------
-
-		// 2) create a bunch of doSelectJoinAllExcept*() methods
-		// -- these were existing in original Torque, so we should keep them for compatibility
-
-		$fkeys = $table->getForeignKeys();  // this sep assignment is necessary otherwise sub-loops over
-		// getForeignKeys() will cause this to only execute one time.
-		foreach ($fkeys as $fk ) {
-
-			$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$excludedTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-			$excludedTableObjectBuilder = $this->getNewObjectBuilder($excludedTable);
-			$excludedTablePeerBuilder = $this->getNewPeerBuilder($excludedTable);
-
-			$excludedClassName = $excludedTableObjectBuilder->getObjectClassname();
-
-
-			$script .= "
-
-	/**
-	 * Selects a collection of ".$this->getObjectClassname()." objects pre-filled with all related objects except ".$thisTableObjectBuilder->getFKPhpNameAffix($fk).".
-	 *
-	 * @param      Criteria  \$criteria
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     array Array of ".$this->getObjectClassname()." objects.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$con = null, \$join_behavior = $join_behavior)
-	{
-		\$criteria = clone \$criteria;
-
-		// Set the correct dbName if it has not been overridden
-		// \$criteria->getDbName() will return the same object if not set to another value
-		// so == check is okay and faster
-		if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-			\$criteria->setDbName(self::DATABASE_NAME);
-		}
-
-		".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol2 = (".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-			$index = 2;
-			foreach ($table->getForeignKeys() as $subfk) {
-				// want to cover this case, but the code is not there yet.
-				// Why not? - because we would have to alias the tables in the join
-				if ( !($subfk->getForeignTableName() == $table->getName())) {
-					$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-					$joinTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-					$joinClassName = $joinTablePeerBuilder->getObjectClassname();
-
-					if ($joinClassName != $excludedClassName) {
-						$new_index = $index + 1;
-						$script .= "
-		".$joinTablePeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol$new_index = \$startcol$index + (".$joinTablePeerBuilder->getPeerClassname()."::NUM_COLUMNS - ".$joinTablePeerBuilder->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-						$index = $new_index;
-					} // if joinClassName not excludeClassName
-				} // if subfk is not curr table
-			} // foreach [sub] foreign keys
-
-			foreach ($table->getForeignKeys() as $subfk) {
-				// want to cover this case, but the code is not there yet.
-				if ( $subfk->getForeignTableName() != $table->getName() ) {
-					$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-					$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-					$joinClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-					if ($joinClassName != $excludedClassName)
-					{
-            $script .= $this->addCriteriaJoin($subfk, $table, $joinTable, $joinedTablePeerBuilder);
-					}
-				}
-			} // foreach fkeys
-			
-			// apply behaviors
-      $this->applyBehaviorModifier('preSelect', $script);
-			
-      $script .= "
-
-		\$stmt = ".$this->basePeerClassname ."::doSelect(\$criteria, \$con);
-		\$results = array();
-
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key1 = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj1 = ".$this->getPeerClassname()."::getInstanceFromPool(\$key1))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj1->hydrate(\$row, 0, true); // rehydrate
-			} else {";
-			if ($table->getChildrenColumn()) {
-				$script .= "
-				\$omClass = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-			} else {
-				$script .= "
-				\$cls = ".$this->getPeerClassname()."::getOMClass(false);
-";
-			}
-
-			$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj1', '$cls') . "
-				\$obj1->hydrate(\$row);
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj1, \$key1);
-			} // if obj1 already loaded
-";
-
-			$index = 1;
-			foreach ($table->getForeignKeys() as $subfk ) {
-		  // want to cover this case, but the code is not there yet.
-		  if ( $subfk->getForeignTableName() != $table->getName() ) {
-
-		  	$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-
-		  	$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-		  	$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-		  	$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-
-		  	$interfaceName = $joinClassName;
-		  	if ($joinTable->getInterface()) {
-		  		$interfaceName = $this->prefixClassname($joinTable->getInterface());
-		  	}
-
-		  	if ($joinClassName != $excludedClassName) {
-
-		  		$index++;
-
-		  		$script .= "
-				// Add objects for joined $joinClassName rows
-
-				\$key$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, \$startcol$index);
-				if (\$key$index !== null) {
-					\$obj$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getInstanceFromPool(\$key$index);
-					if (!\$obj$index) {
-	";
-
-		  		if ($joinTable->getChildrenColumn()) {
-		  			$script .= "
-						\$omClass = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(\$row, \$startcol$index);
-            \$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-		  		} else {
-		  			$script .= "
-						\$cls = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(false);
-";
-		  		} /* $joinTable->getChildrenColumn() */
-		  		$script .= "
-					" . $this->buildObjectInstanceCreationCode('$obj' . $index, '$cls') . "
-					\$obj".$index."->hydrate(\$row, \$startcol$index);
-					".$joinedTablePeerBuilder->getPeerClassname()."::addInstanceToPool(\$obj$index, \$key$index);
-				} // if \$obj$index already loaded
-
-				// Add the \$obj1 (".$this->getObjectClassname().") to the collection in \$obj".$index." (".$joinedTablePeerBuilder->getObjectClassname().")";
-				if ($subfk->isLocalPrimaryKey()) {
-					$script .= "
-				\$obj1->set".$joinedTablePeerBuilder->getObjectClassname()."(\$obj".$index.");";
-				} else {
-					$script .= "
-				\$obj".$index."->add".$joinedTableObjectBuilder->getRefFKPhpNameAffix($subfk, $plural = false)."(\$obj1);";
-				}
-				$script .= "
-
-			} // if joined row is not null
-";
-					} // if ($joinClassName != $excludedClassName) {
-		  } // $subfk->getForeignTableName() != $table->getName()
-			} // foreach
-			$script .= "
-			\$results[] = \$obj1;
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}
-";
-		} // foreach fk
-
-	} // addDoSelectJoinAllExcept
-
-	/**
-	 * Adds the doCountJoinAllExcept*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCountJoinAllExcept(&$script)
-	{
-		$table = $this->getTable();
-		$join_behavior = $this->getJoinBehavior();
-
-		$fkeys = $table->getForeignKeys();  // this sep assignment is necessary otherwise sub-loops over
-		// getForeignKeys() will cause this to only execute one time.
-		foreach ($fkeys as $fk ) {
-
-			$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$excludedTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-			$excludedTableObjectBuilder = $this->getNewObjectBuilder($excludedTable);
-			$excludedTablePeerBuilder = $this->getNewPeerBuilder($excludedTable);
-
-			$excludedClassName = $excludedTableObjectBuilder->getObjectClassname();
-
-			$script .= "
-
-	/**
-	 * Returns the number of rows matching criteria, joining the related ".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)." table
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCountJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null, \$join_behavior = $join_behavior)
-	{
-		// we're going to modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-		
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-		
-		\$criteria->clearOrderByColumns(); // ORDER BY should not affect count
-		
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-	";
-
-			foreach ($table->getForeignKeys() as $subfk) {
-				// want to cover this case, but the code is not there yet.
-				if ( $subfk->getForeignTableName() != $table->getName() ) {
-					$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-					$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-					$joinClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-					if ($joinClassName != $excludedClassName)
-					{
-            $script .= $this->addCriteriaJoin($subfk, $table, $joinTable, $joinedTablePeerBuilder);
-					}
-				}
-			} // foreach fkeys
-			
-			// apply behaviors
-      $this->applyBehaviorModifier('preSelect', $script);
-			
-      $script .= "
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}
-";
-		} // foreach fk
-
-	} // addDoCountJoinAllExcept
-
-	/**
-	 * returns the desired join behavior as set in the build properties
-	 * see trac ticket #588, #491
-	 *
-	 */
-	protected function getJoinBehavior()
-	{
-		return $this->getGeneratorConfig()->getBuildProperty('useLeftJoinsInDoJoinMethods') ? 'Criteria::LEFT_JOIN' : 'Criteria::INNER_JOIN';
-	}
-
-} // PHP5PeerBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php
deleted file mode 100644
index a31d099..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5MapBuilderBuilder.php 1159 2009-09-22 15:24:20Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * Generates the PHP5 table map class for user object model (OM).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5TableMapBuilder extends OMBuilder {
-
-	/**
-	 * Gets the package for the map builder classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . '.map';
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getTable()->getPhpName() . 'TableMap';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-
-/**
- * This class defines the structure of the '".$table->getName()."' table.
- *
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends TableMap {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the map builder class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$this->addConstants($script);
-		$this->addAttributes($script);
-		$this->addInitialize($script);
-		$this->addBuildRelations($script);
-		$this->addGetBehaviors($script);
-	}
-
-	/**
-	 * Adds any constants needed for this TableMap class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addConstants(&$script)
-	{
-		$script .= "
-	/**
-	 * The (dot-path) name of this class
-	 */
-	const CLASS_NAME = '".$this->getClasspath()."';
-";
-	}
-
-	/**
-	 * Adds any attributes needed for this TableMap class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->applyBehaviorModifier('tableMapFilter', $script, "");
-	}
-
-	/**
-	 * Adds the addInitialize() method to the  table map class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addInitialize(&$script)
-	{
-
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$ddlBuilder = $this->getDDLBuilder();
-
-		$script .= "
-	/**
-	 * Initialize the table attributes, columns and validators
-	 * Relations are not initialized by this method since they are lazy loaded
-	 *
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function initialize()
-	{
-	  // attributes
-		\$this->setName('".$table->getName()."');
-		\$this->setPhpName('".$table->getPhpName()."');
-		\$this->setClassname('" . $this->getObjectClassname() . "');
-		\$this->setPackage('" . parent::getPackage() . "');";
-		if ($table->getIdMethod() == "native") {
-			$script .= "
-		\$this->setUseIdGenerator(true);";
-		} else {
-			$script .= "
-		\$this->setUseIdGenerator(false);";
-		}
-
-		if ($table->getIdMethodParameters()) {
-			$params = $table->getIdMethodParameters();
-			$imp = $params[0];
-			$script .= "
-		\$this->setPrimaryKeyMethodInfo('".$imp->getValue()."');";
-		} elseif ($table->getIdMethod() == IDMethod::NATIVE && ($platform->getNativeIdMethod() == Platform::SEQUENCE || $platform->getNativeIdMethod() == Platform::SERIAL)) {
-			$script .= "
-		\$this->setPrimaryKeyMethodInfo('".$this->prefixTablename($ddlBuilder->getSequenceName())."');";
-		}
-
-		// Add columns to map
-			$script .= "
-		// columns";
-		foreach ($table->getColumns() as $col) {
-			$cup=strtoupper($col->getName());
-		  $cfc=$col->getPhpName();
-			if (!$col->getSize()) {
-				$size = "null";
-			} else {
-				$size = $col->getSize();
-			}
-			$default = $col->getDefaultValueString();
-			if ($col->isPrimaryKey()) {
-				if ($col->isForeignKey()) {
-					foreach ($col->getForeignKeys() as $fk) {
-						$script .= "
-		\$this->addForeignPrimaryKey('$cup', '$cfc', '".$col->getType()."' , '".$fk->getForeignTableName()."', '".strtoupper($fk->getMappedForeignColumn($col->getName()))."', ".($col->isNotNull() ? 'true' : 'false').", ".$size.", $default);";
-					}
-				} else {
-					$script .= "
-		\$this->addPrimaryKey('$cup', '$cfc', '".$col->getType()."', ".var_export($col->isNotNull(), true).", ".$size.", $default);";
-				}
-			} else {
-				if ($col->isForeignKey()) {
-					foreach ($col->getForeignKeys() as $fk) {
-						$script .= "
-		\$this->addForeignKey('$cup', '$cfc', '".$col->getType()."', '".$fk->getForeignTableName()."', '".strtoupper($fk->getMappedForeignColumn($col->getName()))."', ".($col->isNotNull() ? 'true' : 'false').", ".$size.", $default);";
-					}
-			} else {
-					$script .= "
-		\$this->addColumn('$cup', '$cfc', '".$col->getType()."', ".var_export($col->isNotNull(), true).", ".$size.", $default);";
-				}
-			} // if col-is prim key
-		} // foreach
-
-		// validators
-    $script .= "
-		// validators";
-		foreach ($table->getValidators() as $val) {
-			$col = $val->getColumn();
-			$cup = strtoupper($col->getName());
-			foreach ($val->getRules() as $rule) {
-				if ($val->getTranslate() !== Validator::TRANSLATE_NONE) {
-					$script .= "
-		\$this->addValidator('$cup', '".$rule->getName()."', '".$rule->getClass()."', '".str_replace("'", "\'", $rule->getValue())."', ".$val->getTranslate()."('".str_replace("'", "\'", $rule->getMessage())."'));";
-				} else {
-					$script .= "
-		\$this->addValidator('$cup', '".$rule->getName()."', '".$rule->getClass()."', '".str_replace("'", "\'", $rule->getValue())."', '".str_replace("'", "\'", $rule->getMessage())."');";
-				} // if ($rule->getTranslation() ...
-  			} // foreach rule
-		}  // foreach validator
-
-		$script .= "
-	} // initialize()
-";
-
-	}
-
-	/**
-	 * Adds the method that build the RelationMap objects
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addBuildRelations(&$script)
-	{
-		$script .= "
-	/**
-	 * Build the RelationMap objects for this table relationships
-	 */
-	public function buildRelations()
-	{";
-    foreach ($this->getTable()->getForeignKeys() as $fkey)
-    {
-      $columnMapping = 'array(';
-      foreach ($fkey->getLocalForeignMapping() as $key => $value)
-      {
-        $columnMapping .= "'$key' => '$value', ";
-      }
-      $columnMapping .= ')';
-      $onDelete = $fkey->hasOnDelete() ? "'" . $fkey->getOnDelete() . "'" : 'null';
-      $onUpdate = $fkey->hasOnUpdate() ? "'" . $fkey->getOnUpdate() . "'" : 'null';
-      $script .= "
-    \$this->addRelation('" . $this->getFKPhpNameAffix($fkey) . "', '" . $fkey->getForeignTable()->getPhpName() . "', RelationMap::MANY_TO_ONE, $columnMapping, $onDelete, $onUpdate);";
-    }
-    foreach ($this->getTable()->getReferrers() as $fkey)
-    {
-      $columnMapping = 'array(';
-      foreach ($fkey->getForeignLocalMapping() as $key => $value)
-      {
-        $columnMapping .= "'$key' => '$value', ";
-      }
-      $columnMapping .= ')';
-      $onDelete = $fkey->hasOnDelete() ? "'" . $fkey->getOnDelete() . "'" : 'null';
-      $onUpdate = $fkey->hasOnUpdate() ? "'" . $fkey->getOnUpdate() . "'" : 'null';
-      $script .= "
-    \$this->addRelation('" . $this->getRefFKPhpNameAffix($fkey) . "', '" . $fkey->getTable()->getPhpName() . "', RelationMap::ONE_TO_" . ($fkey->isLocalPrimaryKey() ? "ONE" : "MANY") .", $columnMapping, $onDelete, $onUpdate);";
-    }
-    $script .= "
-	} // buildRelations()
-";
-	}
-
-	/**
-	 * Adds the behaviors getter
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetBehaviors(&$script)
-	{
-	  if ($behaviors = $this->getTable()->getBehaviors())
-	  {
-  		$script .= "
-	/**
-	 * 
-	 * Gets the list of behaviors registered for this table
-	 * 
-	 * @return array Associative array (name => parameters) of behaviors
-	 */
-	public function getBehaviors()
-	{
-		return array(";
-      foreach ($behaviors as $behavior)
-      {        
-        $script .= "
-			'{$behavior->getName()}' => array(";
-        foreach ($behavior->getParameters() as $key => $value)
-        {
-          $script .= "'$key' => '$value', ";
-        }
-        $script .= "),";
-      }
-      $script .= "
-		);
-	} // getBehaviors()
-";
-    }
-	}
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName)
-  {
-    return parent::hasBehaviorModifier($hookName, 'TableMapBuilderModifier');
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, &$script, $tab = "		")
-  {
-    return parent::applyBehaviorModifier($hookName, 'TableMapBuilderModifier', $script, $tab);
-  }
-} // PHP5TableMapBuilder
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/DDLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/DDLBuilder.php
deleted file mode 100644
index 74cc163..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/DDLBuilder.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/*
- *  $Id: DDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/DataModelBuilder.php';
-
-/**
- * Baseclass for SQL DDL-building classes.
- *
- * DDL-building classes are those that build all the SQL DDL for a single table.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql
- */
-abstract class DDLBuilder extends DataModelBuilder {
-
-	/**
-	 * Builds the SQL for current table and returns it as a string.
-	 *
-	 * This is the main entry point and defines a basic structure that classes should follow.
-	 * In most cases this method will not need to be overridden by subclasses.
-	 *
-	 * @return     string The resulting SQL DDL.
-	 */
-	public function build()
-	{
-		$script = "";
-		$this->addTable($script);
-		$this->addIndices($script);
-		$this->addForeignKeys($script);
-		return $script;
-	}
-
-	/**
-	 * Gets the name to use for creating a sequence for the current table.
-	 *
-	 * This will create a new name or use one specified in an id-method-parameter
-	 * tag, if specified.
-	 *
-	 * @return     string Sequence name for this table.
-	 */
-	public function getSequenceName()
-	{
-		$table = $this->getTable();
-		static $longNamesMap = array();
-		$result = null;
-		if ($table->getIdMethod() == IDMethod::NATIVE) {
-			$idMethodParams = $table->getIdMethodParameters();
-			$maxIdentifierLength = $table->getDatabase()->getPlatform()->getMaxColumnNameLength();
-			if (empty($idMethodParams)) {
-				if (strlen($table->getName() . "_SEQ") > $maxIdentifierLength) {
-					if (!isset($longNamesMap[$table->getName()])) {
-						$longNamesMap[$table->getName()] = strval(count($longNamesMap) + 1);
-					}
-					$result = substr($table->getName(), 0, $maxIdentifierLength - strlen("_SEQ_" . $longNamesMap[$table->getName()])) . "_SEQ_" . $longNamesMap[$table->getName()];
-				}
-				else {
-					$result = substr($table->getName(), 0, $maxIdentifierLength -4) . "_SEQ";
-				}
-			} else {
-				$result = substr($idMethodParams[0]->getValue(), 0, $maxIdentifierLength);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Builds the DDL SQL for a Column object.
-	 * @return     string
-	 */
-	public function getColumnDDL(Column $col)
-	{
-		$platform = $this->getPlatform();
-		$domain = $col->getDomain();
-
-		$sb = "";
-		$sb .= $this->quoteIdentifier($col->getName()) . " ";
-		$sb .= $domain->getSqlType();
-		if ($platform->hasSize($domain->getSqlType())) {
-			$sb .= $domain->printSize();
-		}
-		$sb .= " ";
-		$sb .= $col->getDefaultSetting() . " ";
-		$sb .= $col->getNotNullString() . " ";
-		$sb .= $col->getAutoIncrementString();
-
-		return trim($sb);
-	}
-
-	/**
-	 * Creates a delimiter-delimited string list of column names, quoted using quoteIdentifier().
-	 * @param      array Column[] or string[]
-	 * @param      string $delim The delimiter to use in separating the column names.
-	 * @return     string
-	 */
-	public function getColumnList($columns, $delim=',')
-	{
-		$list = array();
-		foreach ($columns as $col) {
-			if ($col instanceof Column) {
-				$col = $col->getName();
-			}
-			$list[] = $this->quoteIdentifier($col);
-		}
-		return implode($delim, $list);
-	}
-
-	/**
-	 * This function adds any _database_ start/initialization SQL.
-	 * This is designed to be called for a database, not a specific table, hence it is static.
-	 * @return     string The DDL is returned as astring.
-	 */
-	public static function getDatabaseStartDDL()
-	{
-		return '';
-	}
-
-	/**
-	 * This function adds any _database_ end/cleanup SQL.
-	 * This is designed to be called for a database, not a specific table, hence it is static.
-	 * @return     string The DDL is returned as astring.
-	 */
-	public static function getDatabaseEndDDL()
-	{
-		return '';
-	}
-
-	/**
-	 * Resets any static variables between building a SQL file for a database.
-	 *
-	 * Theoretically, Propel could build multiple .sql files for multiple databases; in
-	 * many cases we don't want static values to persist between these.  This method provides
-	 * a way to clear out static values between iterations, if the subclasses choose to implement
-	 * it.
-	 */
-	public static function reset()
-	{
-		// nothing by default
-	}
-
-	/**
-	 * Adds table definition.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addTable(&$script);
-
-	/**
-	 * Adds index definitions.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addIndices(&$script);
-
-	/**
-	 * Adds foreign key constraint definitions.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addForeignKeys(&$script);
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/DataSQLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/DataSQLBuilder.php
deleted file mode 100644
index 35d9349..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/DataSQLBuilder.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-/*
- *  $Id: DataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/DataModelBuilder.php';
-require_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * Baseclass for SQL data dump SQL building classes.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql
- */
-abstract class DataSQLBuilder extends DataModelBuilder {
-
-	/**
-	 * Perform any reset between runs of this builder.
-	 *
-	 * This can be used, for example, to clear any stored start/end SQL.
-	 */
-	public static function reset()
-	{
-		// does nothing by default
-	}
-
-	/**
-	 * Gets any SQL to place at the start of all the row inserts.
-	 *
-	 * @return     string
-	 */
-	public static function getDatabaseStartSql()
-	{
-		return '';
-	}
-
-	/**
-	 * Gets any SQL to place at the end of all the row inserts.
-	 *
-	 * @return     string
-	 */
-	public static function getDatabaseEndSql()
-	{
-		return '';
-	}
-
-	/**
-	 * Gets any SQL to place before row inserts for a new table.
-	 *
-	 * @return     string
-	 */
-	public function getTableStartSql()
-	{
-		return '';
-	}
-
-	/**
-	 * Gets any SQL to place at the end of row inserts for a table.
-	 *
-	 * @return     string
-	 */
-	public function getTableEndSql()
-	{
-		return '';
-	}
-
-	/**
-	 * The main method in this class, returns the SQL for INSERTing data into a row.
-	 * @param      DataRow $row The row to process.
-	 * @return     string
-	 */
-	public function buildRowSql(DataRow $row)
-	{
-		$sql = "";
-		$platform = $this->getPlatform();
-		$table = $this->getTable();
-
-		$sql .= "INSERT INTO ".$this->quoteIdentifier($this->prefixTablename($this->getTable()->getName()))." (";
-
-		// add column names to SQL
-		$colNames = array();
-		foreach ($row->getColumnValues() as $colValue) {
-			$colNames[] = $this->quoteIdentifier($colValue->getColumn()->getName());
-		}
-
-		$sql .= implode(',', $colNames);
-
-		$sql .= ") VALUES (";
-
-		$colVals = array();
-		foreach ($row->getColumnValues() as $colValue) {
-			$colVals[] = $this->getColumnValueSql($colValue);
-		}
-
-		$sql .= implode(',', $colVals);
-		$sql .= ");
-";
-
-		return $sql;
-	}
-
-	/**
-	 * Gets the propertly escaped (and quoted) value for a column.
-	 * @param      ColumnValue $colValue
-	 * @return     mixed The proper value to be added to the string.
-	 */
-	protected function getColumnValueSql(ColumnValue $colValue)
-	{
-		$column = $colValue->getColumn();
-		$method = 'get' . $column->getPhpNative() . 'Sql';
-		return $this->$method($colValue->getValue());
-	}
-
-
-
-	/**
-	 * Gets a representation of a binary value suitable for use in a SQL statement.
-	 * Default behavior is true = 1, false = 0.
-	 * @param      boolean $value
-	 * @return     int
-	 */
-	protected function getBooleanSql($value)
-	{
-		return (int) $value;
-	}
-
-
-	/**
-	 * Gets a representation of a BLOB/LONGVARBINARY value suitable for use in a SQL statement.
-	 * @param      mixed $blob Blob object or string data.
-	 * @return     string
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			return $this->getPlatform()->quote($blob->__toString());
-		} else {
-			return $this->getPlatform()->quote($blob);
-		}
-	}
-
-	/**
-	 * Gets a representation of a CLOB/LONGVARCHAR value suitable for use in a SQL statement.
-	 * @param      mixed $clob Clob object or string data.
-	 * @return     string
-	 */
-	protected function getClobSql($clob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($clob)) {
-			return $this->getPlatform()->quote($clob->__toString());
-		} else {
-			return $this->getPlatform()->quote($clob);
-		}
-	}
-
-	/**
-	 * Gets a representation of a date value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	protected function getDateSql($value)
-	{
-		return "'" . date('Y-m-d', strtotime($value)) . "'";
-	}
-
-	/**
-	 * Gets a representation of a decimal value suitable for use in a SQL statement.
-	 * @param      double $value
-	 * @return     float
-	 */
-	protected function getDecimalSql($value)
-	{
-		return (float) $value;
-	}
-
-	/**
-	 * Gets a representation of a double value suitable for use in a SQL statement.
-	 * @param      double $value
-	 * @return     double
-	 */
-	protected function getDoubleSql($value)
-	{
-		return (double) $value;
-	}
-
-	/**
-	 * Gets a representation of a float value suitable for use in a SQL statement.
-	 * @param      float $value
-	 * @return     float
-	 */
-	protected function getFloatSql($value)
-	{
-		return (float) $value;
-	}
-
-	/**
-	 * Gets a representation of an integer value suitable for use in a SQL statement.
-	 * @param      int $value
-	 * @return     int
-	 */
-	protected function getIntSql($value)
-	{
-		return (int) $value;
-	}
-
-	/**
-	 * Gets a representation of a NULL value suitable for use in a SQL statement.
-	 * @return     null
-	 */
-	protected function getNullSql()
-	{
-		return 'NULL';
-	}
-
-	/**
-	 * Gets a representation of a string value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	protected function getStringSql($value)
-	{
-		return $this->getPlatform()->quote($value);
-	}
-
-	/**
-	 * Gets a representation of a time value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	protected function getTimeSql($paramIndex, $value)
-	{
-		return "'" . date('H:i:s', strtotime($value)) . "'";
-	}
-
-	/**
-	 * Gets a representation of a timestamp value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	function getTimestampSql($value)
-	{
-		return "'" . date('Y-m-d H:i:s', strtotime($value)) . "'";
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php
deleted file mode 100644
index f3eb8da..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/*
- *  $Id: MssqlDDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for MS SQL Server.
- *
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class MssqlDDLBuilder extends DDLBuilder {
-
-	private static $dropCount = 0;
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
-IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='".$fk->getName()."')
-	ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." DROP CONSTRAINT ".$this->quoteIdentifier($fk->getName()).";
-";
-		}
-
-
-		self::$dropCount++;
-
-		$script .= "
-IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = '".$this->prefixTablename($table->getName())."')
-BEGIN
-	 DECLARE @reftable_".self::$dropCount." nvarchar(60), @constraintname_".self::$dropCount." nvarchar(60)
-	 DECLARE refcursor CURSOR FOR
-	 select reftables.name tablename, cons.name constraintname
-	  from sysobjects tables,
-		   sysobjects reftables,
-		   sysobjects cons,
-		   sysreferences ref
-	   where tables.id = ref.rkeyid
-		 and cons.id = ref.constid
-		 and reftables.id = ref.fkeyid
-		 and tables.name = '".$this->prefixTablename($table->getName())."'
-	 OPEN refcursor
-	 FETCH NEXT from refcursor into @reftable_".self::$dropCount.", @constraintname_".self::$dropCount."
-	 while @@FETCH_STATUS = 0
-	 BEGIN
-	   exec ('alter table '+ at reftable_".self::$dropCount."+' drop constraint '+ at constraintname_".self::$dropCount.")
-	   FETCH NEXT from refcursor into @reftable_".self::$dropCount.", @constraintname_".self::$dropCount."
-	 END
-	 CLOSE refcursor
-	 DEALLOCATE refcursor
-	 DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-END
-";
-	}
-
-	/**
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-/* ---------------------------------------------------------------------- */
-/* ".$table->getName()."											*/
-/* ---------------------------------------------------------------------- */
-
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			$lines[] = $this->getColumnDDL($col);
-		}
-
-		if ($table->hasPrimaryKey()) {
-			$lines[] = "CONSTRAINT ".$this->quoteIdentifier($table->getName()."_PK") . " PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		foreach ($table->getUnices() as $unique ) {
-			$lines[] = "UNIQUE (".$this->getColumnList($unique->getColumns()).")";
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-";
-	}
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getIndices() as $index) {
-			$script .= "
-CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName())." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
-BEGIN
-ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." ADD CONSTRAINT ".$this->quoteIdentifier($fk->getName())." FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()) .") REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName()))." (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				if ($fk->getOnUpdate() == ForeignKey::SETNULL) { // there may be others that also won't work
-					// we have to skip this because it's unsupported.
-					$this->warn("MSSQL doesn't support the 'SET NULL' option for ON UPDATE (ignoring for ".$this->getColumnList($fk->getLocalColumns())." fk).");
-				} else {
-					$script .= " ON UPDATE ".$fk->getOnUpdate();
-				}
-
-			}
-			if ($fk->hasOnDelete()) {
-				if ($fk->getOnDelete() == ForeignKey::SETNULL) { // there may be others that also won't work
-					// we have to skip this because it's unsupported.
-					$this->warn("MSSQL doesn't support the 'SET NULL' option for ON DELETE (ignoring for ".$this->getColumnList($fk->getLocalColumns())." fk).");
-				} else {
-					$script .= " ON DELETE ".$fk->getOnDelete();
-				}
-			}
-			$script .= "
-END
-;
-";
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php
deleted file mode 100644
index f4ca3b0..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- *  $Id: MssqlDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * MS SQL Server class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.mssql
- */
-class MssqlDataSQLBuilder extends DataSQLBuilder {
-
-	/**
-	 *
-	 * @param      mixed $blob Blob object or string containing data.
-	 * @return     string
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			$blob = $blob->__toString();
-		}
-		$data = unpack("H*hex", $blob);
-		return '0x'.$data['hex']; // no surrounding quotes!
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
deleted file mode 100644
index c751b14..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-
-/*
- *  $Id: MysqlDDLBuilder.php 1559 2010-02-15 22:27:12Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * DDL Builder class for MySQL.
- *
- * @author     David Z�lke
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.mysql
- */
-class MysqlDDLBuilder extends DDLBuilder {
-
-	/**
-	 * Returns some header SQL that disables foreign key checking.
-	 * @return     string DDL
-	 */
-	public static function getDatabaseStartDDL()
-	{
-		$ddl = "
-# This is a fix for InnoDB in MySQL >= 4.1.x
-# It \"suspends judgement\" for fkey relationships until are tables are set.
-SET FOREIGN_KEY_CHECKS = 0;
-";
-		return $ddl;
-	}
-
-	/**
-	 * Returns some footer SQL that re-enables foreign key checking.
-	 * @return     string DDL
-	 */
-	public static function getDatabaseEndDDL()
-	{
-		$ddl = "
-# This restores the fkey checks, after having unset them earlier
-SET FOREIGN_KEY_CHECKS = 1;
-";
-		return $ddl;
-	}
-
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$script .= "
-DROP TABLE IF EXISTS ".$this->quoteIdentifier($this->prefixTablename($this->getTable()->getName())).";
-";
-	}
-
-	/**
-	 * Builds the SQL for current table and returns it as a string.
-	 *
-	 * This is the main entry point and defines a basic structure that classes should follow.
-	 * In most cases this method will not need to be overridden by subclasses.
-	 *
-	 * @return     string The resulting SQL DDL.
-	 */
-	public function build()
-	{
-		$script = "";
-		$this->addTable($script);
-		return $script;
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-#-----------------------------------------------------------------------------
-#-- ".$table->getName()."
-#-----------------------------------------------------------------------------
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		$databaseType = $this->getPlatform()->getDatabaseType();
-
-		foreach ($table->getColumns() as $col) {
-			$entry = $this->getColumnDDL($col);
-			$colinfo = $col->getVendorInfoForType($databaseType);
-			if ( $colinfo->hasParameter('Charset') ) {
-				$entry .= ' CHARACTER SET '.$platform->quote($colinfo->getParamter('Charset'));
-			}
-			if ( $colinfo->hasParameter('Collate') ) {
-				$entry .= ' COLLATE '.$platform->quote($colinfo->getParamter('Collate'));
-			}
-			if ($col->getDescription()) {
-				$entry .= " COMMENT ".$platform->quote($col->getDescription());
-			}
-			$lines[] = $entry;
-		}
-
-		if ($table->hasPrimaryKey()) {
-			$lines[] = "PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		$this->addIndicesLines($lines);
-		$this->addForeignKeysLines($lines);
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-
-		$script .= "
-)";
-
-		$mysqlTableType = $this->getBuildProperty("mysqlTableType");
-		if (!$mysqlTableType) {
-			$vendorSpecific = $table->getVendorInfoForType($this->getPlatform()->getDatabaseType());
-			if ($vendorSpecific->hasParameter('Type')) {
-				$mysqlTableType = $vendorSpecific->getParameter('Type');
-			} elseif ($vendorSpecific->hasParameter('Engine')) {
-				$mysqlTableType = $vendorSpecific->getParameter('Engine');
-			} else {
-				$mysqlTableType = 'MyISAM';
-			}
-		}
-
-		$script .= "Type=$mysqlTableType";
-
-		$dbVendorSpecific = $table->getDatabase()->getVendorInfoForType($databaseType);
-		$tableVendorSpecific = $table->getVendorInfoForType($databaseType);
-		$vendorSpecific = $dbVendorSpecific->getMergedVendorInfo($tableVendorSpecific);
-
-		if ( $vendorSpecific->hasParameter('Charset') ) {
-			$script .= ' CHARACTER SET '.$platform->quote($vendorSpecific->getParameter('Charset'));
-		}
-		if ( $vendorSpecific->hasParameter('Collate') ) {
-			$script .= ' COLLATE '.$platform->quote($vendorSpecific->getParameter('Collate'));
-		}
-		if ( $vendorSpecific->hasParameter('Checksum') ) {
-			$script .= ' CHECKSUM='.$platform->quote($vendorSpecific->getParameter('Checksum'));
-		}
-		if ( $vendorSpecific->hasParameter('Pack_Keys') ) {
-			$script .= ' PACK_KEYS='.$platform->quote($vendorSpecific->getParameter('Pack_Keys'));
-		}
-		if ( $vendorSpecific->hasParameter('Delay_key_write') ) {
-			$script .= ' DELAY_KEY_WRITE='.$platform->quote($vendorSpecific->getParameter('Delay_key_write'));
-		}
-
-		if ($table->getDescription()) {
-			$script .= " COMMENT=".$platform->quote($table->getDescription());
-		}
-		$script .= ";
-";
-	}
-
-	/**
-	 * Creates a comma-separated list of column names for the index.
-	 * For MySQL unique indexes there is the option of specifying size, so we cannot simply use
-	 * the getColumnsList() method.
-	 * @param      Index $index
-	 * @return     string
-	 */
-	private function getIndexColumnList(Index $index)
-	{
-		$platform = $this->getPlatform();
-
-		$cols = $index->getColumns();
-		$list = array();
-		foreach ($cols as $col) {
-			$list[] = $this->quoteIdentifier($col) . ($index->hasColumnSize($col) ? '(' . $index->getColumnSize($col) . ')' : '');
-		}
-		return implode(', ', $list);
-	}
-
-	/**
-	 * Adds indexes
-	 */
-	protected function addIndicesLines(&$lines)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getUnices() as $unique) {
-			$lines[] = "UNIQUE KEY ".$this->quoteIdentifier($unique->getName())." (".$this->getIndexColumnList($unique).")";
-		}
-
-		foreach ($table->getIndices() as $index ) {
-			$vendorInfo = $index->getVendorInfoForType($platform->getDatabaseType());
-			$lines[] .= (($vendorInfo && $vendorInfo->getParameter('Index_type') == 'FULLTEXT') ? 'FULLTEXT ' : '') . "KEY " . $this->quoteIdentifier($index->getName()) . "(" . $this->getIndexColumnList($index) . ")";
-		}
-
-	}
-
-	/**
-	 * Adds foreign key declarations & necessary indexes for mysql (if they don't exist already).
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeysLines(&$lines)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-
-		$_indices = array();
-		$_previousColumns = array();
-
-		// we're building an array of indices here which is smart about multi-column indices.
-		// for example, if we have to indices foo(ColA) and bar(ColB, ColC), we have actually three indices already defined:
-		// ColA, ColB+ColC, and ColB (but not ColC!). This is because of the way SQL multi-column indices work.
-		// we will later match found, defined foreign key and referenced column definitions against this array to know
-		// whether we should create a new index for mysql or not
-		foreach ($table->getPrimaryKey() as $_primaryKeyColumn) {
-			// do the above for primary keys
-			$_previousColumns[] = $this->quoteIdentifier($_primaryKeyColumn->getName());
-			$_indices[] = implode(',', $_previousColumns);
-		}
-
-		$_tableIndices = array_merge($table->getIndices(), $table->getUnices());
-		foreach ($_tableIndices as $_index) {
-			// same procedure, this time for unices and indices
-			$_previousColumns = array();
-			$_indexColumns = $_index->getColumns();
-			foreach ($_indexColumns as $_indexColumn) {
-				$_previousColumns[] = $this->quoteIdentifier($_indexColumn);
-				$_indices[] = implode(',', $_previousColumns);
-			}
-		}
-
-		// we're determining which tables have foreign keys that point to this table, since MySQL needs an index on
-		// any column that is referenced by another table (yep, MySQL _is_ a PITA)
-		$counter = 0;
-		$allTables = $table->getDatabase()->getTables();
-		foreach ($allTables as $_table) {
-			foreach ($_table->getForeignKeys() as $_foreignKey) {
-				if ($_foreignKey->getForeignTableName() == $table->getName()) {
-					if (!in_array($this->getColumnList($_foreignKey->getForeignColumns()), $_indices)) {
-						// no matching index defined in the schema, so we have to create one
-						$lines[] = "INDEX ".$this->quoteIdentifier("I_referenced_".$_foreignKey->getName()."_".(++$counter))." (" .$this->getColumnList($_foreignKey->getForeignColumns()).")";
-					}
-				}
-			}
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-
-			$indexName = $this->quoteIdentifier(substr_replace($fk->getName(), 'FI_',  strrpos($fk->getName(), 'FK_'), 3));
-
-			if (!in_array($this->getColumnList($fk->getLocalColumns()), $_indices)) {
-				// no matching index defined in the schema, so we have to create one. MySQL needs indices on any columns that serve as foreign keys. these are not auto-created prior to 4.1.2
-				$lines[] = "INDEX $indexName (".$this->getColumnList($fk->getLocalColumns()).")";
-			}
-			$str = "CONSTRAINT ".$this->quoteIdentifier($fk->getName())."
-		FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()).")
-		REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName())) . " (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				$str .= "
-		ON UPDATE ".$fk->getOnUpdate();
-			}
-			if ($fk->hasOnDelete()) {
-				$str .= "
-		ON DELETE ".$fk->getOnDelete();
-			}
-			$lines[] = $str;
-		}
-
-	}
-
-	/**
-	 * Checks whether passed-in array of Column objects contains a column with specified name.
-	 * @param      array Column[] or string[]
-	 * @param      string $searchcol Column name to search for
-	 */
-	private function containsColname($columns, $searchcol)
-	{
-		foreach ($columns as $col) {
-			if ($col instanceof Column) {
-				$col = $col->getName();
-			}
-			if ($col == $searchcol) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Not used for MySQL since foreign keys are declared inside table declaration.
-	 * @see        addForeignKeysLines()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-	}
-
-	/**
-	 * Not used for MySQL since indexes are declared inside table declaration.
-	 * @see        addIndicesLines()
-	 */
-	protected function addIndices(&$script)
-	{
-	}
-
-	/**
-	 * Builds the DDL SQL for a Column object.
-	 * @return     string
-	 */
-	public function getColumnDDL(Column $col)
-	{
-		$platform = $this->getPlatform();
-		$domain = $col->getDomain();
-		$sqlType = $domain->getSqlType();
-		$notNullString = $col->getNotNullString();
-		$defaultSetting = $col->getDefaultSetting();
-
-		// Special handling of TIMESTAMP/DATETIME types ...
-		// See: http://propel.phpdb.org/trac/ticket/538
-		if ($sqlType == 'DATETIME') {
-			$def = $domain->getDefaultValue();
-			if ($def && $def->isExpression()) { // DATETIME values can only have constant expressions
-				$sqlType = 'TIMESTAMP';
-			}
-		} elseif ($sqlType == 'DATE') {
-			$def = $domain->getDefaultValue();
-			if ($def && $def->isExpression()) {
-				throw new EngineException("DATE columns cannot have default *expressions* in MySQL.");
-			}
-		} elseif ($sqlType == 'TEXT' || $sqlType == 'BLOB') {
-			if ($domain->getDefaultValue()) {
-				throw new EngineException("BLOB and TEXT columns cannot have DEFAULT values. in MySQL.");
-			}
-		}
-
-		$sb = "";
-		$sb .= $this->quoteIdentifier($col->getName()) . " ";
-		$sb .= $sqlType;
-		if ($platform->hasSize($sqlType)) {
-			$sb .= $domain->printSize();
-		}
-		$sb .= " ";
-
-		if ($sqlType == 'TIMESTAMP') {
-			$notNullString = $col->getNotNullString();
-			$defaultSetting = $col->getDefaultSetting();
-			if ($notNullString == '') {
-				$notNullString = 'NULL';
-			}
-			if ($defaultSetting == '' && $notNullString == 'NOT NULL') {
-				$defaultSetting = 'DEFAULT CURRENT_TIMESTAMP';
-			}
-			$sb .= $notNullString . " " . $defaultSetting . " ";
-		} else {
-			$sb .= $defaultSetting . " ";
-			$sb .= $notNullString . " ";
-		}
-		$sb .= $col->getAutoIncrementString();
-
-		return trim($sb);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php
deleted file mode 100644
index 735c5a8..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- *  $Id: MysqlDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * MySQL class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.mysql
- */
-class MysqlDataSQLBuilder extends DataSQLBuilder {
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php
deleted file mode 100644
index a2d1abe..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- *  $Id: OracleDDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for Oracle.
- *
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class OracleDDLBuilder extends DDLBuilder {
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$script .= "
-DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." CASCADE CONSTRAINTS;
-";
-		if ($table->getIdMethod() == "native") {
-			$script .= "
-DROP SEQUENCE ".$this->quoteIdentifier($this->prefixTablename($this->getSequenceName())).";
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-
-/* -----------------------------------------------------------------------
-   ".$table->getName()."
-   ----------------------------------------------------------------------- */
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			$lines[] = $this->getColumnDDL($col);
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-";
-		$this->addPrimaryKey($script);
-		$this->addSequences($script);
-
-	}
-
-	/**
-	 *
-	 *
-	 */
-	protected function addPrimaryKey(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$tableName = $table->getName();
-		$length = strlen($tableName);
-		if ($length > 27) {
-			$length = 27;
-		}
-		if ( is_array($table->getPrimaryKey()) && count($table->getPrimaryKey()) ) {
-			$script .= "
-	ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-		ADD CONSTRAINT ".$this->quoteIdentifier(substr($tableName,0,$length)."_PK")."
-	PRIMARY KEY (";
-			$delim = "";
-			foreach ($table->getPrimaryKey() as $col) {
-				$script .= $delim . $this->quoteIdentifier($col->getName());
-				$delim = ",";
-			}
-	$script .= ");
-";
-		}
-	}
-
-	/**
-	 * Adds CREATE SEQUENCE statements for this table.
-	 *
-	 */
-	protected function addSequences(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		if ($table->getIdMethod() == "native") {
-			$script .= "CREATE SEQUENCE ".$this->quoteIdentifier($this->prefixTablename($this->getSequenceName()))." INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-";
-		}
-	}
-
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		foreach ($table->getIndices() as $index) {
-			$script .= "CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName()) ." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
-ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." ADD CONSTRAINT ".$this->quoteIdentifier($fk->getName())." FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()) .") REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName()))." (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				$this->warn("ON UPDATE not yet implemented for Oracle builder.(ignoring for ".$this->getColumnList($fk->getLocalColumns())." fk).");
-				//$script .= " ON UPDATE ".$fk->getOnUpdate();
-			}
-			if ($fk->hasOnDelete()) {
-				$script .= " ON DELETE ".$fk->getOnDelete();
-			}
-			$script .= ";
-";
-		}
-	}
-
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php
deleted file mode 100644
index e9fb60b..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- *  $Id: OracleDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * Oracle class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.oracle
- */
-class OracleDataSQLBuilder extends DataSQLBuilder {
-
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php
deleted file mode 100644
index 379911f..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/*
- *  $Id: PgsqlDDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for PostgreSQL.
- *
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class PgsqlDDLBuilder extends DDLBuilder {
-
-
-	/**
-	 * Array that keeps track of already
-	 * added schema names
-	 *
-	 * @var        Array of schema names
-	 */
-	protected static $addedSchemas = array();
-
-	/**
-	 * Queue of constraint SQL that will be added to script at the end.
-	 *
-	 * PostgreSQL seems (now?) to not like constraints for tables that don't exist,
-	 * so the solution is to queue up the statements and execute it at the end.
-	 *
-	 * @var        array
-	 */
-	protected static $queuedConstraints = array();
-
-	/**
-	 * Reset static vars between db iterations.
-	 */
-	public static function reset()
-	{
-		self::$addedSchemas = array();
-		self::$queuedConstraints = array();
-	}
-
-	/**
-	 * Returns all the ALTER TABLE ADD CONSTRAINT lines for inclusion at end of file.
-	 * @return     string DDL
-	 */
-	public static function getDatabaseEndDDL()
-	{
-		$ddl = implode("", self::$queuedConstraints);
-		return $ddl;
-	}
-
-	/**
-	 * Get the schema for the current table
-	 *
-	 * @author     Markus Lervik <markus.lervik at necora.fi>
-	 * @access     protected
-	 * @return     schema name if table has one, else
-	 *         null
-	 **/
-	protected function getSchema()
-	{
-		$table = $this->getTable();
-		$vi = $table->getVendorInfoForType($this->getPlatform()->getDatabaseType());
-		if ($vi->hasParameter('schema')) {
-			return $vi->getParameter('schema');
-		}
-		return null;
-	}
-
-	/**
-	 * Add a schema to the generated SQL script
-	 *
-	 * @author     Markus Lervik <markus.lervik at necora.fi>
-	 * @access     protected
-	 * @return     string with CREATE SCHEMA statement if
-	 *         applicable, else empty string
-	 **/
-	protected function addSchema()
-	{
-
-		$schemaName = $this->getSchema();
-
-		if ($schemaName !== null) {
-
-			if (!in_array($schemaName, self::$addedSchemas)) {
-		$platform = $this->getPlatform();
-				self::$addedSchemas[] = $schemaName;
-		return "\nCREATE SCHEMA " . $this->quoteIdentifier($schemaName) . ";\n";
-			}
-		}
-
-		return '';
-
-	}
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." CASCADE;
-";
-
-		if ($table->getIdMethod() == IDMethod::NATIVE && $table->getIdMethodParameters()) {
-			$script .= "
-DROP SEQUENCE ".$this->quoteIdentifier($this->prefixTablename(strtolower($this->getSequenceName()))).";
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
------------------------------------------------------------------------------
--- ".$table->getName()."
------------------------------------------------------------------------------
-";
-
-		$script .= $this->addSchema();
-
-		$schemaName = $this->getSchema();
-		if ($schemaName !== null) {
-			$script .= "\nSET search_path TO " . $this->quoteIdentifier($schemaName) . ";\n";
-		}
-
-		$this->addDropStatements($script);
-		$this->addSequences($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			/* @var $col Column */
-			$colDDL = $this->getColumnDDL($col);
-			if ($col->isAutoIncrement() && $table->getIdMethodParameters() == null) {
-				if ($col->getType() === PropelTypes::BIGINT) {
-					$colDDL = str_replace($col->getDomain()->getSqlType(), 'bigserial', $colDDL);
-				} else {
-					$colDDL = str_replace($col->getDomain()->getSqlType(), 'serial', $colDDL);
-				}
-			}
-			$lines[] = $colDDL;
-		}
-
-		if ($table->hasPrimaryKey()) {
-			$lines[] = "PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		foreach ($table->getUnices() as $unique ) {
-			$lines[] = "CONSTRAINT ".$this->quoteIdentifier($unique->getName())." UNIQUE (".$this->getColumnList($unique->getColumns()).")";
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-
-COMMENT ON TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." IS " . $platform->quote($table->getDescription()).";
-
-";
-
-		$this->addColumnComments($script);
-
-		$script .= "\nSET search_path TO public;";
-
-	}
-
-	/**
-	 * Adds comments for the columns.
-	 *
-	 */
-	protected function addColumnComments(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($this->getTable()->getColumns() as $col) {
-			if ( $col->getDescription() != '' ) {
-				$script .= "
-COMMENT ON COLUMN ".$this->quoteIdentifier($this->prefixTablename($table->getName())).".".$this->quoteIdentifier($col->getName())." IS ".$platform->quote($col->getDescription()) .";
-";
-			}
-		}
-	}
-
-	/**
-	 * Override to provide sequence names that conform to postgres' standard when
-	 * no id-method-parameter specified.
-	 *
-	 * @see        DataModelBuilder::getSequenceName()
-	 * @return     string
-	 */
-	public function getSequenceName()
-	{
-		$table = $this->getTable();
-		static $longNamesMap = array();
-		$result = null;
-		if ($table->getIdMethod() == IDMethod::NATIVE) {
-			$idMethodParams = $table->getIdMethodParameters();
-			if (empty($idMethodParams)) {
-				$result = null;
-				// We're going to ignore a check for max length (mainly
-				// because I'm not sure how Postgres would handle this w/ SERIAL anyway)
-				foreach ($table->getColumns() as $col) {
-					if ($col->isAutoIncrement()) {
-						$result = $table->getName() . '_' . $col->getName() . '_seq';
-						break; // there's only one auto-increment column allowed
-					}
-				}
-			} else {
-				$result = $idMethodParams[0]->getValue();
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Adds CREATE SEQUENCE statements for this table.
-	 *
-	 */
-	protected function addSequences(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		if ($table->getIdMethod() == IDMethod::NATIVE && $table->getIdMethodParameters() != null) {
-			$script .= "
-CREATE SEQUENCE ".$this->quoteIdentifier($this->prefixTablename(strtolower($this->getSequenceName()))).";
-";
-		}
-	}
-
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getIndices() as $index) {
-			$script .= "
-CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName())." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$privscript = "
-ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." ADD CONSTRAINT ".$this->quoteIdentifier($fk->getName())." FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()) .") REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName()))." (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				$privscript .= " ON UPDATE ".$fk->getOnUpdate();
-			}
-			if ($fk->hasOnDelete()) {
-				$privscript .= " ON DELETE ".$fk->getOnDelete();
-			}
-			$privscript .= ";
-";
-			self::$queuedConstraints[] = $privscript;
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php
deleted file mode 100644
index 33d3d78..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/*
- *  $Id: PgsqlDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * PostgreSQL class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class PgsqlDataSQLBuilder extends DataSQLBuilder {
-
-	/**
-	 * The largets serial value encountered this far.
-	 *
-	 * @var        int
-	 */
-	private $maxSeqVal;
-
-	/**
-	 * Construct a new PgsqlDataSQLBuilder object.
-	 *
-	 * @param      Table $table
-	 */
-	public function __construct(Table $table)
-	{
-		parent::__construct($table);
-	}
-
-	/**
-	 * The main method in this class, returns the SQL for INSERTing data into a row.
-	 * @param      DataRow $row The row to process.
-	 * @return     string
-	 */
-	public function buildRowSql(DataRow $row)
-	{
-		$sql = parent::buildRowSql($row);
-
-		$table = $this->getTable();
-
-		if ($table->hasAutoIncrementPrimaryKey() && $table->getIdMethod() == IDMethod::NATIVE) {
-			foreach ($row->getColumnValues() as $colValue) {
-				if ($colValue->getColumn()->isAutoIncrement()) {
-					if ($colValue->getValue() > $this->maxSeqVal) {
-						$this->maxSeqVal = $colValue->getValue();
-					}
-				}
-			}
-		}
-
-		return $sql;
-	}
-
-	public function getTableEndSql()
-	{
-		$table = $this->getTable();
-		$sql = "";
-		if ($table->hasAutoIncrementPrimaryKey() && $table->getIdMethod() == IDMethod::NATIVE) {
-			$seqname = $this->prefixTablename($this->getDDLBuilder()->getSequenceName());
-			$sql .= "SELECT pg_catalog.setval('$seqname', ".((int)$this->maxSeqVal).");
-";
-		}
-		return $sql;
-	}
-
-	/**
-	 * Get SQL value to insert for Postgres BOOLEAN column.
-	 * @param      boolean $value
-	 * @return     string The representation of boolean for Postgres ('t' or 'f').
-	 */
-	protected function getBooleanSql($value)
-	{
-		if ($value === 'f' || $value === 'false' || $value === "0") {
-			$value = false;
-		}
-		return ($value ? "'t'" : "'f'");
-	}
-
-	/**
-	 *
-	 * @param      mixed $blob Blob object or string containing data.
-	 * @return     string
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			$blob = $blob->__toString();
-		}
-		return "'" . pg_escape_bytea($blob) . "'";
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php
deleted file mode 100644
index bfd6bea..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- *  $Id: SqliteDDLBuilder.php 1595 2010-03-15 09:45:51Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for SQLite.
- *
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class SqliteDDLBuilder extends DDLBuilder {
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName())).";
-";
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
------------------------------------------------------------------------------
--- ".$table->getName()."
------------------------------------------------------------------------------
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			$lines[] = $this->getColumnDDL($col);
-		}
-
-		if ($table->hasPrimaryKey() && count($table->getPrimaryKey()) > 1) {
-			$lines[] = "PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		foreach ($table->getUnices() as $unique ) {
-			$lines[] = "UNIQUE (".$this->getColumnList($unique->getColumns()).")";
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-";
-	}
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getIndices() as $index) {
-			$script .= "
-CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName())." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
--- SQLite does not support foreign keys; this is just for reference
--- FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()).") REFERENCES ".$this->prefixTablename($fk->getForeignTableName())." (".$this->getColumnList($fk->getForeignColumns()).")
-";
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php
deleted file mode 100644
index 3422a61..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- *  $Id: SqliteDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * SQLite class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.engine.builder.sql.sqlite
- */
-class SqliteDataSQLBuilder extends DataSQLBuilder {
-
-	/**
-	 * Returns string processed by sqlite_udf_encode_binary() to ensure that binary contents will be handled correctly by sqlite.
-	 * @param      mixed $blob Blob or string
-	 * @return     string encoded text
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			$blob = $blob->__toString();
-		}
-		return "'" . sqlite_udf_encode_binary($blob) . "'";
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php
deleted file mode 100644
index 5ef3ec6..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/*
- *  $Id: DefaultEnglishPluralizer.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/util/Pluralizer.php';
-
-/**
- * The default Enlglish pluralizer class.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.generator
- */
-class DefaultEnglishPluralizer implements Pluralizer {
-
-	/**
-	 * Generate a plural name based on the passed in root.
-	 * @param      string $root The root that needs to be pluralized (e.g. Author)
-	 * @return     string The plural form of $root (e.g. Authors).
-	 */
-	public function getPluralForm($root)
-	{
-		return $root . 's';
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/Pluralizer.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/Pluralizer.php
deleted file mode 100644
index f0ad1b4..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/Pluralizer.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- *  $Id: Pluralizer.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * The generic interface to create a plural form of a name.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.generator
- */
-interface Pluralizer {
-
-	/**
-	 * Generate a plural name based on the passed in root.
-	 * @param      string $root The root that needs to be pluralized (e.g. Author)
-	 * @return     string The plural form of $root.
-	 */
-	public function getPluralForm($root);
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php
deleted file mode 100644
index 14be59e..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/*
- *  $Id: XmlToDataSQL.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/parser/AbstractHandler.php';
-
-/**
- * A Class that is used to parse an data dump XML file and create SQL using a DataSQLBuilder class.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.transform
- */
-class XmlToDataSQL extends AbstractHandler {
-
-	/**
-	 * The GeneratorConfig associated with the build.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * The database.
-	 *
-	 * @var        Database
-	 */
-	private $database;
-
-	/**
-	 * The output writer for the SQL file.
-	 *
-	 * @var        Writer
-	 */
-	private $sqlWriter;
-
-	/**
-	 * The database (and output SQL file) encoding.
-	 *
-	 * Values will be converted to this encoding in the output file.
-	 *
-	 * @var        string
-	 */
-	private $encoding;
-
-	/**
-	 * The classname of the static class that will perform the building.
-	 *
-	 * This is needed because there are some pre/post methods that get called
-	 * on the static class.
-	 *
-	 * @var        string
-	 */
-	private $builderClazz;
-
-	/**
-	 * The name of the current table being processed.
-	 *
-	 * @var        string
-	 */
-	private $currTableName;
-
-	/**
-	 * The DataSQLBuilder for the current table.
-	 *
-	 * @var        DataSQLBuilder
-	 */
-	private $currBuilder;
-
-	/**
-	 * Expat Parser.
-	 *
-	 * @var        ExpatParser
-	 */
-	public $parser;
-
-	/**
-	 * Flag for enabing debug output to aid in parser tracing.
-	 */
-	const DEBUG = false;
-
-	/**
-	 * Construct new XmlToDataSQL class.
-	 *
-	 * This class is passed the Database object so that it knows what to expect from
-	 * the XML file.
-	 *
-	 * @param      Database $database
-	 * @param      GeneratorConfig $config
-	 * @param      string $encoding Database encoding
-	 */
-	public function __construct(Database $database, GeneratorConfig $config, $encoding = 'iso-8859-1')
-	{
-		$this->database = $database;
-		$this->generatorConfig = $config;
-		$this->encoding = $encoding;
-	}
-
-	/**
-	 * Transform the data dump input file into SQL and writes it to the output stream.
-	 *
-	 * @param      PhingFile $xmlFile
-	 * @param      Writer $out
-	 */
-	public function transform(PhingFile $xmlFile, Writer $out)
-	{
-		$this->sqlWriter = $out;
-
-		// Reset some vars just in case this is being run multiple times.
-		$this->currTableName = $this->currBuilder = null;
-
-		$this->builderClazz = $this->generatorConfig->getBuilderClassname('datasql');
-
-		try {
-			$fr = new FileReader($xmlFile);
-		} catch (Exception $e) {
-			throw new BuildException("XML File not found: " . $xmlFile->getAbsolutePath());
-		}
-
-		$br = new BufferedReader($fr);
-
-		$this->parser = new ExpatParser($br);
-		$this->parser->parserSetOption(XML_OPTION_CASE_FOLDING, 0);
-		$this->parser->setHandler($this);
-
-		try {
-			$this->parser->parse();
-		} catch (Exception $e) {
-			print $e->getMessage() . "\n";
-			$br->close();
-		}
-		$br->close();
-	}
-
-	/**
-	 * Handles opening elements of the xml file.
-	 */
-	public function startElement($name, $attributes)
-	{
-		try {
-			if ($name == "dataset") {
-				// Clear any start/end DLL
-				call_user_func(array($this->builderClazz, 'reset'));
-				$this->sqlWriter->write(call_user_func(array($this->builderClazz, 'getDatabaseStartSql')));
-			} else {
-
-				// we're processing a row of data
-				// where tag name is phpName e.g. <BookReader .... />
-
-				$table = $this->database->getTableByPhpName($name);
-
-				$columnValues = array();
-				foreach ($attributes as $name => $value) {
-					$col = $table->getColumnByPhpName($name);
-					$columnValues[] = new ColumnValue($col, iconv('utf-8',$this->encoding, $value));
-				}
-
-				$data = new DataRow($table, $columnValues);
-
-				if ($this->currTableName !== $table->getName()) {
-					// new table encountered
-
-					if ($this->currBuilder !== null) {
-						$this->sqlWriter->write($this->currBuilder->getTableEndSql());
-					}
-
-					$this->currTableName = $table->getName();
-					$this->currBuilder = $this->generatorConfig->getConfiguredBuilder($table, 'datasql');
-
-					$this->sqlWriter->write($this->currBuilder->getTableStartSql());
-				}
-
-				// Write the SQL
-				$this->sqlWriter->write($this->currBuilder->buildRowSql($data));
-
-			}
-
-		} catch (Exception $e) {
-			// Exceptions have traditionally not bubbled up nicely from the expat parser,
-			// so we also print the stack trace here.
-			print $e;
-			throw $e;
-		}
-	}
-
-
-	/**
-	 * Handles closing elements of the xml file.
-	 *
-	 * @param      $name The local name (without prefix), or the empty string if
-	 *         Namespace processing is not being performed.
-	 */
-	public function endElement($name)
-	{
-		if (self::DEBUG) {
-			print("endElement(" . $name . ") called\n");
-		}
-		if ($name == "dataset") {
-			if ($this->currBuilder !== null) {
-				$this->sqlWriter->write($this->currBuilder->getTableEndSql());
-			}
-			$this->sqlWriter->write(call_user_func(array($this->builderClazz, 'getDatabaseEndSql')));
-		}
-	}
-
-} // XmlToData
-
-/**
- * "inner class"
- * @package    propel.engine.database.transform
- */
-class DataRow
-{
-	private $table;
-	private $columnValues;
-
-	public function __construct(Table $table, $columnValues)
-	{
-		$this->table = $table;
-		$this->columnValues = $columnValues;
-	}
-
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	public function getColumnValues()
-	{
-		return $this->columnValues;
-	}
-}
-
-/**
- * "inner" class
- * @package    propel.engine.database.transform
- */
-class ColumnValue {
-
-	private $col;
-	private $val;
-
-	public function __construct(Column $col, $val)
-	{
-		$this->col = $col;
-		$this->val = $val;
-	}
-
-	public function getColumn()
-	{
-		return $this->col;
-	}
-
-	public function getValue()
-	{
-		return $this->val;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/AppData.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/AppData.php
deleted file mode 100644
index 9ebedb4..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/AppData.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/*
- *  $Id: AppData.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/Database.php';
-
-/**
- * A class for holding application data structures.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon at opticode.co.za> (Torque)
- * @author     John McNally <jmcnally at collab.net> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class AppData {
-
-	/**
-	 * The list of databases for this application.
-	 * @var        array Database[]
-	 */
-	private $dbList = array();
-
-	/**
-	 * The platform class for our database(s).
-	 * @var        string
-	 */
-	private $platform;
-
-	/**
-	 * Name of the database. Only one database definition
-	 * is allowed in one XML descriptor.
-	 */
-	private $name;
-
-	/**
-	 * Flag to ensure that initialization is performed only once.
-	 * @var        boolean
-	 */
-	private $isInitialized = false;
-
-	/**
-	 * Creates a new instance for the specified database type.
-	 *
-	 * @param      Platform $platform The platform object to use for any databases added to this application model.
-	 */
-	public function __construct(Platform $platform)
-	{
-		$this->platform = $platform;
-	}
-  
-	/**
-	 * Gets the platform object to use for any databases added to this application model. 
-	 *
-	 * @return Platform
-	 */
-	public function getPlatform()
-	{
-	  return $this->platform;
-	}
-	
-	/**
-	 * Set the name of the database.
-	 *
-	 * @param      name of the database.
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the name of the database.
-	 *
-	 * @return     String name
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Get the short name of the database (without the '-schema' postfix).
-	 *
-	 * @return     String name
-	 */
-	public function getShortName()
-	{
-		return str_replace("-schema", "", $this->name);
-	}
-
-	/**
-	 * Return an array of all databases
-	 *
-	 * @return     Array of Database objects
-	 */
-	public function getDatabases($doFinalInit = true)
-	{
-		// this is temporary until we'll have a clean solution
-		// for packaging datamodels/requiring schemas
-		if ($doFinalInit) {
-			$this->doFinalInitialization();
-		}
-		return $this->dbList;
-	}
-
-	/**
-	 * Returns whether this application has multiple databases.
-	 *
-	 * @return     boolean True if the application has multiple databases
-	 */
-	public function hasMultipleDatabases()
-	{
-		return (count($this->dbList) > 1);
-	}
-
-	/**
-	 * Return the database with the specified name.
-	 *
-	 * @param      name database name
-	 * @return     A Database object.  If it does not exist it returns null
-	 */
-	public function getDatabase($name = null, $doFinalInit = true)
-	{
-		// this is temporary until we'll have a clean solution
-		// for packaging datamodels/requiring schemas
-		if ($doFinalInit) {
-			$this->doFinalInitialization();
-		}
-
-		if ($name === null) {
-			return $this->dbList[0];
-		}
-
-		for ($i=0,$size=count($this->dbList); $i < $size; $i++) {
-			$db = $this->dbList[$i];
-			if ($db->getName() === $name) {
-				return $db;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Add a database to the list and sets the AppData property to this
-	 * AppData
-	 *
-	 * @param      db the database to add
-	 */
-	public function addDatabase($db)
-	{
-		if ($db instanceof Database) {
-			$db->setAppData($this);
-			if ($db->getPlatform() === null) {
-				$db->setPlatform($this->platform);
-			}
-			$this->dbList[] = $db;
-			return $db;
-		} else {
-			// XML attributes array / hash
-			$d = new Database();
-			$d->loadFromXML($db);
-			return $this->addDatabase($d); // calls self w/ different param type
-		}
-
-	}
-
-	/**
-	 *
-	 * @return     void
-	 */
-	private function doFinalInitialization()
-	{
-		if (!$this->isInitialized) {
-			for ($i=0, $size=count($this->dbList); $i < $size; $i++) {
-				$this->dbList[$i]->doFinalInitialization();
-			}
-			$this->isInitialized = true;
-		}
-	}
-
-	/**
-	 * Creats a string representation of this AppData.
-	 * The representation is given in xml format.
-	 *
-	 * @return     string Representation in xml format
-	 */
-	public function toString()
-	{
-		$result = "<app-data>\n";
-		for ($i=0,$size=count($this->dbList); $i < $size; $i++) {
-			$result .= $this->dbList[$i]->toString();
-		}
-		$result .= "</app-data>";
-		return $result;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Behavior.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Behavior.php
deleted file mode 100644
index efbeef2..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Behavior.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/*
- *  $Id: Behavior.php 989 2008-03-11 14:29:30Z heltem $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/Index.php';
-
-/**
- * Information about behaviors of a table.
- *
- * @author     François Zaninotto
- * @version    $Revision: 989 $
- * @package    propel.engine.database.model
- */
-class Behavior extends XMLElement {
-
-  protected $table;
-  protected $database;
-  protected $name;
-  protected $parameters = array();
-  
-  public function setName($name)
-  {
-    $this->name = $name;
-  }  
-  
-  public function getName()
-  {
-    return $this->name;
-  }
-  
-  public function setTable(Table $table)
-  {
-    $this->table = $table;
-  }
-
-  public function getTable()
-  {
-    return $this->table;
-  }
-
-  public function setDatabase(Database $database)
-  {
-    $this->database = $database;
-  }
-
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-  
-  /**
-   * Add a parameter
-   * Expects an associative array looking like array('name' => 'foo', 'value' => bar)
-   *
-   * @param array associative array with name and value keys
-   */
-  public function addParameter($attribute)
-  {
-    $attribute = array_change_key_case($attribute, CASE_LOWER);
-    $this->parameters[$attribute['name']] = $attribute['value'];
-  }
-  
-  /**
-   * Overrides the behavior parameters
-   * Expects an associative array looking like array('foo' => 'bar')
-   *
-   * @param array associative array
-   */
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  
-  /**
-   * Get the associative array of parameters
-   * @return array 
-   */
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-
-  public function getParameter($name)
-  {
-    return $this->parameters[$name];
-  }
-
-  /**
-   * This method is automatically called on database behaviors when the database model is finished
-   * Propagate the behavior to the tables of the database
-   * Override this method to have a database behavior do something special
-   */
-  public function modifyDatabase()
-  {
-    foreach ($this->getDatabase()->getTables() as $table)
-    {
-      $b = clone $this;
-      $table->addBehavior($b);
-    }
-  }
-  
-  /**
-   * This method is automatically called on table behaviors when the database model is finished
-   * Override it to add columns to the current table
-   */
-  public function modifyTable()
-  {
-  }
-  
-  /**
-   * Retrieve a column object using a name stored in the behavior parameters
-   * Useful for table behaviors
-   * 
-   * @param  string    $param Name of the parameter storing the column name
-   * @return ColumnMap        The column of the table supporting the behavior
-   */
-  public function getColumnForParameter($param)
-  {
-  	return $this->getTable()->getColumn($this->getParameter($param));
-  }
-  
-  /**
-   * Sets up the Behavior object based on the attributes that were passed to loadFromXML().
-   * @see        parent::loadFromXML()
-   */
-  protected function setupObject()
-  {
-    $this->name = $this->getAttribute("name");
-  }
-    
-  /**
-   * @see        parent::appendXml(DOMNode)
-   */
-  public function appendXml(DOMNode $node)
-  {
-    $doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-    $bNode = $node->appendChild($doc->createElement('behavior'));
-    $bNode->setAttribute('name', $this->getName());
-
-    foreach ($this->parameters as $name => $value) {
-      $parameterNode = $bNode->appendChild($doc->createElement('parameter'));
-      $parameterNode->setAttribute('name', $name);
-      $parameterNode->setAttribute('value', $value);
-    }
-  }
-  
-  public function getTableModifier()
-  {
-    return $this;
-  }  
-  
-  public function getObjectBuilderModifier()
-  {
-    return $this;
-  }
-
-  public function getPeerBuilderModifier()
-  {
-    return $this;
-  }
-  
-  public function getTableMapBuilderModifier()
-  {
-    return $this;
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Column.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Column.php
deleted file mode 100644
index 2ca8b1c..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Column.php
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?php
-/*
- *  $Id: Column.php 1594 2010-03-15 09:16:23Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-include_once 'propel/engine/database/model/Inheritance.php';
-include_once 'propel/engine/database/model/Domain.php';
-include_once 'propel/engine/database/model/ColumnDefaultValue.php';
-
-/**
- * A Class for holding data about a column used in an Application.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon at opticode.co.za> (Torque)
- * @author     Jason van Zyl <jvanzyl at apache.org> (Torque)
- * @author     Jon S. Stevens <jon at latchkey.com> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @author     Byron Foster <byron_foster at yahoo.com> (Torque)
- * @author     Bernd Goldschmidt <bgoldschmidt at rapidsoft.de>
- * @version    $Revision: 1594 $
- * @package    propel.engine.database.model
- */
-class Column extends XMLElement {
-
-  const DEFAULT_TYPE = "VARCHAR";
-  const DEFAULT_VISIBILITY = 'public';
-  public static $valid_visibilities = array('public', 'protected', 'private');
-
-  private $name;
-  private $description;
-  private $phpName = null;
-  private $phpNamingMethod;
-  private $isNotNull = false;
-  private $size;
-  private $namePrefix;
-  private $accessorVisibility;
-  private $mutatorVisibility;
-
-  /**
-   * The name to use for the Peer constant that identifies this column.
-   * (Will be converted to all-uppercase in the templates.)
-   * @var        string
-   */
-  private $peerName;
-
-  /**
-   * Native PHP type (scalar or class name)
-   * @var        string "string", "boolean", "int", "double"
-   */
-  private $phpType;
-
-  /**
-   * @var        Table
-   */
-  private $parentTable;
-
-  private $position;
-  private $isPrimaryKey = false;
-  private $isNodeKey = false;
-  private $nodeKeySep;
-  private $isNestedSetLeftKey = false;
-  private $isNestedSetRightKey = false;
-  private $isTreeScopeKey = false;
-  private $isUnique = false;
-  private $isAutoIncrement = false;
-  private $isLazyLoad = false;
-  private $defaultValue;
-  private $referrers;
-  private $isPrimaryString = false;
-
-  // only one type is supported currently, which assumes the
-  // column either contains the classnames or a key to
-  // classnames specified in the schema.  Others may be
-  // supported later.
-  private $inheritanceType;
-  private $isInheritance;
-  private $isEnumeratedClasses;
-  private $inheritanceList;
-  private $needsTransactionInPostgres; //maybe this can be retrieved from vendorSpecificInfo
-
-  /** class name to do input validation on this column */
-  private $inputValidator = null;
-
-  /**
-   * @var        Domain The domain object associated with this Column.
-   */
-  private $domain;
-
-  /**
-   * Creates a new column and set the name
-   *
-   * @param      name column name
-   */
-  public function __construct($name = null)
-  {
-    $this->name = $name;
-  }
-
-  /**
-   * Return a comma delimited string listing the specified columns.
-   *
-   * @param      columns Either a list of <code>Column</code> objects, or
-   * a list of <code>String</code> objects with column names.
-   * @deprecated Use the DDLBuilder->getColumnList() method instead; this will be removed in 1.3
-   */
-  public static function makeList($columns, Platform $platform)
-  {
-    $list = array();
-    foreach ($columns as $col) {
-      if ($col instanceof Column) {
-        $col = $col->getName();
-      }
-      $list[] = $platform->quoteIdentifier($col);
-    }
-    return implode(", ", $list);
-  }
-
-  /**
-   * Sets up the Column object based on the attributes that were passed to loadFromXML().
-   * @see        parent::loadFromXML()
-   */
-  protected function setupObject()
-  {
-    try {
-      $dom = $this->getAttribute("domain");
-      if ($dom)  {
-        $this->getDomain()->copy($this->getTable()->getDatabase()->getDomain($dom));
-      } else {
-        $type = strtoupper($this->getAttribute("type"));
-        if ($type) {
-          $this->getDomain()->copy($this->getPlatform()->getDomainForType($type));
-        } else {
-          $this->getDomain()->copy($this->getPlatform()->getDomainForType(self::DEFAULT_TYPE));
-        }
-      }
-
-      $this->name = $this->getAttribute("name");
-      $this->phpName = $this->getAttribute("phpName");
-      $this->phpType = $this->getAttribute("phpType");
-
-      if ($this->getAttribute("prefix", null) !== null) {
-        $this->namePrefix = $this->getAttribute("prefix");
-      } elseif ($this->getTable()->getAttribute('columnPrefix', null) !== null) {
-        $this->namePrefix = $this->getTable()->getAttribute('columnPrefix');
-      } else {
-        $this->namePrefix = '';
-      }
-
-      // Accessor visibility
-      if ($this->getAttribute('accessorVisibility', null) !==  null) {
-        $this->setAccessorVisibility($this->getAttribute('accessorVisibility'));
-      } elseif ($this->getTable()->getAttribute('defaultAccessorVisibility', null) !== null) {
-        $this->setAccessorVisibility($this->getTable()->getAttribute('defaultAccessorVisibility'));
-      } elseif ($this->getTable()->getDatabase()->getAttribute('defaultAccessorVisibility', null) !== null) {
-        $this->setAccessorVisibility($this->getTable()->getDatabase()->getAttribute('defaultAccessorVisibility'));
-      } else {
-        $this->setAccessorVisibility(self::DEFAULT_VISIBILITY);
-      }
-
-      // Mutator visibility
-      if ($this->getAttribute('mutatorVisibility', null) !==  null) {
-        $this->setMutatorVisibility($this->getAttribute('mutatorVisibility'));
-      } elseif ($this->getTable()->getAttribute('defaultMutatorVisibility', null) !== null) {
-        $this->setMutatorVisibility($this->getTable()->getAttribute('defaultMutatorVisibility'));
-      } elseif ($this->getTable()->getDatabase()->getAttribute('defaultMutatorVisibility', null) !== null) {
-        $this->setMutatorVisibility($this->getTable()->getDatabase()->getAttribute('defaultMutatorVisibility'));
-      } else {
-        $this->setMutatorVisibility(self::DEFAULT_VISIBILITY);
-      }
-
-      $this->peerName = $this->getAttribute("peerName");
-
-      // retrieves the method for converting from specified name to a PHP name, defaulting to parent tables default method
-      $this->phpNamingMethod = $this->getAttribute("phpNamingMethod", $this->parentTable->getDatabase()->getDefaultPhpNamingMethod());
-
-      $this->isPrimaryString = $this->booleanValue($this->getAttribute("primaryString"));
-      
-      $this->isPrimaryKey = $this->booleanValue($this->getAttribute("primaryKey"));
-
-      $this->isNodeKey = $this->booleanValue($this->getAttribute("nodeKey"));
-      $this->nodeKeySep = $this->getAttribute("nodeKeySep", ".");
-
-      $this->isNestedSetLeftKey = $this->booleanValue($this->getAttribute("nestedSetLeftKey"));
-      $this->isNestedSetRightKey = $this->booleanValue($this->getAttribute("nestedSetRightKey"));
-      $this->isTreeScopeKey = $this->booleanValue($this->getAttribute("treeScopeKey"));
-
-      $this->isNotNull = ($this->booleanValue($this->getAttribute("required"), false) || $this->isPrimaryKey); // primary keys are required
-
-      //AutoIncrement/Sequences
-      $this->isAutoIncrement = $this->booleanValue($this->getAttribute("autoIncrement"));
-      $this->isLazyLoad = $this->booleanValue($this->getAttribute("lazyLoad"));
-
-      // Add type, size information to associated Domain object
-      $this->getDomain()->replaceSqlType($this->getAttribute("sqlType"));
-      if (!$this->getAttribute("size") && $this->getDomain()->getType() == 'VARCHAR' && !$this->getAttribute("sqlType")) {
-        $size = 255;
-      } else {
-        $size = $this->getAttribute("size");
-      }
-      $this->getDomain()->replaceSize($size);
-      $this->getDomain()->replaceScale($this->getAttribute("scale"));
-
-      $defval = $this->getAttribute("defaultValue", $this->getAttribute("default"));
-      if ($defval !== null && strtolower($defval) !== 'null') {
-        $this->getDomain()->setDefaultValue(new ColumnDefaultValue($defval, ColumnDefaultValue::TYPE_VALUE));
-      } elseif ($this->getAttribute("defaultExpr") !== null) {
-        $this->getDomain()->setDefaultValue(new ColumnDefaultValue($this->getAttribute("defaultExpr"), ColumnDefaultValue::TYPE_EXPR));
-      }
-
-      $this->inheritanceType = $this->getAttribute("inheritance");
-      $this->isInheritance = ($this->inheritanceType !== null
-      && $this->inheritanceType !== "false"); // here we are only checking for 'false', so don't
-      // use boleanValue()
-
-      $this->inputValidator = $this->getAttribute("inputValidator");
-      $this->description = $this->getAttribute("description");
-    } catch (Exception $e) {
-      throw new EngineException("Error setting up column " . var_export($this->getAttribute("name"), true) . ": " . $e->getMessage());
-    }
-  }
-
-  /**
-   * Gets domain for this column, creating a new empty domain object if none is set.
-   * @return     Domain
-   */
-  public function getDomain()
-  {
-    if ($this->domain === null) {
-      $this->domain = new Domain();
-    }
-    return $this->domain;
-  }
-
-  /**
-   * Returns table.column
-   */
-  public function getFullyQualifiedName()
-  {
-    return ($this->parentTable->getName() . '.' . $this->getName());
-  }
-
-  /**
-   * Get the name of the column
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set the name of the column
-   */
-  public function setName($newName)
-  {
-    $this->name = $newName;
-  }
-
-  /**
-   * Get the description for the Table
-   */
-  public function getDescription()
-  {
-    return $this->description;
-  }
-
-  /**
-   * Set the description for the Table
-   *
-   * @param      newDescription description for the Table
-   */
-  public function setDescription($newDescription)
-  {
-    $this->description = $newDescription;
-  }
-
-  /**
-   * Get name to use in PHP sources. It will set & return
-   * a self-generated phpName from it's name if it's
-   * not already set.
-   * @return     string
-   */
-  public function getPhpName()
-  {
-    if ($this->phpName === null) {
-      $this->setPhpName();
-    }
-    return $this->phpName;
-  }
-
-  /**
-   * Set name to use in PHP sources.
-   * 
-   * It will generate a phpName from it's name if no
-   * $phpName is passed.
-   * 
-   * @param   String $phpName PhpName to be set
-   */
-  public function setPhpName($phpName = null)
-  {
-    if ($phpName == null) {
-      $this->phpName = self::generatePhpName($this->name, $this->phpNamingMethod, $this->namePrefix);
-    } else {
-      $this->phpName = $phpName;
-    }
-  }
-
-  /**
-   * Get studly version of PHP name.
-   *
-   * The studly name is the PHP name with the first character lowercase.
-   *
-   * @return     string
-   */
-  public function getStudlyPhpName()
-  {
-    $phpname = $this->getPhpName();
-    if (strlen($phpname) > 1) {
-      return strtolower(substr($phpname, 0, 1)) . substr($phpname, 1);
-    } else { // 0 or 1 chars (I suppose that's rare)
-      return strtolower($phpname);
-    }
-  }
-
-  /**
-   * Get the visibility of the accessors of this column / attribute
-   * @return     string
-   */
-  public function getAccessorVisibility() {
-    if ($this->accessorVisibility !== null) {
-      return $this->accessorVisibility;
-    } else {
-      return self::DEFAULT_VISIBILITY;
-    }
-  }
-
-  /**
-   * Set the visibility of the accessor methods for this column / attribute
-   * @param      $newVisibility string
-   */
-  public function setAccessorVisibility($newVisibility) {
-    if (in_array($newVisibility, self::$valid_visibilities)) {
-      $this->accessorVisibility = $newVisibility;
-    } else {
-      $this->accessorVisibility = self::DEFAULT_VISIBILITY;
-    }
-
-  }
-
-  /**
-   * Get the visibility of the mutator of this column / attribute
-   * @return     string
-   */
-  public function getMutatorVisibility() {
-    if ($this->mutatorVisibility !== null) {
-      return $this->mutatorVisibility;
-    } else {
-      return self::DEFAULT_VISIBILITY;
-    }
-  }
-
-  /**
-   * Set the visibility of the mutator methods for this column / attribute
-   * @param      $newVisibility string
-   */
-  public function setMutatorVisibility($newVisibility) {
-    if (in_array($newVisibility, self::$valid_visibilities)) {
-      $this->mutatorVisibility = $newVisibility;
-    } else {
-      $this->mutatorVisibility = self::DEFAULT_VISIBILITY;
-    }
-
-  }
-
-  /**
-   * Get the column constant name (e.g. PeerName::COLUMN_NAME).
-   *
-   * @return     string A column constant name for insertion into PHP code
-   */
-  public function getConstantName()
-  {
-    $classname = $this->getTable()->getPhpName() . 'Peer';
-    // was it overridden in schema.xml ?
-    if ($this->getPeerName()) {
-      $const = strtoupper($this->getPeerName());
-    } else {
-      $const = strtoupper($this->getName());
-    }
-    return $classname.'::'.$const;
-  }
-
-  /**
-   * Get the Peer constant name that will identify this column.
-   * @return     string
-   */
-  public function getPeerName() {
-    return $this->peerName;
-  }
-
-  /**
-   * Set the Peer constant name that will identify this column.
-   * @param      $name string
-   */
-  public function setPeerName($name) {
-    $this->peerName = $name;
-  }
-
-  /**
-   * Get type to use in PHP sources.
-   *
-   * If no type has been specified, then uses results of getPhpNative().
-   *
-   * @return     string The type name.
-   * @see        getPhpNative()
-   */
-  public function getPhpType()
-  {
-    if ($this->phpType !== null) {
-      return $this->phpType;
-    }
-    return $this->getPhpNative();
-  }
-
-  /**
-   * Get the location of this column within the table (one-based).
-   * @return     int value of position.
-   */
-  public function getPosition()
-  {
-    return $this->position;
-  }
-
-  /**
-   * Get the location of this column within the table (one-based).
-   * @param      int $v Value to assign to position.
-   */
-  public function setPosition($v)
-  {
-    $this->position = $v;
-  }
-
-  /**
-   * Set the parent Table of the column
-   */
-  public function setTable(Table $parent)
-  {
-    $this->parentTable = $parent;
-  }
-
-  /**
-   * Get the parent Table of the column
-   */
-  public function getTable()
-  {
-    return $this->parentTable;
-  }
-
-  /**
-   * Returns the Name of the table the column is in
-   */
-  public function getTableName()
-  {
-    return $this->parentTable->getName();
-  }
-
-  /**
-   * Adds a new inheritance definition to the inheritance list and set the
-   * parent column of the inheritance to the current column
-   * @param      mixed $inhdata Inheritance or XML data.
-   */
-  public function addInheritance($inhdata)
-  {
-    if ($inhdata instanceof Inheritance) {
-      $inh = $inhdata;
-      $inh->setColumn($this);
-      if ($this->inheritanceList === null) {
-        $this->inheritanceList = array();
-        $this->isEnumeratedClasses = true;
-      }
-      $this->inheritanceList[] = $inh;
-      return $inh;
-    } else {
-      $inh = new Inheritance();
-      $inh->loadFromXML($inhdata);
-      return $this->addInheritance($inh);
-    }
-  }
-
-  /**
-   * Get the inheritance definitions.
-   */
-  public function getChildren()
-  {
-    return $this->inheritanceList;
-  }
-
-  /**
-   * Determine if this column is a normal property or specifies a
-   * the classes that are represented in the table containing this column.
-   */
-  public function isInheritance()
-  {
-    return $this->isInheritance;
-  }
-
-  /**
-   * Determine if possible classes have been enumerated in the xml file.
-   */
-  public function isEnumeratedClasses()
-  {
-    return $this->isEnumeratedClasses;
-  }
-
-  /**
-   * Return the isNotNull property of the column
-   */
-  public function isNotNull()
-  {
-    return $this->isNotNull;
-  }
-
-  /**
-   * Set the isNotNull property of the column
-   */
-  public function setNotNull($status)
-  {
-    $this->isNotNull = (boolean) $status;
-  }
-
-  /**
-   * Return NOT NULL String for this column
-   *
-   * @return     "NOT NULL" if null values are not allowed or an empty string.
-   */
-  public function getNotNullString()
-  {
-    return $this->getTable()->getDatabase()->getPlatform()->getNullString($this->isNotNull());
-  }
-
-  /**
-   * Set whether the column is the primary string, 
-   * i.e. whether its value is the default string representation of the table
-   * @param      boolean $v
-   */
-  public function setPrimaryString($v)
-  {
-    $this->isPrimaryString = (boolean) $v;
-  }
-
-  /**
-   * Return true if the column is the primary string,
-   * i.e. if its value is the default string representation of the table
-   */
-  public function isPrimaryString()
-  {
-    return $this->isPrimaryString;
-  }
-
-  /**
-   * Set whether the column is a primary key or not.
-   * @param      boolean $v
-   */
-  public function setPrimaryKey($v)
-  {
-    $this->isPrimaryKey = (boolean) $v;
-  }
-
-  /**
-   * Return true if the column is a primary key
-   */
-  public function isPrimaryKey()
-  {
-    return $this->isPrimaryKey;
-  }
-
-  /**
-   * Set if the column is the node key of a tree
-   */
-  public function setNodeKey($nk)
-  {
-    $this->isNodeKey = (boolean) $nk;
-  }
-
-  /**
-   * Return true if the column is a node key of a tree
-   */
-  public function isNodeKey()
-  {
-    return $this->isNodeKey;
-  }
-
-  /**
-   * Set if the column is the node key of a tree
-   */
-  public function setNodeKeySep($sep)
-  {
-    $this->nodeKeySep = (string) $sep;
-  }
-
-  /**
-   * Return true if the column is a node key of a tree
-   */
-  public function getNodeKeySep()
-  {
-    return $this->nodeKeySep;
-  }
-
-  /**
-   * Set if the column is the nested set left key of a tree
-   */
-  public function setNestedSetLeftKey($nslk)
-  {
-    $this->isNestedSetLeftKey = (boolean) $nslk;
-  }
-
-  /**
-   * Return true if the column is a nested set key of a tree
-   */
-  public function isNestedSetLeftKey()
-  {
-    return $this->isNestedSetLeftKey;
-  }
-
-  /**
-   * Set if the column is the nested set right key of a tree
-   */
-  public function setNestedSetRightKey($nsrk)
-  {
-    $this->isNestedSetRightKey = (boolean) $nsrk;
-  }
-
-  /**
-   * Return true if the column is a nested set right key of a tree
-   */
-  public function isNestedSetRightKey()
-  {
-    return $this->isNestedSetRightKey;
-  }
-
-  /**
-   * Set if the column is the scope key of a tree
-   */
-  public function setTreeScopeKey($tsk)
-  {
-    $this->isTreeScopeKey = (boolean) $tsk;
-  }
-
-  /**
-   * Return true if the column is a scope key of a tree
-   * @return     boolean
-   */
-  public function isTreeScopeKey()
-  {
-    return $this->isTreeScopeKey;
-  }
-
-  /**
-   * Set true if the column is UNIQUE
-   * @param      boolean $u
-   */
-  public function setUnique($u)
-  {
-    $this->isUnique = $u;
-  }
-
-  /**
-   * Get the UNIQUE property.
-   * @return     boolean
-   */
-  public function isUnique()
-  {
-    return $this->isUnique;
-  }
-
-  /**
-   * Return true if the column requires a transaction in Postgres
-   * @return     boolean
-   */
-  public function requiresTransactionInPostgres()
-  {
-    return $this->needsTransactionInPostgres;
-  }
-
-  /**
-   * Utility method to determine if this column is a foreign key.
-   * @return     boolean
-   */
-  public function isForeignKey()
-  {
-    return (count($this->getForeignKeys()) > 0);
-  }
-
-  /**
-   * Whether this column is a part of more than one foreign key.
-   * @return     boolean
-   */
-  public function hasMultipleFK()
-  {
-    return (count($this->getForeignKeys()) > 1);
-  }
-
-  /**
-   * Get the foreign key objects for this column (if it is a foreign key or part of a foreign key)
-   * @return     array
-   */
-  public function getForeignKeys()
-  {
-    return $this->parentTable->getColumnForeignKeys($this->name);
-  }
-
-  /**
-   * Adds the foreign key from another table that refers to this column.
-   */
-  public function addReferrer(ForeignKey $fk)
-  {
-    if ($this->referrers === null) {
-      $this->referrers = array();
-    }
-    $this->referrers[] = $fk;
-  }
-
-  /**
-   * Get list of references to this column.
-   */
-  public function getReferrers()
-  {
-    if ($this->referrers === null) {
-      $this->referrers = array();
-    }
-    return $this->referrers;
-  }
-
-  /**
-   * Sets the domain up for specified Propel type.
-   *
-   * Calling this method will implicitly overwrite any previously set type,
-   * size, scale (or other domain attributes).
-   *
-   * @param      string $propelType
-   */
-  public function setDomainForType($propelType)
-  {
-    $this->getDomain()->copy($this->getPlatform()->getDomainForType($propelType));
-  }
-
-  /**
-   * Sets the propel colunm type.
-   * @param      string $propelType
-   * @see        Domain::setType()
-   */
-  public function setType($propelType)
-  {
-    $this->getDomain()->setType($propelType);
-    if ($propelType == PropelTypes::VARBINARY|| $propelType == PropelTypes::LONGVARBINARY || $propelType == PropelTypes::BLOB) {
-      $this->needsTransactionInPostgres = true;
-    }
-  }
-
-  /**
-   * Returns the Propel column type as a string.
-   * @return     string The constant representing Creole type: e.g. "VARCHAR".
-   * @see        Domain::getType()
-   */
-  public function getType()
-  {
-    return $this->getDomain()->getType();
-  }
-
-  /**
-   * Returns the column PDO type integer for this column's Propel type.
-   * @return     int The integer value representing PDO type param: e.g. PDO::PARAM_INT
-   */
-  public function getPDOType()
-  {
-    return PropelTypes::getPDOType($this->getType());
-  }
-
-  /**
-   * Returns the column type as given in the schema as an object
-   */
-  public function getPropelType()
-  {
-    return $this->getType();
-  }
-
-  /**
-   * Utility method to know whether column needs Blob/Lob handling.
-   * @return     boolean
-   */
-  public function isLobType()
-  {
-    return PropelTypes::isLobType($this->getType());
-  }
-
-  /**
-   * Utility method to see if the column is text type.
-   */
-  public function isTextType()
-  {
-    return PropelTypes::isTextType($this->getType());
-  }
-
-  /**
-   * Utility method to see if the column is numeric type.
-   * @return     boolean
-   */
-  public function isNumericType()
-  {
-    return PropelTypes::isNumericType($this->getType());
-  }
-
-  /**
-   * Utility method to know whether column is a temporal column.
-   * @return     boolean
-   */
-  public function isTemporalType()
-  {
-    return PropelTypes::isTemporalType($this->getType());
-  }
-
-  /**
-   * @see        XMLElement::appendXml(DOMNode)
-   */
-  public function appendXml(DOMNode $node)
-  {
-    $doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-    $colNode = $node->appendChild($doc->createElement('column'));
-    $colNode->setAttribute('name', $this->name);
-
-    if ($this->phpName !== null) {
-      $colNode->setAttribute('phpName', $this->getPhpName());
-    }
-
-    $colNode->setAttribute('type', $this->getType());
-
-    $domain = $this->getDomain();
-
-    if ($domain->getSize() !== null) {
-      $colNode->setAttribute('size', $domain->getSize());
-    }
-
-    if ($domain->getScale() !== null) {
-      $colNode->setAttribute('scale', $domain->getScale());
-    }
-
-    if ($this->isPrimaryKey) {
-      $colNode->setAttribute('primaryKey', var_export($this->isPrimaryKey, true));
-    }
-
-    if ($this->isAutoIncrement) {
-      $colNode->setAttribute('autoIncrement', var_export($this->isAutoIncrement, true));
-    }
-
-    if ($this->isNotNull) {
-      $colNode->setAttribute('required', 'true');
-    } else {
-      $colNode->setAttribute('required', 'false');
-    }
-
-    if ($domain->getDefaultValue() !== null) {
-      $def = $domain->getDefaultValue();
-      if ($def->isExpression()) {
-        $colNode->setAttribute('defaultExpr', $def->getValue());
-      } else {
-        $colNode->setAttribute('defaultValue', $def->getValue());
-      }
-    }
-
-    if ($this->isInheritance()) {
-      $colNode->setAttribute('inheritance', $this->inheritanceType);
-      foreach ($this->inheritanceList as $inheritance) {
-        $inheritance->appendXml($colNode);
-      }
-    }
-
-    if ($this->isNodeKey()) {
-      $colNode->setAttribute('nodeKey', 'true');
-      if ($this->getNodeKeySep() !== null) {
-        $colNode->setAttribute('nodeKeySep', $this->nodeKeySep);
-      }
-    }
-
-    foreach ($this->vendorInfos as $vi) {
-      $vi->appendXml($colNode);
-    }
-  }
-
-  /**
-   * Returns the size of the column
-   * @return     string
-   */
-  public function getSize()
-  {
-    return $this->domain->getSize();
-  }
-
-  /**
-   * Set the size of the column
-   * @param      string $newSize
-   */
-  public function setSize($newSize)
-  {
-    $this->domain->setSize($newSize);
-  }
-
-  /**
-   * Returns the scale of the column
-   * @return     string
-   */
-  public function getScale()
-  {
-    return $this->domain->getScale();
-  }
-
-  /**
-   * Set the scale of the column
-   * @param      string $newScale
-   */
-  public function setScale($newScale)
-  {
-    $this->domain->setScale($newScale);
-  }
-
-  /**
-   * Return the size in brackets for use in an sql
-   * schema if the type is String.  Otherwise return an empty string
-   */
-  public function printSize()
-  {
-    return $this->domain->printSize();
-  }
-
-  /**
-   * Return a string that will give this column a default value.
-   * @return     string
-   */
-  public function getDefaultSetting()
-  {
-    $dflt = "";
-    $defaultValue = $this->getDefaultValue();
-    if ($defaultValue !== null) {
-      $dflt .= "default ";
-
-      if ($this->getDefaultValue()->isExpression()) {
-        $dflt .= $this->getDefaultValue()->getValue();
-      } else {
-        if ($this->isTextType()) {
-          $dflt .= $this->getPlatform()->quote($defaultValue->getValue());
-        } elseif ($this->getType() == PropelTypes::BOOLEAN) {
-          $dflt .= $this->getPlatform()->getBooleanString($defaultValue->getValue());
-        } else {
-          $dflt .= $defaultValue->getValue();
-        }
-      }
-    }
-    return $dflt;
-  }
-
-  /**
-   * Return a string that will give this column a default value in PHP
-   * @return     string
-   */
-  public function getDefaultValueString()
-  {
-    $defaultValue = $this->getDefaultValue();
-    if ($defaultValue !== null) {
-      if ($this->isNumericType()) {
-        $dflt = (float) $defaultValue->getValue();
-      } elseif ($this->isTextType() || $this->getDefaultValue()->isExpression()) {
-        $dflt = "'" . str_replace("'", "\'", $defaultValue->getValue()) . "'";
-      } elseif ($this->getType() == PropelTypes::BOOLEAN) {
-        $dflt = $this->booleanValue($defaultValue->getValue()) ? 'true' : 'false';
-      } else {
-        $dflt = "'" . $defaultValue->getValue() . "'";
-      }
-    } else {
-      $dflt = "null";
-    }
-    return $dflt;
-  }
-  
-  /**
-   * Set a string that will give this column a default value.
-   */
-  public function setDefaultValue($def)
-  {
-    $this->domain->setDefaultValue($def);
-  }
-
-  /**
-   * Get the default value object for this column.
-   * @return     ColumnDefaultValue
-   * @see        Domain::getDefaultValue()
-   */
-  public function getDefaultValue()
-  {
-    return $this->domain->getDefaultValue();
-  }
-
-  /**
-   * Get the default value suitable for use in PHP.
-   * @return     mixed
-   * @see        Domain::getPhpDefaultValue()
-   */
-  public function getPhpDefaultValue()
-  {
-    return $this->domain->getPhpDefaultValue();
-  }
-
-  /**
-   * Returns the class name to do input validation
-   */
-  public function getInputValidator()
-  {
-    return $this->inputValidator;
-  }
-
-  /**
-   * Return auto increment/sequence string for the target database. We need to
-   * pass in the props for the target database!
-   */
-  public function isAutoIncrement()
-  {
-    return $this->isAutoIncrement;
-  }
-
-  /**
-   * Return auto increment/sequence string for the target database. We need to
-   * pass in the props for the target database!
-   */
-  public function isLazyLoad()
-  {
-    return $this->isLazyLoad;
-  }
-
-  /**
-   * Gets the auto-increment string.
-   * @return     string
-   */
-  public function getAutoIncrementString()
-  {
-    if ($this->isAutoIncrement()&& IDMethod::NATIVE === $this->getTable()->getIdMethod()) {
-      return $this->getPlatform()->getAutoIncrement();
-    } elseif ($this->isAutoIncrement()) {
-      throw new EngineException("You have specified autoIncrement for column '" . $this->name . "' but you have not specified idMethod=\"native\" for table '" . $this->getTable()->getName() . "'.");
-    }
-    return "";
-  }
-
-  /**
-   * Set the auto increment value.
-   * Use isAutoIncrement() to find out if it is set or not.
-   */
-  public function setAutoIncrement($value)
-  {
-    $this->isAutoIncrement = (boolean) $value;
-  }
-
-  /**
-   * Set the column type from a string property
-   * (normally a string from an sql input file)
-   *
-   * @deprecated Do not use; this will be removed in next release.
-   */
-  public function setTypeFromString($typeName, $size)
-  {
-    $tn = strtoupper($typeName);
-    $this->setType($tn);
-
-    if ($size !== null) {
-      $this->size = $size;
-    }
-
-    if (strpos($tn, "CHAR") !== false) {
-      $this->domain->setType(PropelTypes::VARCHAR);
-    } elseif (strpos($tn, "INT") !== false) {
-      $this->domain->setType(PropelTypes::INTEGER);
-    } elseif (strpos($tn, "FLOAT") !== false) {
-      $this->domain->setType(PropelTypes::FLOAT);
-    } elseif (strpos($tn, "DATE") !== false) {
-      $this->domain->setType(PropelTypes::DATE);
-    } elseif (strpos($tn, "TIME") !== false) {
-      $this->domain->setType(PropelTypes::TIMESTAMP);
-    } else if (strpos($tn, "BINARY") !== false) {
-      $this->domain->setType(PropelTypes::LONGVARBINARY);
-    } else {
-      $this->domain->setType(PropelTypes::VARCHAR);
-    }
-  }
-
-  /**
-   * Return a string representation of the native PHP type which corresponds
-   * to the propel type of this column. Use in the generation of Base objects.
-   *
-   * @return     string PHP datatype used by propel.
-   */
-  public function getPhpNative()
-  {
-    return PropelTypes::getPhpNative($this->getType());
-  }
-
-  /**
-   * Returns true if the column's PHP native type is an boolean, int, long, float, double, string.
-   * @return     boolean
-   * @see        PropelTypes::isPhpPrimitiveType()
-   */
-  public function isPhpPrimitiveType()
-  {
-    return PropelTypes::isPhpPrimitiveType($this->getPhpType());
-  }
-
-  /**
-   * Return true if column's PHP native type is an boolean, int, long, float, double.
-   * @return     boolean
-   * @see        PropelTypes::isPhpPrimitiveNumericType()
-   */
-  public function isPhpPrimitiveNumericType()
-  {
-    return PropelTypes::isPhpPrimitiveNumericType($this->getPhpType());
-  }
-
-  /**
-   * Returns true if the column's PHP native type is a class name.
-   * @return     boolean
-   * @see        PropelTypes::isPhpObjectType()
-   */
-  public function isPhpObjectType()
-  {
-    return PropelTypes::isPhpObjectType($this->getPhpType());
-  }
-
-  /**
-   * Get the platform/adapter impl.
-   *
-   * @return     Platform
-   */
-  public function getPlatform()
-  {
-    return $this->getTable()->getDatabase()->getPlatform();
-  }
-
-  /**
-   *
-   * @return     string
-   * @deprecated Use DDLBuilder->getColumnDDL() instead; this will be removed in 1.3
-   */
-  public function getSqlString()
-  {
-    $sb = "";
-    $sb .= $this->getPlatform()->quoteIdentifier($this->getName()) . " ";
-    $sb .= $this->getDomain()->getSqlType();
-    if ($this->getPlatform()->hasSize($this->getDomain()->getSqlType())) {
-      $sb .= $this->getDomain()->printSize();
-    }
-    $sb .= " ";
-    $sb .= $this->getDefaultSetting() . " ";
-    $sb .= $this->getNotNullString() . " ";
-    $sb .= $this->getAutoIncrementString();
-    return trim($sb);
-  }
-  
-  public static function generatePhpName($name, $phpNamingMethod = PhpNameGenerator::CONV_METHOD_CLEAN, $namePrefix = null) {
-    return NameFactory::generateName(NameFactory::PHP_GENERATOR, array($name, $phpNamingMethod, $namePrefix));
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ColumnDefaultValue.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ColumnDefaultValue.php
deleted file mode 100644
index a77eaf4..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ColumnDefaultValue.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/*
- *  $Id: ColumnDefaultValue.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A class for holding a column default value.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class ColumnDefaultValue {
-
-	const TYPE_VALUE = "value";
-	const TYPE_EXPR = "expr";
-
-	/**
-	 * @var        string The default value, as specified in the schema.
-	 */
-	private $value;
-
-	/**
-	 * @var        string The type of value represented by this object (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR).
-	 */
-	private $type = ColumnDefaultValue::TYPE_VALUE;
-
-	/**
-	 * Creates a new DefaultValue object.
-	 *
-	 * @param      string $value The default value, as specified in the schema.
-	 * @param      string $type The type of default value (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR)
-	 */
-	public function __construct($value, $type = null)
-	{
-		$this->setValue($value);
-		if ($type !== null) {
-			$this->setType($type);
-		}
-	}
-
-	/**
-	 * @return     string The type of default value (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR)
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * @param      string $type The type of default value (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR)
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
-	}
-
-	/**
-	 * Convenience method to indicate whether the value in this object is an expression (as opposed to simple value).
-	 *
-	 * @return     boolean Whether value this object holds is an expression.
-	 */
-	public function isExpression()
-	{
-		return ($this->type == self::TYPE_EXPR);
-	}
-
-	/**
-	 * @return     string The value, as specified in the schema.
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * @param      string $value The value, as specified in the schema.
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ConstraintNameGenerator.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ConstraintNameGenerator.php
deleted file mode 100644
index 204b63e..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ConstraintNameGenerator.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- *  $Id: ConstraintNameGenerator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * A <code>NameGenerator</code> implementation for table-specific
- * constraints.  Conforms to the maximum column name length for the
- * type of database in use.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class ConstraintNameGenerator implements NameGenerator {
-	/**
-	 * Conditional compilation flag.
-	 */
-	const DEBUG = false;
-
-	/**
-	 * First element of <code>inputs</code> should be of type {@link Database}, second
-	 * should be a table name, third is the type identifier (spared if
-	 * trimming is necessary due to database type length constraints),
-	 * and the fourth is a <code>Integer</code> indicating the number
-	 * of this contraint.
-	 *
-	 * @see        NameGenerator
-	 * @throws     EngineException
-	 */
-	public function generateName($inputs)
-	{
-
-		$db = $inputs[0];
-		$name = $inputs[1];
-		$namePostfix = $inputs[2];
-		$constraintNbr = (string) $inputs[3];
-
-		// Calculate maximum RDBMS-specific column character limit.
-		$maxBodyLength = -1;
-		try {
-			$maxColumnNameLength = (int) $db->getPlatform()->getMaxColumnNameLength();
-			$maxBodyLength = ($maxColumnNameLength - strlen($namePostfix)
-					- strlen($constraintNbr) - 2);
-
-			if (self::DEBUG) {
-				print("maxColumnNameLength=" . $maxColumnNameLength
-						. " maxBodyLength=" . $maxBodyLength . "\n");
-			}
-		} catch (EngineException $e) {
-			echo $e;
-			throw $e;
-		}
-
-		// Do any necessary trimming.
-		if ($maxBodyLength !== -1 && strlen($name) > $maxBodyLength) {
-			$name = substr($name, 0, $maxBodyLength);
-		}
-
-		$name .= self::STD_SEPARATOR_CHAR . $namePostfix
-			. self::STD_SEPARATOR_CHAR . $constraintNbr;
-
-		return $name;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Database.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Database.php
deleted file mode 100644
index e883e27..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Database.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-
-/*
- *  $Id: Database.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/database/model/IDMethod.php';
-include_once 'propel/engine/database/model/NameGenerator.php';
-include_once 'propel/engine/database/model/Table.php';
-include_once 'propel/engine/database/model/Behavior.php';
-
-
-/**
- * A class for holding application data structures.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon at opticode.co.za> (Torque)
- * @author     John McNally<jmcnally at collab.net> (Torque)
- * @author     Martin Poeschl<mpoeschl at marmot.at> (Torque)
- * @author     Daniel Rall<dlr at collab.net> (Torque)
- * @author     Byron Foster <byron_foster at yahoo.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Database extends XMLElement {
-
-	private $platform;
-	private $tableList = array();
-	private $curColumn;
-	private $name;
-	private $pkg;
-	private $baseClass;
-	private $basePeer;
-	private $defaultIdMethod;
-	private $defaultPhpNamingMethod;
-	private $defaultTranslateMethod;
-	private $dbParent;
-	private $tablesByName = array();
-	private $tablesByPhpName = array();
-	private $heavyIndexing;
-
-	private $domainMap = array();
-
-  /**
-   * List of behaviors registered for this table
-   * 
-   * @var array
-   */
-  protected $behaviors = array();
-
-	/**
-	 * Constructs a new Database object.
-	 *
-	 * @param      string $name
-	 */
-	public function __construct($name = null)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Sets up the Database object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->name = $this->getAttribute("name");
-		$this->pkg = $this->getAttribute("package");
-		$this->baseClass = $this->getAttribute("baseClass");
-		$this->basePeer = $this->getAttribute("basePeer");
-		$this->defaultIdMethod = $this->getAttribute("defaultIdMethod", IDMethod::NATIVE);
-		$this->defaultPhpNamingMethod = $this->getAttribute("defaultPhpNamingMethod", NameGenerator::CONV_METHOD_UNDERSCORE);
-		$this->defaultTranslateMethod = $this->getAttribute("defaultTranslateMethod", Validator::TRANSLATE_NONE);
-		$this->heavyIndexing = $this->booleanValue($this->getAttribute("heavyIndexing"));
-	}
-
-	/**
-	 * Returns the Platform implementation for this database.
-	 *
-	 * @return     Platform a Platform implementation
-	 */
-	public function getPlatform()
-	{
-		return $this->platform;
-	}
-
-	/**
-	 * Sets the Platform implementation for this database.
-	 *
-	 * @param      Platform $platform A Platform implementation
-	 */
-	public function setPlatform($platform)
-	{
-		$this->platform = $platform;
-	}
-
-	/**
-	 * Get the name of the Database
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Set the name of the Database
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the value of package.
-	 * @return     value of package.
-	 */
-	public function getPackage()
-	{
-		return $this->pkg;
-	}
-
-	/**
-	 * Set the value of package.
-	 * @param      v  Value to assign to package.
-	 */
-	public function setPackage($v)
-	{
-		$this->pkg = $v;
-	}
-
-	/**
-	 * Get the value of baseClass.
-	 * @return     value of baseClass.
-	 */
-	public function getBaseClass()
-	{
-		return $this->baseClass;
-	}
-
-	/**
-	 * Set the value of baseClass.
-	 * @param      v  Value to assign to baseClass.
-	 */
-	public function setBaseClass($v)
-	{
-		$this->baseClass = $v;
-	}
-
-	/**
-	 * Get the value of basePeer.
-	 * @return     value of basePeer.
-	 */
-	public function getBasePeer()
-	{
-		return $this->basePeer;
-	}
-
-	/**
-	 * Set the value of basePeer.
-	 * @param      v Value to assign to basePeer.
-	 */
-	public function setBasePeer($v)
-	{
-		$this->basePeer = $v;
-	}
-
-	/**
-	 * Get the value of defaultIdMethod.
-	 * @return     value of defaultIdMethod.
-	 */
-	public function getDefaultIdMethod()
-	{
-		return $this->defaultIdMethod;
-	}
-
-	/**
-	 * Set the value of defaultIdMethod.
-	 * @param      v Value to assign to defaultIdMethod.
-	 */
-	public function setDefaultIdMethod($v)
-	{
-		$this->defaultIdMethod = $v;
-	}
-
-	/**
-	 * Get the value of defaultPHPNamingMethod which specifies the
-	 * method for converting schema names for table and column to PHP names.
-	 * @return     string The default naming conversion used by this database.
-	 */
-	public function getDefaultPhpNamingMethod()
-	{
-		return $this->defaultPhpNamingMethod;
-	}
-
-	/**
-	 * Set the value of defaultPHPNamingMethod.
-	 * @param      string $v The default naming conversion for this database to use.
-	 */
-	public function setDefaultPhpNamingMethod($v)
-	{
-		$this->defaultPhpNamingMethod = $v;
-	}
-
-	/**
-	 * Get the value of defaultTranslateMethod which specifies the
-	 * method for translate validator error messages.
-	 * @return     string The default translate method.
-	 */
-	public function getDefaultTranslateMethod()
-	{
-		return $this->defaultTranslateMethod;
-	}
-
-	/**
-	 * Set the value of defaultTranslateMethod.
-	 * @param      string $v The default translate method to use.
-	 */
-	public function setDefaultTranslateMethod($v)
-	{
-		$this->defaultTranslateMethod = $v;
-	}
-
-	/**
-	 * Get the value of heavyIndexing.
-	 *
-	 * This is a synonym for getHeavyIndexing().
-	 *
-	 * @return     boolean Value of heavyIndexing.
-	 * @see        getHeavyIndexing()
-	 */
-	public function isHeavyIndexing()
-	{
-		return $this->getHeavyIndexing();
-	}
-
-	/**
-	 * Get the value of heavyIndexing.
-	 *
-	 * @return     boolean Value of heavyIndexing.
-	 */
-	public function getHeavyIndexing()
-	{
-		return $this->heavyIndexing;
-	}
-
-	/**
-	 * Set the value of heavyIndexing.
-	 * @param      boolean $v  Value to assign to heavyIndexing.
-	 */
-	public function setHeavyIndexing($v)
-	{
-		$this->heavyIndexing = (boolean) $v;
-	}
-
-	/**
-	 * Return an array of all tables
-	 */
-	public function getTables()
-	{
-		return $this->tableList;
-	}
-
-	/**
-	 * Return the table with the specified name.
-	 * @param      string $name The name of the table (e.g. 'my_table')
-	 * @return     Table a Table object or null if it doesn't exist
-	 */
-	public function getTable($name)
-	{
-		if (isset($this->tablesByName[$name])) {
-			return $this->tablesByName[$name];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * Return the table with the specified phpName.
-	 * @param      string $phpName the PHP Name of the table (e.g. 'MyTable')
-	 * @return     Table a Table object or null if it doesn't exist
-	 */
-	public function getTableByPhpName($phpName)
-	{
-		if (isset($this->tablesByPhpName[$phpName])) {
-			return $this->tablesByPhpName[$phpName];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * An utility method to add a new table from an xml attribute.
-	 */
-	public function addTable($data)
-	{
-		if ($data instanceof Table) {
-			$tbl = $data; // alias
-			$tbl->setDatabase($this);
-			if (isset($this->tablesByName[$tbl->getName()])) {
-				throw new EngineException("Duplicate table declared: " . $tbl->getName());
-			}
-			$this->tableList[] = $tbl;
-			$this->tablesByName[ $tbl->getName() ] = $tbl;
-			$this->tablesByPhpName[ $tbl->getPhpName() ] = $tbl;
-			if ($tbl->getPackage() === null) {
-				$tbl->setPackage($this->getPackage());
-			}
-			return $tbl;
-		} else {
-			$tbl = new Table();
-			$tbl->setDatabase($this);
-			$tbl->loadFromXML($data);
-			return $this->addTable($tbl); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Set the parent of the database
-	 */
-	public function setAppData(AppData $parent)
-	{
-		$this->dbParent = $parent;
-	}
-
-	/**
-	 * Get the parent of the table
-	 */
-	public function getAppData()
-	{
-		return $this->dbParent;
-	}
-
-	/**
-	 * Adds Domain object from <domain> tag.
-	 * @param      mixed XML attributes (array) or Domain object.
-	 */
-	public function addDomain($data) {
-
-		if ($data instanceof Domain) {
-			$domain = $data; // alias
-			$domain->setDatabase($this);
-			$this->domainMap[ $domain->getName() ] = $domain;
-			return $domain;
-		} else {
-			$domain = new Domain();
-			$domain->setDatabase($this);
-			$domain->loadFromXML($data);
-			return $this->addDomain($domain); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Get already configured Domain object by name.
-	 * @return     Domain
-	 */
-	public function getDomain($domainName)
-	{
-		if (isset($this->domainMap[$domainName])) {
-			return $this->domainMap[$domainName];
-		}
-		return null; // just to be explicit
-	}
-
-  public function getGeneratorConfig()
-  {
-    return $this->getAppData()->getPlatform()->getGeneratorConfig();
-  }
-  
-  /**
-   * Adds a new Behavior to the database
-   * @return Behavior A behavior instance
-   */
-  public function addBehavior($bdata)
-  {
-    if ($bdata instanceof Behavior) {
-      $behavior = $bdata;
-      $behavior->setDatabase($this);
-      $this->behaviors[$behavior->getName()] = $behavior;
-      return $behavior;
-    } else {
-      $class = $this->getConfiguredBehavior($bdata['name']);
-      $behavior = new $class();
-      $behavior->loadFromXML($bdata);
-      return $this->addBehavior($behavior);
-    }
-  }
-  
-  /**
-   * Get the database behaviors
-   * @return Array of Behavior objects
-   */
-  public function getBehaviors()
-  {
-    return $this->behaviors;
-  }
-  
-  /**
-   * Get one database behavior by name
-   * @param string $name the behavior name
-   * @return Behavior a behavior object
-   */
-  public function getBehavior($name)
-  {
-    return $this->behaviors[$name];
-  }
-
-
-	public function doFinalInitialization()
-	{
-	  $config = $this->getGeneratorConfig();
-    if($config && ($defaultBehaviors = $config->getBuildProperty('behaviorDefault')))
-    {
-      // add generic behaviors from build.properties 
-      $defaultBehaviors = explode(',', $defaultBehaviors);
-      foreach ($defaultBehaviors as $behavior)
-      {
-        $this->addBehavior(array('name' => trim($behavior)));
-      }
-    }
-    
-    // execute behavior database modifiers
-    foreach ($this->getBehaviors() as $behavior)
-    {
-      $behavior->modifyDatabase();
-    }
-
-		$tables = $this->getTables();
-
-		for ($i=0,$size=count($tables); $i < $size; $i++) {
-			$currTable = $tables[$i];
-
-			// check schema integrity
-			// if idMethod="autoincrement", make sure a column is
-			// specified as autoIncrement="true"
-			// FIXME: Handle idMethod="native" via DB adapter.
-			/*
-
-			--- REMOVING THIS BECAUSE IT'S ANNOYING
-
-			if ($currTable->getIdMethod() == IDMethod::NATIVE ) {
-			$columns = $currTable->getColumns();
-			$foundOne = false;
-			for ($j=0, $cLen=count($columns); $j < $cLen && !$foundOne; $j++) {
-			$foundOne = $columns[$j]->isAutoIncrement();
-			}
-
-			if (!$foundOne) {
-			$errorMessage = "Table '" . $currTable->getName()
-			. "' is set to use native id generation, but it does not "
-			. "have a column which declared as the one to "
-			. "auto increment (i.e. autoIncrement=\"true\")";
-
-			throw new BuildException($errorMessage);
-			}
-			}
-			*/
-
-			$currTable->doFinalInitialization();
-
-			// setup reverse fk relations
-			$fks = $currTable->getForeignKeys();
-			for ($j=0, $fksLen=count($fks); $j < $fksLen; $j++) {
-				$currFK = $fks[$j];
-				$foreignTable = $this->getTable($currFK->getForeignTableName());
-				if ($foreignTable === null) {
-					throw new BuildException("ERROR!! Attempt to set foreign"
-					. " key to nonexistent table, "
-					. $currFK->getForeignTableName() . "!");
-				}
-
-				$referrers = $foreignTable->getReferrers();
-				if ($referrers === null || !in_array($currFK, $referrers, true) ) {
-					$foreignTable->addReferrer($currFK);
-				}
-
-				// local column references
-				$localColumnNames = $currFK->getLocalColumns();
-
-				for ($k=0,$lcnLen=count($localColumnNames); $k < $lcnLen; $k++) {
-
-					$local = $currTable->getColumn($localColumnNames[$k]);
-
-					// give notice of a schema inconsistency.
-					// note we do not prevent the npe as there is nothing
-					// that we can do, if it is to occur.
-					if ($local === null) {
-						throw new BuildException("ERROR!! Attempt to define foreign"
-						. " key with nonexistent column, "
-						. $localColumnNames[$k] . ", in table, "
-						. $currTable->getName() . "!");
-					}
-
-					//check for foreign pk's
-					if ($local->isPrimaryKey()) {
-						$currTable->setContainsForeignPK(true);
-					}
-
-				} // for each local col name
-
-				// foreign column references
-				$foreignColumnNames = $currFK->getForeignColumns();
-				for ($k=0,$fcnLen=count($localColumnNames); $k < $fcnLen; $k++) {
-					$foreign = $foreignTable->getColumn($foreignColumnNames[$k]);
-					// if the foreign column does not exist, we may have an
-					// external reference or a misspelling
-					if ($foreign === null) {
-						throw new BuildException("ERROR!! Attempt to set foreign"
-						. " key to nonexistent column, "
-						. $foreignColumnNames[$k] . ", in table, "
-						. $foreignTable->getName() . "!");
-					} else {
-						$foreign->addReferrer($currFK);
-					}
-				} // for each foreign col ref
-			}
-		}
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$dbNode = $node->appendChild($doc->createElement('database'));
-
-		$dbNode->setAttribute('name', $this->name);
-
-		if ($this->pkg) {
-			$dbNode->setAttribute('package', $this->pkg);
-		}
-
-		if ($this->defaultIdMethod) {
-			$dbNode->setAttribute('defaultIdMethod', $this->defaultIdMethod);
-		}
-
-		if ($this->baseClass) {
-			$dbNode->setAttribute('baseClass', $this->baseClass);
-		}
-
-		if ($this->basePeer) {
-			$dbNode->setAttribute('basePeer', $this->basePeer);
-		}
-
-		if ($this->defaultPhpNamingMethod) {
-			$dbNode->setAttribute('defaultPhpNamingMethod', $this->defaultPhpNamingMethod);
-		}
-
-		if ($this->defaultTranslateMethod) {
-			$dbNode->setAttribute('defaultTranslateMethod', $this->defaultTranslateMethod);
-		}
-
-		/*
-
-		FIXME - Before we can add support for domains in the schema, we need
-		to have a method of the Column that indicates whether the column was mapped
-		to a SPECIFIC domain (since Column->getDomain() will always return a Domain object)
-
-		foreach ($this->domainMap as $domain) {
-		$domain->appendXml($dbNode);
-		}
-		*/
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($dbNode);
-		}
-
-		foreach ($this->tableList as $table) {
-			$table->appendXml($dbNode);
-		}
-
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Domain.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Domain.php
deleted file mode 100644
index 3376951..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Domain.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-/*
- *  $Id: Domain.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * A class for holding data about a domain used in the schema.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Domain extends XMLElement {
-
-	/**
-	 * @var        string The name of this domain
-	 */
-	private $name;
-
-	/**
-	 * @var        string Description for this domain.
-	 */
-	private $description;
-
-	/**
-	 * @var        int Size
-	 */
-	private $size;
-
-	/**
-	 * @var        int Scale
-	 */
-	private $scale;
-
-	/**
-	 * @var        int Propel type from schema
-	 */
-	private $propelType;
-
-	/**
-	 * @var        string The SQL type to use for this column
-	 */
-	private $sqlType;
-
-	/**
-	 * @var        ColumnDefaultValue A default value
-	 */
-	private $defaultValue;
-
-	/**
-	 * @var        Database
-	 */
-	private $database;
-
-	/**
-	 * Creates a new Domain object.
-	 * If this domain needs a name, it must be specified manually.
-	 *
-	 * @param      string $type Propel type.
-	 * @param      string $sqlType SQL type.
-	 * @param      string $size
-	 * @param      string $scale
-	 */
-	public function __construct($type = null, $sqlType = null, $size = null, $scale = null)
-	{
-		$this->propelType = $type;
-		$this->sqlType = ($sqlType !== null) ? $sqlType : $type;
-		$this->size = $size;
-		$this->scale = $scale;
-	}
-
-	/**
-	 * Copy the values from current object into passed-in Domain.
-	 * @param      Domain $domain Domain to copy values into.
-	 */
-	public function copy(Domain $domain)
-	{
-		$this->defaultValue = $domain->getDefaultValue();
-		$this->description = $domain->getDescription();
-		$this->name = $domain->getName();
-		$this->scale = $domain->getScale();
-		$this->size = $domain->getSize();
-		$this->sqlType = $domain->getSqlType();
-		$this->propelType = $domain->getType();
-	}
-
-	/**
-	 * Sets up the Domain object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$schemaType = strtoupper($this->getAttribute("type"));
-		$this->copy($this->getDatabase()->getPlatform()->getDomainForType($schemaType));
-
-		//Name
-		$this->name = $this->getAttribute("name");
-
-		// Default value
-		$defval = $this->getAttribute("defaultValue", $this->getAttribute("default"));
-		if ($defval !== null) {
-			$this->setDefaultValue(new ColumnDefaultValue($defval, ColumnDefaultValue::TYPE_VALUE));
-		} elseif ($this->getAttribute("defaultExpr") !== null) {
-			$this->setDefaultValue(new ColumnDefaultValue($this->getAttribute("defaultExpr"), ColumnDefaultValue::TYPE_EXPR));
-		}
-
-		$this->size = $this->getAttribute("size");
-		$this->scale = $this->getAttribute("scale");
-		$this->description = $this->getAttribute("description");
-	}
-
-	/**
-	 * Sets the owning database object (if this domain is being setup via XML).
-	 * @param      Database $database
-	 */
-	public function setDatabase(Database $database)
-	{
-		$this->database = $database;
-	}
-
-	/**
-	 * Gets the owning database object (if this domain was setup via XML).
-	 * @return     Database
-	 */
-	public function getDatabase()
-	{
-		return $this->database;
-	}
-
-	/**
-	 * @return     string Returns the description.
-	 */
-	public function getDescription()
-	{
-		return $this->description;
-	}
-
-	/**
-	 * @param      string $description The description to set.
-	 */
-	public function setDescription($description)
-	{
-		$this->description = $description;
-	}
-
-	/**
-	 * @return     string Returns the name.
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * @param      string $name The name to set.
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * @return     string Returns the scale.
-	 */
-	public function getScale()
-	{
-		return $this->scale;
-	}
-
-	/**
-	 * @param      string $scale The scale to set.
-	 */
-	public function setScale($scale)
-	{
-		$this->scale = $scale;
-	}
-
-	/**
-	 * Replaces the size if the new value is not null.
-	 *
-	 * @param      string $value The size to set.
-	 */
-	public function replaceScale($value)
-	{
-		if ($value !== null) {
-			$this->scale = $value;
-		}
-	}
-
-	/**
-	 * @return     int Returns the size.
-	 */
-	public function getSize()
-	{
-		return $this->size;
-	}
-
-	/**
-	 * @param      int $size The size to set.
-	 */
-	public function setSize($size)
-	{
-		$this->size = $size;
-	}
-
-	/**
-	 * Replaces the size if the new value is not null.
-	 *
-	 * @param      int $value The size to set.
-	 */
-	public function replaceSize($value)
-	{
-		if ($value !== null) {
-			$this->size = $value;
-		}
-	}
-
-	/**
-	 * @return     string Returns the propelType.
-	 */
-	public function getType()
-	{
-		return $this->propelType;
-	}
-
-	/**
-	 * @param      string $propelType The PropelTypes type to set.
-	 */
-	public function setType($propelType)
-	{
-		$this->propelType = $propelType;
-	}
-
-	/**
-	 * Replaces the type if the new value is not null.
-	 *
-	 * @param      string $value The tyep to set.
-	 */
-	public function replaceType($value)
-	{
-		if ($value !== null) {
-			$this->propelType = $value;
-		}
-	}
-
-	/**
-	 * Gets the default value object.
-	 * @return     ColumnDefaultValue The default value object for this domain.
-	 */
-	public function getDefaultValue()
-	{
-		return $this->defaultValue;
-	}
-
-	/**
-	 * Gets the default value, type-casted for use in PHP OM.
-	 * @return     mixed
-	 * @see        getDefaultValue()
-	 */
-	public function getPhpDefaultValue()
-	{
-		if ($this->defaultValue === null) {
-			return null;
-		} else {
-			if ($this->defaultValue->isExpression()) {
-				throw new EngineException("Cannot get PHP version of default value for default value EXPRESSION.");
-			}
-			if ($this->propelType === PropelTypes::BOOLEAN) {
-				return $this->booleanValue($this->defaultValue->getValue());
-			} else {
-				return $this->defaultValue->getValue();
-			}
-		}
-	}
-
-	/**
-	 * @param      ColumnDefaultValue $value The column default value to set.
-	 */
-	public function setDefaultValue(ColumnDefaultValue $value)
-	{
-		$this->defaultValue = $value;
-	}
-
-	/**
-	 * Replaces the default value if the new value is not null.
-	 *
-	 * @param      ColumnDefaultValue $value The defualt value object
-	 */
-	public function replaceDefaultValue(ColumnDefaultValue $value = null)
-	{
-		if ($value !== null) {
-			$this->defaultValue = $value;
-		}
-	}
-
-	/**
-	 * @return     string Returns the sqlType.
-	 */
-	public function getSqlType()
-	{
-		return $this->sqlType;
-	}
-
-	/**
-	 * @param      string $sqlType The sqlType to set.
-	 */
-	public function setSqlType($sqlType)
-	{
-		$this->sqlType = $sqlType;
-	}
-
-	/**
-	 * Replaces the SQL type if the new value is not null.
-	 * @param      string $sqlType The native SQL type to use for this domain.
-	 */
-	public function replaceSqlType($sqlType)
-	{
-		if ($sqlType !== null) {
-			$this->sqlType = $sqlType;
-		}
-	}
-
-	/**
-	 * Return the size and scale in brackets for use in an sql schema.
-	 *
-	 * @return     string Size and scale or an empty String if there are no values
-	 *         available.
-	 */
-	public function printSize()
-	{
-		if ($this->size !== null && $this->scale !== null)  {
-			return '(' . $this->size . ',' . $this->scale . ')';
-		} elseif ($this->size !== null) {
-			return '(' . $this->size . ')';
-		} else {
-			return "";
-		}
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$domainNode = $node->appendChild($doc->createElement('domain'));
-		$domainNode->setAttribute('type', $this->getType());
-		$domainNode->setAttribute('name', $this->getName());
-
-		if ($this->sqlType !== $this->getType()) {
-			$domainNode->setAttribute('sqlType', $this->sqlType);
-		}
-
-		$def = $this->getDefaultValue();
-		if ($def) {
-			if ($def->isExpression()) {
-				$domainNode->setAttribute('defaultExpr', $def->getValue());
-			} else {
-				$domainNode->setAttribute('defaultValue', $def->getValue());
-			}
-		}
-
-		if ($this->size) {
-			$domainNode->setAttribute('size', $this->size);
-		}
-
-		if ($this->scale) {
-			$domainNode->setAttribute('scale', $this->scale);
-		}
-
-		if ($this->description) {
-			$domainNode->setAttribute('description', $this->description);
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ForeignKey.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ForeignKey.php
deleted file mode 100644
index 9275538..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/ForeignKey.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-/*
- *  $Id: ForeignKey.php 1448 2010-01-12 18:02:08Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * A Class for information about foreign keys of a table.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @author     Fedor <fedor.karpelevitch at home.com>
- * @author     Daniel Rall <dlr at finemaltcoding.com>
- * @version    $Revision: 1448 $
- * @package    propel.engine.database.model
- */
-class ForeignKey extends XMLElement {
-
-	private $foreignTableName;
-	private $name;
-	private $phpName;
-	private $refPhpName;
-	private $onUpdate;
-	private $onDelete;
-	private $parentTable;
-	private $localColumns = array();
-	private $foreignColumns = array();
-
-	// the uppercase equivalent of the onDelete/onUpdate values in the dtd
-	const NONE     = "";            // No "ON [ DELETE | UPDATE]" behaviour specified.
-	const NOACTION  = "NO ACTION";
-	const CASCADE  = "CASCADE";
-	const RESTRICT = "RESTRICT";
-	const SETDEFAULT  = "SET DEFAULT";
-	const SETNULL  = "SET NULL";
-
-	/**
-	 * Constructs a new ForeignKey object.
-	 *
-	 * @param      string $name
-	 */
-	public function __construct($name=null)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Sets up the ForeignKey object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->foreignTableName = $this->getAttribute("foreignTable");
-		$this->name = $this->getAttribute("name");
-		$this->phpName = $this->getAttribute("phpName");
-		$this->refPhpName = $this->getAttribute("refPhpName");
-		$this->onUpdate = $this->normalizeFKey($this->getAttribute("onUpdate"));
-		$this->onDelete = $this->normalizeFKey($this->getAttribute("onDelete"));
-	}
-
-	/**
-	 * normalizes the input of onDelete, onUpdate attributes
-	 */
-	private function normalizeFKey($attrib)
-	{
-		if ($attrib === null  || strtoupper($attrib) == "NONE") {
-			$attrib = self::NONE;
-		}
-		$attrib = strtoupper($attrib);
-		if ($attrib == "SETNULL") {
-			$attrib =  self::SETNULL;
-		}
-		return $attrib;
-	}
-
-	/**
-	 * returns whether or not the onUpdate attribute is set
-	 */
-	public function hasOnUpdate()
-	{
-		return ($this->onUpdate !== self::NONE);
-	}
-
-	/**
-	 * returns whether or not the onDelete attribute is set
-	 */
-	public function hasOnDelete()
-	{
-		return ($this->onDelete !== self::NONE);
-	}
-
-	/**
-	 * returns the onUpdate attribute
-	 * @return     string
-	 */
-	public function getOnUpdate()
-	{
-		return $this->onUpdate;
-	}
-
-	/**
-	 * Returns the onDelete attribute
-	 * @return     string
-	 */
-	public function getOnDelete()
-	{
-		return $this->onDelete;
-	}
-
-	/**
-	 * sets the onDelete attribute
-	 */
-	public function setOnDelete($value)
-	{
-		$this->onDelete = $this->normalizeFKey($value);
-	}
-
-	/**
-	 * sets the onUpdate attribute
-	 */
-	public function setOnUpdate($value)
-	{
-		$this->onUpdate = $this->normalizeFKey($value);
-	}
-
-	/**
-	 * Returns the name attribute.
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Sets the name attribute.
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Gets the phpName for this foreign key (if any).
-	 * @return     string
-	 */
-	public function getPhpName()
-	{
-		return $this->phpName;
-	}
-
-	/**
-	 * Sets a phpName to use for this foreign key.
-	 * @param      string $name
-	 */
-	public function setPhpName($name)
-	{
-		$this->phpName = $name;
-	}
-
-	/**
-	 * Gets the refPhpName for this foreign key (if any).
-	 * @return     string
-	 */
-	public function getRefPhpName()
-	{
-		return $this->refPhpName;
-	}
-
-	/**
-	 * Sets a refPhpName to use for this foreign key.
-	 * @param      string $name
-	 */
-	public function setRefPhpName($name)
-	{
-		$this->refPhpName = $name;
-	}
-
-	/**
-	 * Get the foreignTableName of the FK
-	 */
-	public function getForeignTableName()
-	{
-		return $this->foreignTableName;
-	}
-
-	/**
-	 * Set the foreignTableName of the FK
-	 */
-	public function setForeignTableName($tableName)
-	{
-		$this->foreignTableName = $tableName;
-	}
-
-	/**
-	 * Gets the resolved foreign Table model object.
-	 * @return     Table
-	 */
-	public function getForeignTable()
-	{
-		return $this->getTable()->getDatabase()->getTable($this->getForeignTableName());
-	}
-
-	/**
-	 * Set the parent Table of the foreign key
-	 */
-	public function setTable(Table $parent)
-	{
-		$this->parentTable = $parent;
-	}
-
-	/**
-	 * Get the parent Table of the foreign key
-	 */
-	public function getTable()
-	{
-		return $this->parentTable;
-	}
-
-	/**
-	 * Returns the Name of the table the foreign key is in
-	 */
-	public function getTableName()
-	{
-		return $this->parentTable->getName();
-	}
-
-	/**
-	 * Adds a new reference entry to the foreign key.
-	 */
-	public function addReference($p1, $p2 = null)
-	{
-		if (is_array($p1)) {
-			$this->addReference(@$p1["local"], @$p1["foreign"]);
-		} else {
-			if ($p1 instanceof Column) {
-				$p1 = $p1->getName();
-			}
-			if ($p2 instanceof Column) {
-				$p2 = $p2->getName();
-			}
-			$this->localColumns[] = $p1;
-			$this->foreignColumns[] = $p2;
-		}
-	}
-
-	/**
-	 * Return a comma delimited string of local column names
-	 * @deprecated because Column::makeList() is deprecated; use the array-returning getLocalColumns() and DDLBuilder->getColumnList() instead instead.
-	 */
-	public function getLocalColumnNames()
-	{
-		return Column::makeList($this->getLocalColumns(), $this->getTable()->getDatabase()->getPlatform());
-	}
-
-	/**
-	 * Return a comma delimited string of foreign column names
-	 * @deprecated because Column::makeList() is deprecated; use the array-returning getForeignColumns() and DDLBuilder->getColumnList() instead instead.
-	 */
-	public function getForeignColumnNames()
-	{
-		return Column::makeList($this->getForeignColumns(), $this->getTable()->getDatabase()->getPlatform());
-	}
-
-	/**
-	 * Return an array of local column names.
-	 * @return     array string[]
-	 */
-	public function getLocalColumns()
-	{
-		return $this->localColumns;
-	}
-
-	/**
-	 * Utility method to get local column to foreign column
-	 * mapping for this foreign key.
-	 */
-	public function getLocalForeignMapping()
-	{
-		$h = array();
-		for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-			$h[$this->localColumns[$i]] = $this->foreignColumns[$i];
-		}
-		return $h;
-	}
-
-	/**
-	 * Get the foreign column mapped to specified local column.
-	 * @return     string Column name.
-	 */
-	public function getMappedForeignColumn($local)
-	{
-		$m = $this->getLocalForeignMapping();
-		if (isset($m[$local])) {
-			return $m[$local];
-		}
-		return null;
-	}
-
-	/**
-	 * Get the local column mapped to specified foreign column.
-	 * @return     string Column name.
-	 */
-	public function getMappedLocalColumn($foreign)
-	{
-		$m = $this->getForeignLocalMapping();
-		if (isset($m[$foreign])) {
-			return $m[$foreign];
-		}
-		return null;
-	}
-
-	/**
-	 * Return an array of foreign column objects.
-	 * @return     array Column[]
-	 */
-	public function getForeignColumns()
-	{
-		return $this->foreignColumns;
-	}
-
-	/**
-	 * Utility method to get local column to foreign column
-	 * mapping for this foreign key.
-	 */
-	public function getForeignLocalMapping()
-	{
-		$h = array();
-		for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-			$h[ $this->foreignColumns[$i] ] = $this->localColumns[$i];
-		}
-		return $h;
-	}
-
-	/**
-	 * Whether this foreign key is also the primary key of the local table.
-	 *
-	 * @return     boolean
-	 */
-	public function isLocalPrimaryKey()
-	{
-		$localCols = $this->getLocalColumns();
-
-		$localPKColumnObjs = $this->getTable()->getPrimaryKey();
-
-		$localPKCols = array();
-		foreach ($localPKColumnObjs as $lPKCol) {
-			$localPKCols[] = $lPKCol->getName();
-		}
-		//
-		//		print "Local key columns: \n";
-		//		print_r($localCols);
-		//
-		//		print "Local table primary key columns: \n";
-		//		print_r($localPKCols);
-
-		return (!array_diff($localPKCols, $localCols));
-	}
-
-	/**
-	 * Whether this foreign key is matched by an invertes foreign key (on foreign table).
-	 *
-	 * This is to prevent duplicate columns being generated for a 1:1 relationship that is represented
-	 * by foreign keys on both tables.  I don't know if that's good practice ... but hell, why not
-	 * support it.
-	 *
-	 * @param      ForeignKey $fk
-	 * @return     boolean
-	 * @link       http://propel.phpdb.org/trac/ticket/549
-	 */
-	public function isMatchedByInverseFK()
-	{
-		return (bool) $this->getInverseFK();
-	}
-	
-	public function getInverseFK()
-	{
-		$foreignTable = $this->getForeignTable();
-		$map = $this->getForeignLocalMapping();
-
-		foreach ($foreignTable->getForeignKeys() as $refFK) {
-			$fkMap = $refFK->getLocalForeignMapping();
-			if ( ($refFK->getTableName() == $this->getTableName()) && ($map == $fkMap) ) { // compares keys and values, but doesn't care about order, included check to make sure it's the same table (fixes #679)
-				return $refFK;
-			}
-		}
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$fkNode = $node->appendChild($doc->createElement('foreign-key'));
-
-		$fkNode->setAttribute('foreignTable', $this->getForeignTableName());
-		$fkNode->setAttribute('name', $this->getName());
-
-		if ($this->getPhpName()) {
-			$fkNode->setAttribute('phpName', $this->getPhpName());
-		}
-
-		if ($this->getRefPhpName()) {
-			$fkNode->setAttribute('refPhpName', $this->getRefPhpName());
-		}
-
-		if ($this->getOnDelete()) {
-			$fkNode->setAttribute('onDelete', $this->getOnDelete());
-		}
-
-		if ($this->getOnUpdate()) {
-			$fkNode->setAttribute('onUpdate', $this->getOnUpdate());
-		}
-
-		for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-			$refNode = $fkNode->appendChild($doc->createElement('reference'));
-			$refNode->setAttribute('local', $this->localColumns[$i]);
-			$refNode->setAttribute('foreign', $this->foreignColumns[$i]);
-		}
-
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($fkNode);
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/IDMethod.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/IDMethod.php
deleted file mode 100644
index a5e9c6f..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/IDMethod.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- *  $Id: IDMethod.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Interface for various ID retrieval method types
- * (i.e. auto-increment, sequence, ID broker, etc.).
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-interface IDMethod {
-
-	/**
-	 * Key generation via database-specific ID method
-	 * (i.e. auto-increment for MySQL, sequence for Oracle, etc.).
-	 */
-	const NATIVE = "native";
-
-	/**
-	 * No RDBMS key generation (keys may be generated by the
-	 * application).
-	 */
-	const NO_ID_METHOD = "none";
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/IdMethodParameter.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/IdMethodParameter.php
deleted file mode 100644
index 9ac93ad..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/IdMethodParameter.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- *  $Id: IdMethodParameter.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * Information related to an ID method.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     John McNally <jmcnally at collab.net> (Torque)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class IdMethodParameter extends XMLElement {
-
-	private $name;
-	private $value;
-	private $parentTable;
-
-   /**
-	 * Sets up the IdMethodParameter object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->name = $this->getAttribute("name");
-		$this->value = $this->getAttribute("value");
-	}
-
-	/**
-	 * Get the parameter name
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Set the parameter name
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the parameter value
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * Set the parameter value
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-	/**
-	 * Set the parent Table of the id method
-	 */
-	public function setTable(Table $parent)
-	{
-		$this->parentTable = $parent;
-	}
-
-	/**
-	 * Get the parent Table of the id method
-	 */
-	public function getTable()
-	{
-		return $this->parentTable;
-	}
-
-	/**
-	 * Returns the Name of the table the id method is in
-	 */
-	public function getTableName()
-	{
-		return $this->parentTable->getName();
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$paramNode = $node->appendChild($doc->createElement('id-method-parameter'));
-		if ($this->getName()) {
-			$paramNode->setAttribute('name', $this->getName());
-		}
-		$paramNode->setAttribute('value', $this->getValue());
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Index.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Index.php
deleted file mode 100644
index a80feac..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Index.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-/*
- *  $Id: Index.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-
-/**
- * Information about indices of a table.
- *
- * @author     Jason van Zyl <vanzyl at apache.org>
- * @author     Daniel Rall <dlr at finemaltcoding.com>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Index extends XMLElement {
-
-	/** enables debug output */
-	const DEBUG = false;
-
-	private $indexName;
-	private $parentTable;
-
-	/** @var        array string[] */
-	private $indexColumns;
-
-	/** @var        array  */
-	private $indexColumnSizes = array();
-
-	/**
-	 * Creates a new Index instance.
-	 *
-	 * @param      string $name
-	 */
-	public function __construct($name=null)
-	{
-		$this->indexName = $name;
-	}
-
-	private function createName()
-	{
-		$table = $this->getTable();
-		$inputs = array();
-		$inputs[] = $table->getDatabase();
-		$inputs[] = $table->getName();
-		if ($this->isUnique()) {
-			$inputs[] = "U";
-		} else {
-			$inputs[] = "I";
-		}
-		// ASSUMPTION: This Index not yet added to the list.
-		if ($this->isUnique()) {
-			$inputs[] = count($table->getUnices()) + 1;
-		} else {
-			$inputs[] = count($table->getIndices()) + 1;
-		}
-
-		$this->indexName = NameFactory::generateName(
-		NameFactory::CONSTRAINT_GENERATOR, $inputs);
-	}
-
-	/**
-	 * Sets up the Index object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->indexName = $this->getAttribute("name");
-	}
-
-	/**
-	 * @see        #isUnique()
-	 * @deprecated Use isUnique() instead.
-	 */
-	public function getIsUnique()
-	{
-		return $this->isUnique();
-	}
-
-	/**
-	 * Returns the uniqueness of this index.
-	 */
-	public function isUnique()
-	{
-		return false;
-	}
-
-	/**
-	 * @see        #getName()
-	 * @deprecated Use getName() instead.
-	 */
-	public function getIndexName()
-	{
-		return $this->getName();
-	}
-
-	/**
-	 * Gets the name of this index.
-	 */
-	public function getName()
-	{
-		if ($this->indexName === null) {
-			try {
-				// generate an index name if we don't have a supplied one
-				$this->createName();
-			} catch (EngineException $e) {
-				// still no name
-			}
-		}
-		return substr($this->indexName, 0, $this->getTable()->getDatabase()->getPlatform()->getMaxColumnNameLength());
-	}
-
-	/**
-	 * @see        #setName(String name)
-	 * @deprecated Use setName(String name) instead.
-	 */
-	public function setIndexName($name)
-	{
-		$this->setName($name);
-	}
-
-	/**
-	 * Set the name of this index.
-	 */
-	public function setName($name)
-	{
-		$this->indexName = $name;
-	}
-
-	/**
-	 * Set the parent Table of the index
-	 */
-	public function setTable(Table $parent)
-	{
-		$this->parentTable = $parent;
-	}
-
-	/**
-	 * Get the parent Table of the index
-	 */
-	public function getTable()
-	{
-		return $this->parentTable;
-	}
-
-	/**
-	 * Returns the Name of the table the index is in
-	 */
-	public function getTableName()
-	{
-		return $this->parentTable->getName();
-	}
-
-	/**
-	 * Adds a new column to an index.
-	 * @param      mixed $data Column or attributes from XML.
-	 */
-	public function addColumn($data)
-	{
-		if ($data instanceof Column) {
-			$column = $data;
-			$this->indexColumns[] = $column->getName();
-			if ($column->getSize()) {
-				$this->indexColumnSizes[$column->getName()] = $column->getSize();
-			}
-		} else {
-			$attrib = $data;
-			$name = $attrib["name"];
-			$this->indexColumns[] = $name;
-			if (isset($attrib["size"])) {
-				$this->indexColumnSizes[$name] = $attrib["size"];
-			}
-		}
-	}
-
-	/**
-	 * Sets array of columns to use for index.
-	 *
-	 * @param      array $indexColumns Column[]
-	 */
-	public function setColumns(array $indexColumns)
-	{
-		$this->indexColumns = array();
-		$this->indexColumnSizes = array();
-		foreach ($indexColumns as $col) {
-			$this->addColumn($col);
-		}
-	}
-
-	/**
-	 * Whether there is a size for the specified column.
-	 * @param      string $name
-	 * @return     boolean
-	 */
-	public function hasColumnSize($name)
-	{
-		return isset($this->indexColumnSizes[$name]);
-	}
-
-	/**
-	 * Returns the size for the specified column, if given.
-	 * @param      string $name
-	 * @return     numeric The size or NULL
-	 */
-	public function getColumnSize($name)
-	{
-		if (isset($this->indexColumnSizes[$name])) {
-			return $this->indexColumnSizes[$name];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * @see        #getColumnList()
-	 * @deprecated Use getColumnList() instead (which is not deprecated too!)
-	 */
-	public function getIndexColumnList()
-	{
-		return $this->getColumnList();
-	}
-
-	/**
-	 * Return a comma delimited string of the columns which compose this index.
-	 * @deprecated because Column::makeList() is deprecated; use the array-returning getColumns() and DDLBuilder->getColumnList() instead instead.
-	 */
-	public function getColumnList()
-	{
-		return Column::makeList($this->getColumns(), $this->getTable()->getDatabase()->getPlatform());
-	}
-
-	/**
-	 * @see        #getColumns()
-	 * @deprecated Use getColumns() instead.
-	 */
-	public function getIndexColumns()
-	{
-		return $this->getColumns();
-	}
-
-	/**
-	 * Return the list of local columns. You should not edit this list.
-	 * @return     array string[]
-	 */
-	public function getColumns()
-	{
-		return $this->indexColumns;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$idxNode = $node->appendChild($doc->createElement('index'));
-		$idxNode->setAttribute('name', $this->getName());
-
-		foreach ($this->indexColumns as $colname) {
-			$idxColNode = $idxNode->appendChild($doc->createElement('index-column'));
-			$idxColNode->setAttribute('name', $colname);
-		}
-
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($idxNode);
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Inheritance.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Inheritance.php
deleted file mode 100644
index becdf71..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Inheritance.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/*
- *  $Id: Inheritance.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * A Class for information regarding possible objects representing a table
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     John McNally <jmcnally at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Inheritance extends XMLElement {
-
-	private $key;
-	private $className;
-	private $pkg;
-	private $ancestor;
-	private $parent;
-
-	/**
-	 * Sets up the Inheritance object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->key = $this->getAttribute("key");
-		$this->className = $this->getAttribute("class");
-		$this->pkg = $this->getAttribute("package");
-		$this->ancestor = $this->getAttribute("extends");
-	}
-
-	/**
-	 * Get the value of key.
-	 * @return     value of key.
-	 */
-	public function getKey()
-	{
-		return $this->key;
-	}
-
-	/**
-	 * Set the value of key.
-	 * @param      v  Value to assign to key.
-	 */
-	public function setKey($v)
-	{
-		$this->key = $v;
-	}
-
-	/**
-	 * Get the value of parent.
-	 * @return     value of parent.
-	 */
-	public function getColumn()
-	{
-		return $this->parent;
-	}
-
-	/**
-	 * Set the value of parent.
-	 * @param      v  Value to assign to parent.
-	 */
-	public function setColumn(Column  $v)
-	{
-		$this->parent = $v;
-	}
-
-	/**
-	 * Get the value of className.
-	 * @return     value of className.
-	 */
-	public function getClassName()
-	{
-		return $this->className;
-	}
-
-	/**
-	 * Set the value of className.
-	 * @param      v  Value to assign to className.
-	 */
-	public function setClassName($v)
-	{
-		$this->className = $v;
-	}
-
-	/**
-	 * Get the value of package.
-	 * @return     value of package.
-	 */
-	public function getPackage()
-	{
-		return $this->pkg;
-	}
-
-	/**
-	 * Set the value of package.
-	 * @param      v  Value to assign to package.
-	 */
-	public function setPackage($v)
-	{
-		$this->pkg = $v;
-	}
-
-	/**
-	 * Get the value of ancestor.
-	 * @return     value of ancestor.
-	 */
-	public function getAncestor()
-	{
-		return $this->ancestor;
-	}
-
-	/**
-	 * Set the value of ancestor.
-	 * @param      v  Value to assign to ancestor.
-	 */
-	public function setAncestor($v)
-	{
-		$this->ancestor = $v;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$inherNode = $node->appendChild($doc->createElement('inheritance'));
-		$inherNode->setAttribute('key', $this->key);
-		$inherNode->setAttribute('class', $this->className);
-
-		if ($this->ancestor !== null) {
-			$inherNode->setAttribute('extends', $this->ancestor);
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/NameFactory.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/NameFactory.php
deleted file mode 100644
index c38b8fd..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/NameFactory.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- *  $Id: NameFactory.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/NameGenerator.php';
-include_once 'propel/engine/database/model/PhpNameGenerator.php';
-include_once 'propel/engine/database/model/ConstraintNameGenerator.php';
-
-/**
- * A name generation factory.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class NameFactory {
-
-	/**
-	 * The class name of the PHP name generator.
-	 */
-	const PHP_GENERATOR = 'PhpNameGenerator';
-
-	/**
-	 * The fully qualified class name of the constraint name generator.
-	 */
-	const CONSTRAINT_GENERATOR = 'ConstraintNameGenerator';
-
-	/**
-	 * The single instance of this class.
-	 */
-	private static $instance;
-
-	/**
-	 * The cache of <code>NameGenerator</code> algorithms in use for
-	 * name generation, keyed by fully qualified class name.
-	 */
-	private static $algorithms = array();
-
-	/**
-	 * Factory method which retrieves an instance of the named generator.
-	 *
-	 * @param      name The fully qualified class name of the name
-	 * generation algorithm to retrieve.
-	 */
-	protected static function getAlgorithm($name)
-	{
-		if (!isset(self::$algorithms[$name])) {
-			self::$algorithms[$name] = new $name();
-		}
-		return self::$algorithms[$name];
-	}
-
-	/**
-	 * Given a list of <code>String</code> objects, implements an
-	 * algorithm which produces a name.
-	 *
-	 * @param      string $algorithmName The fully qualified class name of the {@link NameGenerator}
-	 *             implementation to use to generate names.
-	 * @param      array $inputs Inputs used to generate a name.
-	 * @return     The generated name.
-	 * @throws     EngineException
-	 */
-	public static function generateName($algorithmName, $inputs)
-	{
-		$algorithm = self::getAlgorithm($algorithmName);
-		return $algorithm->generateName($inputs);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/NameGenerator.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/NameGenerator.php
deleted file mode 100644
index 841e623..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/NameGenerator.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- *  $Id: NameGenerator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * The generic interface to a name generation algorithm.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @author     Byron Foster <byron_foster at yahoo.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-interface NameGenerator {
-	/**
-	 * The character used by most implementations as the separator
-	 * between name elements.
-	 */
-	const STD_SEPARATOR_CHAR = '_';
-
-	/**
-	 * Traditional method for converting schema table and column names
-	 * to PHP names.  The <code>CONV_METHOD_XXX</code> constants
-	 * define how names for columns and tables in the database schema
-	 * will be converted to PHP source names.
-	 *
-	 * @see        PhpNameGenerator::underscoreMethod()
-	 */
-	const CONV_METHOD_UNDERSCORE = "underscore";
-
-	/**
-	 * Heavier method for converting schema table and column names 
-	 * to PHP names. Similar to {@link #CONV_METHOD_UNDERSCORE} but
-	 * this one will pass only letters and numbers through and will
-	 * use as separator any character that is not a letter or a number
-	 * inside the string to be converted. The <code>CONV_METHOD_XXX</code> 
-	 * constants define how names for columns and tales in the 
-	 * database schema will be converted to PHP source names. 
-	 */
-	const CONV_METHOD_CLEAN = "clean";
-	
-	/**
-	 * Similar to {@link #CONV_METHOD_UNDERSCORE} except nothing is
-	 * converted to lowercase.
-	 *
-	 * @see        PhpNameGenerator::phpnameMethod()
-	 */
-	const CONV_METHOD_PHPNAME = "phpname";
-
-	/**
-	 * Specifies no modification when converting from a schema column
-	 * or table name to a PHP name.
-	 */
-	const CONV_METHOD_NOCHANGE = "nochange";
-
-	/**
-	 * Given a list of <code>String</code> objects, implements an
-	 * algorithm which produces a name.
-	 *
-	 * @param      inputs Inputs used to generate a name.
-	 * @return     The generated name.
-	 * @throws     EngineException
-	 */
-	public function generateName($inputs);
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/PhpNameGenerator.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/PhpNameGenerator.php
deleted file mode 100644
index 38d93a3..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/PhpNameGenerator.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/*
- *  $Id: PhpNameGenerator.php 1514 2010-02-02 20:30:58Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/NameGenerator.php';
-
-/**
- * A <code>NameGenerator</code> implementation for PHP-esque names.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @author     Byron Foster <byron_foster at yahoo.com> (Torque)
- * @author     Bernd Goldschmidt <bgoldschmidt at rapidsoft.de>
- * @version    $Revision: 1514 $
- * @package    propel.engine.database.model
- */
-class PhpNameGenerator implements NameGenerator {
-
-	/**
-	 * <code>inputs</code> should consist of two (three) elements, the
-	 * original name of the database element and the method for
-	 * generating the name.
-	 * The optional third element may contain a prefix that will be
-	 * stript from name prior to generate the resulting name.
-	 * There are currently three methods:
-	 * <code>CONV_METHOD_NOCHANGE</code> - xml names are converted
-	 * directly to php names without modification.
-	 * <code>CONV_METHOD_UNDERSCORE</code> will capitalize the first
-	 * letter, remove underscores, and capitalize each letter before
-	 * an underscore.  All other letters are lowercased. "phpname"
-	 * works the same as the <code>CONV_METHOD_PHPNAME</code> method
-	 * but will not lowercase any characters.
-	 *
-	 * @param      inputs list expected to contain two (optional: three) parameters,
-	 * element 0 contains name to convert, element 1 contains method for conversion,
-	 * optional element 2 contains prefix to be striped from name
-	 * @return     The generated name.
-	 * @see        NameGenerator
-	 */
-	public function generateName($inputs)
-	{
-		$schemaName = $inputs[0];
-		$method = $inputs[1];
-
-		if (count($inputs)>2) {
-			$prefix = $inputs[2];
-			if ($prefix != '' && substr($schemaName, 0, strlen($prefix)) == $prefix) {
-				$schemaName = substr($schemaName, strlen($prefix));
-			}
-		}
-
-		$phpName = null;
-
-		switch ($method) {
-			case self::CONV_METHOD_CLEAN:
-				$phpName = $this->cleanMethod($schemaName);
-				break;
-			case self::CONV_METHOD_PHPNAME:
-				$phpName = $this->phpnameMethod($schemaName);
-				break;
-			case self::CONV_METHOD_NOCHANGE:
-				$phpName = $this->nochangeMethod($schemaName);
-				break;
-			case self::CONV_METHOD_UNDERSCORE:
-			default:
-				$phpName = $this->underscoreMethod($schemaName);
-		}
-
-		return $phpName;
-	}
-
-	/**
-	 * Converts a database schema name to php object name.  Removes
-	 * <code>STD_SEPARATOR_CHAR</code>, capitilizes first letter of
-	 * name and each letter after the <code>STD_SEPERATOR</code>,
-	 * converts the rest of the letters to lowercase.
-	 *
-	 * my_CLASS_name -> MyClassName
-	 *
-	 * @param      string $schemaName name to be converted.
-	 * @return     string Converted name.
-	 * @see        NameGenerator
-	 * @see        #underscoreMethod()
-	 */
-	protected function underscoreMethod($schemaName)
-	{
-		$name = "";
-		$tok = strtok($schemaName, self::STD_SEPARATOR_CHAR);
-		while ($tok) {
-			$name .= ucfirst(strtolower($tok));
-			$tok = strtok(self::STD_SEPARATOR_CHAR);
-		}
-		return $name;
-	}
-	
-	/**
-	 * Converts a database schema name to php object name.  Removes
-	 * any character that is not a letter or a number and capitilizes 
-	 * first letter of the name, the first letter of each alphanumeric 
-	 * block and converts the rest of the letters to lowercase.
-	 * 
-	 * T$NAMA$RFO_max => TNamaRfoMax
-	 *
-	 * @param      string $schemaName name to be converted.
-	 * @return     string Converted name.
-	 * @see        NameGenerator
-	 * @see        #underscoreMethod()
-	 */
-	protected function cleanMethod($schemaName)
-	{
-		$name = "";
-		$regexp = '/([a-z0-9]+)/i';
-		$matches = array();
-		if (preg_match_all($regexp, $schemaName, $matches)) {
-			foreach($matches[1] AS $tok) {
-				$name .= ucfirst(strtolower($tok));
-			}
-		} else {
-			return $schemaName;
-		}
-		return $name;
-	}
-
-	/**
-	 * Converts a database schema name to php object name.  Operates
-	 * same as underscoreMethod but does not convert anything to
-	 * lowercase.
-	 *
-	 * my_CLASS_name -> MyCLASSName
-	 *
-	 * @param      string $schemaName name to be converted.
-	 * @return     string Converted name.
-	 * @see        NameGenerator
-	 * @see        #underscoreMethod(String)
-	 */
-	protected function phpnameMethod($schemaName)
-	{
-		$name = "";
-		$tok = strtok($schemaName, self::STD_SEPARATOR_CHAR);
-		while ($tok !== false) {
-			$name .= ucfirst($tok);
-			$tok = strtok(self::STD_SEPARATOR_CHAR);
-		}
-		return $name;
-	}
-
-	/**
-	 * Converts a database schema name to PHP object name.  In this
-	 * case no conversion is made.
-	 *
-	 * @param      string $name name to be converted.
-	 * @return     string The <code>name</code> parameter, unchanged.
-	 */
-	protected function nochangeMethod($name)
-	{
-		return $name;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/PropelTypes.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/PropelTypes.php
deleted file mode 100644
index aeebb18..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/PropelTypes.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/*
- *  $Id: PropelTypes.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A class that maps PropelTypes to PHP native types, PDO types (and Creole types).
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class PropelTypes {
-
-	const CHAR = "CHAR";
-	const VARCHAR = "VARCHAR";
-	const LONGVARCHAR = "LONGVARCHAR";
-	const CLOB = "CLOB";
-	const NUMERIC = "NUMERIC";
-	const DECIMAL = "DECIMAL";
-	const TINYINT = "TINYINT";
-	const SMALLINT = "SMALLINT";
-	const INTEGER = "INTEGER";
-	const BIGINT = "BIGINT";
-	const REAL = "REAL";
-	const FLOAT = "FLOAT";
-	const DOUBLE = "DOUBLE";
-	const BINARY = "BINARY";
-	const VARBINARY = "VARBINARY";
-	const LONGVARBINARY = "LONGVARBINARY";
-	const BLOB = "BLOB";
-	const DATE = "DATE";
-	const TIME = "TIME";
-	const TIMESTAMP = "TIMESTAMP";
-
-	const BU_DATE = "BU_DATE";
-	const BU_TIMESTAMP = "BU_TIMESTAMP";
-
-	const BOOLEAN = "BOOLEAN";
-
-	private static $TEXT_TYPES = array (
-						self::CHAR, self::VARCHAR, self::LONGVARCHAR, self::CLOB, self::DATE, self::TIME, self::TIMESTAMP, self::BU_DATE, self::BU_TIMESTAMP
-					);
-
-	private static $LOB_TYPES = array (
-						self::VARBINARY, self::LONGVARBINARY, self::BLOB
-					);
-
-	private static $TEMPORAL_TYPES = array (
-						self::DATE, self::TIME, self::TIMESTAMP, self::BU_DATE, self::BU_TIMESTAMP
-					);
-
-	private static $NUMERIC_TYPES = array (
-						self::SMALLINT, self::TINYINT, self::INTEGER, self::BIGINT, self::FLOAT, self::DOUBLE, self::NUMERIC, self::DECIMAL, self::REAL
-					);
-
-	const CHAR_NATIVE_TYPE = "string";
-	const VARCHAR_NATIVE_TYPE = "string";
-	const LONGVARCHAR_NATIVE_TYPE = "string";
-	const CLOB_NATIVE_TYPE = "string"; // Clob
-	const NUMERIC_NATIVE_TYPE = "string";
-	const DECIMAL_NATIVE_TYPE = "string";
-	const BOOLEAN_NATIVE_TYPE = "boolean";
-	const TINYINT_NATIVE_TYPE = "int";
-	const SMALLINT_NATIVE_TYPE = "int";
-	const INTEGER_NATIVE_TYPE = "int";
-	const BIGINT_NATIVE_TYPE = "string";
-	const REAL_NATIVE_TYPE = "double";
-	const FLOAT_NATIVE_TYPE = "double";
-	const DOUBLE_NATIVE_TYPE = "double";
-	const BINARY_NATIVE_TYPE = "string";
-	const VARBINARY_NATIVE_TYPE = "string";
-	const LONGVARBINARY_NATIVE_TYPE = "string";
-	const BLOB_NATIVE_TYPE = "resource";
-	const BU_DATE_NATIVE_TYPE = "string";
-	const DATE_NATIVE_TYPE = "string";
-	const TIME_NATIVE_TYPE = "string";
-	const TIMESTAMP_NATIVE_TYPE = "string";
-	const BU_TIMESTAMP_NATIVE_TYPE = "string";
-
-	/**
-	 * Mapping between Propel types and PHP native types.
-	 *
-	 * @var        array
-	 */
-	private static $propelToPHPNativeMap = array(
-			self::CHAR => self::CHAR_NATIVE_TYPE,
-			self::VARCHAR => self::VARCHAR_NATIVE_TYPE,
-			self::LONGVARCHAR => self::LONGVARCHAR_NATIVE_TYPE,
-			self::CLOB => self::CLOB_NATIVE_TYPE,
-			self::NUMERIC => self::NUMERIC_NATIVE_TYPE,
-			self::DECIMAL => self::DECIMAL_NATIVE_TYPE,
-			self::TINYINT => self::TINYINT_NATIVE_TYPE,
-			self::SMALLINT => self::SMALLINT_NATIVE_TYPE,
-			self::INTEGER => self::INTEGER_NATIVE_TYPE,
-			self::BIGINT => self::BIGINT_NATIVE_TYPE,
-			self::REAL => self::REAL_NATIVE_TYPE,
-			self::FLOAT => self::FLOAT_NATIVE_TYPE,
-			self::DOUBLE => self::DOUBLE_NATIVE_TYPE,
-			self::BINARY => self::BINARY_NATIVE_TYPE,
-			self::VARBINARY => self::VARBINARY_NATIVE_TYPE,
-			self::LONGVARBINARY => self::LONGVARBINARY_NATIVE_TYPE,
-			self::BLOB => self::BLOB_NATIVE_TYPE,
-			self::DATE => self::DATE_NATIVE_TYPE,
-			self::BU_DATE => self::BU_DATE_NATIVE_TYPE,
-			self::TIME => self::TIME_NATIVE_TYPE,
-			self::TIMESTAMP => self::TIMESTAMP_NATIVE_TYPE,
-			self::BU_TIMESTAMP => self::BU_TIMESTAMP_NATIVE_TYPE,
-			self::BOOLEAN => self::BOOLEAN_NATIVE_TYPE,
-	);
-
-	/**
-	 * Mapping between Propel types and Creole types (for rev-eng task)
-	 *
-	 * @var        array
-	 */
-	private static $propelTypeToCreoleTypeMap = array(
-
-			self::CHAR => self::CHAR,
-			self::VARCHAR => self::VARCHAR,
-			self::LONGVARCHAR => self::LONGVARCHAR,
-			self::CLOB => self::CLOB,
-			self::NUMERIC => self::NUMERIC,
-			self::DECIMAL => self::DECIMAL,
-			self::TINYINT => self::TINYINT,
-			self::SMALLINT => self::SMALLINT,
-			self::INTEGER => self::INTEGER,
-			self::BIGINT => self::BIGINT,
-			self::REAL => self::REAL,
-			self::FLOAT => self::FLOAT,
-			self::DOUBLE => self::DOUBLE,
-			self::BINARY => self::BINARY,
-			self::VARBINARY => self::VARBINARY,
-			self::LONGVARBINARY => self::LONGVARBINARY,
-			self::BLOB => self::BLOB,
-			self::DATE => self::DATE,
-			self::TIME => self::TIME,
-			self::TIMESTAMP => self::TIMESTAMP,
-			self::BOOLEAN => self::BOOLEAN,
-
-			// These are pre-epoch dates, which we need to map to String type
-			// since they cannot be properly handled using strtotime() -- or even numeric
-			// timestamps on Windows.
-			self::BU_DATE => self::VARCHAR,
-			self::BU_TIMESTAMP => self::VARCHAR,
-
-	);
-
-	/**
-	 * Mapping between Propel types and PDO type contants (for prepared statement setting).
-	 *
-	 * @var        array
-	 */
-	private static $propelTypeToPDOTypeMap = array(
-			self::CHAR => PDO::PARAM_STR,
-			self::VARCHAR => PDO::PARAM_STR,
-			self::LONGVARCHAR => PDO::PARAM_STR,
-			self::CLOB => PDO::PARAM_STR,
-			self::NUMERIC => PDO::PARAM_INT,
-			self::DECIMAL => PDO::PARAM_STR,
-			self::TINYINT => PDO::PARAM_INT,
-			self::SMALLINT => PDO::PARAM_INT,
-			self::INTEGER => PDO::PARAM_INT,
-			self::BIGINT => PDO::PARAM_INT,
-			self::REAL => PDO::PARAM_STR,
-			self::FLOAT => PDO::PARAM_STR,
-			self::DOUBLE => PDO::PARAM_STR,
-			self::BINARY => PDO::PARAM_STR,
-			self::VARBINARY => PDO::PARAM_LOB,
-			self::LONGVARBINARY => PDO::PARAM_LOB,
-			self::BLOB => PDO::PARAM_LOB,
-			self::DATE => PDO::PARAM_STR,
-			self::TIME => PDO::PARAM_STR,
-			self::TIMESTAMP => PDO::PARAM_STR,
-			self::BOOLEAN => PDO::PARAM_BOOL,
-
-			// These are pre-epoch dates, which we need to map to String type
-			// since they cannot be properly handled using strtotime() -- or even numeric
-			// timestamps on Windows.
-			self::BU_DATE => PDO::PARAM_STR,
-			self::BU_TIMESTAMP => PDO::PARAM_STR,
-	);
-
-	/**
-	 * Return native PHP type which corresponds to the
-	 * Creole type provided. Use in the base object class generation.
-	 *
-	 * @param      $propelType The Propel type name.
-	 * @return     string Name of the native PHP type
-	 */
-	public static function getPhpNative($propelType)
-	{
-		return self::$propelToPHPNativeMap[$propelType];
-	}
-
-	/**
-	 * Returns the correct Creole type _name_ for propel added types
-	 *
-	 * @param      $type the propel added type.
-	 * @return     string Name of the the correct Creole type (e.g. "VARCHAR").
-	 */
-	public static function getCreoleType($type)
-	{
-		return  self::$propelTypeToCreoleTypeMap[$type];
-	}
-
-	/**
-	 * Resturns the PDO type (PDO::PARAM_* constant) value.
-	 * @return     int
-	 */
-	public static function getPDOType($type)
-	{
-		return self::$propelTypeToPDOTypeMap[$type];
-	}
-
-	/**
-	 * Returns Propel type constant corresponding to Creole type code.
-	 * Used but Propel Creole task.
-	 *
-	 * @param      int $sqlType The Creole SQL type constant.
-	 * @return     string The Propel type to use or NULL if none found.
-	 */
-	public static function getPropelType($sqlType)
-	{
-		if (isset(self::$creoleToPropelTypeMap[$sqlType])) {
-			return self::$creoleToPropelTypeMap[$sqlType];
-		}
-	}
-
-	/**
-	 * Get array of Propel types.
-	 *
-	 * @return     array string[]
-	 */
-	public static function getPropelTypes()
-	{
-		return array_keys(self::$propelTypeToCreoleTypeMap);
-	}
-
-	/**
-	 * Whether passed type is a temporal (date/time/timestamp) type.
-	 *
-	 * @param      string $type Propel type
-	 * @return     boolean
-	 */
-	public static function isTemporalType($type)
-	{
-		return in_array($type, self::$TEMPORAL_TYPES);
-	}
-
-	/**
-	 * Returns true if values for the type need to be quoted.
-	 *
-	 * @param      string $type The Propel type to check.
-	 * @return     boolean True if values for the type need to be quoted.
-	 */
-	public static function isTextType($type)
-	{
-		return in_array($type, self::$TEXT_TYPES);
-	}
-
-	/**
-	 * Returns true if values for the type are numeric.
-	 *
-	 * @param      string $type The Propel type to check.
-	 * @return     boolean True if values for the type need to be quoted.
-	 */
-	public static function isNumericType($type)
-	{
-		return in_array($type, self::$NUMERIC_TYPES);
-	}
-
-	/**
-	 * Returns true if type is a LOB type (i.e. would be handled by Blob/Clob class).
-	 * @param      string $type Propel type to check.
-	 * @return     boolean
-	 */
-	public static function isLobType($type)
-	{
-		return in_array($type, self::$LOB_TYPES);
-	}
-
-	/**
-	 * Convenience method to indicate whether a passed-in PHP type is a primitive.
-	 *
-	 * @param      string $phpType The PHP type to check
-	 * @return     boolean Whether the PHP type is a primitive (string, int, boolean, float)
-	 */
-	public static function isPhpPrimitiveType($phpType)
-	{
-		return in_array($phpType, array("boolean", "int", "double", "float", "string"));
-	}
-
-	/**
-	 * Convenience method to indicate whether a passed-in PHP type is a numeric primitive.
-	 *
-	 * @param      string $phpType The PHP type to check
-	 * @return     boolean Whether the PHP type is a primitive (string, int, boolean, float)
-	 */
-	public static function isPhpPrimitiveNumericType($phpType)
-	{
-		return in_array($phpType, array("boolean", "int", "double", "float"));
-	}
-
-	/**
-	 * Convenience method to indicate whether a passed-in PHP type is an object.
-	 *
-	 * @param      string $phpType The PHP type to check
-	 * @return     boolean Whether the PHP type is a primitive (string, int, boolean, float)
-	 */
-	public static function isPhpObjectType($phpType)
-	{
-		return (!self::isPhpPrimitiveType($phpType) && !in_array($phpType, array("resource", "array")));
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Rule.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Rule.php
deleted file mode 100644
index e222b00..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Rule.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/*
- *  $Id: Rule.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * Data about a validation rule used in an application.
- *
- * @author     Michael Aichler <aichler at mediacluster.de> (Propel)
- * @author     John McNally <jmcnally at collab.net> (Intake)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Rule extends XMLElement {
-
-	private $name;
-	private $value;
-	private $message;
-	private $validator;
-	private $classname;
-
-	/**
-	 * Sets up the Rule object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->name = $this->getAttribute("name");
-		$this->value = $this->getAttribute("value");
-		$this->classname = $this->getAttribute("class");
-
-		/*
-		* Set some default values if they are not specified.
-		* This is escpecially useful for maxLength; the size
-		* is already known by the column and this way it is
-		* not necessary to manage the same size two times.
-		*
-		* Currently there is only one such supported default:
-		*   - maxLength value = column max length
-		*   (this default cannot be easily set at runtime w/o changing
-		*   design of class system in undesired ways)
-		*/
-		if ($this->value === null) {
-			switch($this->name) {
-				case 'maxLength':
-					$this->value = $this->validator->getColumn()->getSize();
-					break;
-			}
-		}
-
-		$this->message = $this->getAttribute("message");
-	}
-
-	/**
-	 * Sets the owning validator for this rule.
-	 * @param      Validator $validator
-	 * @see        Validator::addRule()
-	 */
-	public function setValidator(Validator $validator)
-	{
-		$this->validator = $validator;
-	}
-
-	/**
-	 * Gets the owning validator for this rule.
-	 * @return     Validator
-	 */
-	public function getValidator()
-	{
-		return $this->validator;
-	}
-
-	/**
-	 * Sets the dot-path name of class to use for rule.
-	 * If no class is specified in XML, then a classname will
-	 * be built based on the 'name' attrib.
-	 * @param      string $classname dot-path classname (e.g. myapp.propel.MyValidator)
-	 */
-	public function setClass($classname)
-	{
-		$this->classname = $classname;
-	}
-
-	/**
-	 * Gets the dot-path name of class to use for rule.
-	 * If no class was specified, this method will build a default classname
-	 * based on the 'name' attribute.  E.g. 'maxLength' -> 'propel.validator.MaxLengthValidator'
-	 * @return     string dot-path classname (e.g. myapp.propel.MyValidator)
-	 */
-	public function getClass()
-	{
-		if ($this->classname === null && $this->name !== null) {
-			return "propel.validator." . ucfirst($this->name) . "Validator";
-		}
-		return $this->classname;
-	}
-
-	/**
-	 * Sets the name of the validator for this rule.
-	 * This name is used to build the classname if none was specified.
-	 * @param      string $name Validator name for this rule (e.g. "maxLength", "required").
-	 * @see        getClass()
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Gets the name of the validator for this rule.
-	 * @return     string Validator name for this rule (e.g. "maxLength", "required").
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Sets the value parameter for this validator rule.
-	 * Note: not all validators need a value parameter (e.g. 'required' validator
-	 * does not).
-	 * @param      string $value
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-	/**
-	 * Gets the value parameter for this validator rule.
-	 * @return     string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * Sets the message that will be displayed to the user if validation fails.
-	 * This message may be a Gettext msgid (if translation="gettext") or some other
-	 * id for an alternative not-yet-supported translation system.  It may also
-	 * be a simple, single-language string.
-	 * @param      string $message
-	 * @see        setTranslation()
-	 */
-	public function setMessage($message)
-	{
-		$this->message = $message;
-	}
-
-	/**
-	 * Gets the message that will be displayed to the user if validation fails.
-	 * This message may be a Gettext msgid (if translation="gettext") or some other
-	 * id for an alternative not-yet-supported translation system.  It may also
-	 * be a simple, single-language string.
-	 * @return     string
-	 * @see        setTranslation()
-	 */
-	public function getMessage()
-	{
-		$message = str_replace('${value}', $this->getValue(), $this->message);
-		return $message;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$ruleNode = $node->appendChild($doc->createElement('rule'));
-		$ruleNode->setAttribute('name', $this->getName());
-
-		if ($this->getValue() !== null) {
-			$ruleNode->setAttribute('value', $this->getValue());
-		}
-
-		if ($this->classname !== null) {
-			$ruleNode->setAttribute('class', $this->getClass());
-		}
-
-		$ruleNode->setAttribute('message', $this->getMessage());
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Table.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Table.php
deleted file mode 100644
index 7e4cc33..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Table.php
+++ /dev/null
@@ -1,1429 +0,0 @@
-<?php
-
-/*
- *  $Id: Table.php 1268 2009-10-30 22:51:21Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/IDMethod.php';
-include_once 'propel/engine/database/model/NameFactory.php';
-include_once 'propel/engine/database/model/Column.php';
-include_once 'propel/engine/database/model/Unique.php';
-include_once 'propel/engine/database/model/ForeignKey.php';
-include_once 'propel/engine/database/model/IdMethodParameter.php';
-include_once 'propel/engine/database/model/Validator.php';
-include_once 'propel/engine/database/model/Behavior.php';
-
-
-/**
- * Data about a table used in an application.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon at opticode.co.za> (Torque)
- * @author     Jason van Zyl <jvanzyl at apache.org> (Torque)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @author     John McNally <jmcnally at collab.net> (Torque)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @author     Byron Foster <byron_foster at yahoo.com> (Torque)
- * @version    $Revision: 1268 $
- * @package    propel.engine.database.model
- */
-class Table extends XMLElement implements IDMethod {
-
-  /**
-   * Enables some debug printing.
-   */
-  const DEBUG = false;
-
-  /**
-   * Columns for this table.
-   *
-   * @var        array Column[]
-   */
-  private $columnList = array();
-
-  /**
-   * Validators for this table.
-   *
-   * @var        array Validator[]
-   */
-  private $validatorList = array();
-
-  /**
-   * Foreign keys for this table.
-   *
-   * @var        array ForeignKey[]
-   */
-  private $foreignKeys = array();
-
-  /**
-   * Indexes for this table.
-   *
-   * @var        array Index[]
-   */
-  private $indices = array();
-
-  /**
-   * Unique indexes for this table.
-   *
-   * @var        array Unique[]
-   */
-  private $unices = array();
-
-  /**
-   * Any parameters for the ID method (currently supports changing sequence name).
-   *
-   * @var        array
-   */
-  private $idMethodParameters = array();
-
-  /**
-   * Table name.
-   *
-   * @var        string
-   */
-  private $name;
-
-  /**
-   * Table description.
-   *
-   * @var        string
-   */
-  private $description;
-
-  /**
-   * phpName for the table.
-   *
-   * @var        string
-   */
-  private $phpName;
-
-  /**
-   * ID method for the table (e.g. IDMethod::NATIVE, IDMethod::NONE).
-   *
-   * @var        string
-   */
-  private $idMethod;
-
-  /**
-   * Wether an INSERT with set PK is allowed on tables with IDMethod::NATIVE
-   *
-   * @var        boolean
-   */
-  private $allowPkInsert;
-
-  /**
-   * Strategry to use for converting column name to phpName.
-   *
-   * @var        string
-   */
-  private $phpNamingMethod;
-
-  /**
-   * The Database that this table belongs to.
-   *
-   * @var        Database
-   */
-  private $database;
-
-  /**
-   * Foreign Keys that refer to this table.
-   *
-   * @var        array ForeignKey[]
-   */
-  private $referrers = array();
-
-  /**
-   * Names of foreign tables.
-   *
-   * @var        array string[]
-   */
-  private $foreignTableNames;
-
-  /**
-   * Whether this table contains a foreign primary key.
-   *
-   * @var        boolean
-   */
-  private $containsForeignPK;
-
-  /**
-   * The inheritance column for this table (if any).
-   *
-   * @var        Column
-   */
-  private $inheritanceColumn;
-
-  /**
-   * Whether to skip generation of SQL for this table.
-   *
-   * @var        boolean
-   */
-  private $skipSql;
-
-  /**
-   * Whether this table is "read-only".
-   *
-   * @var        boolean
-   */
-  private $readOnly;
-
-  /**
-   * Whether this table should result in abstract OM classes.
-   *
-   * @var        boolean
-   */
-  private $abstractValue;
-
-  /**
-   * Whether this table is an alias for another table.
-   *
-   * @var        string
-   */
-  private $alias;
-
-  /**
-   * The interface that the generated "object" class should implement.
-   *
-   * @var        string
-   */
-  private $enterface;
-
-  /**
-   * The package for the generated OM.
-   *
-   * @var        string
-   */
-  private $pkg;
-
-  /**
-   * The base class to extend for the generated "object" class.
-   *
-   * @var        string
-   */
-  private $baseClass;
-
-  /**
-   * The base peer class to extend for generated "peer" class.
-   *
-   * @var        string
-   */
-  private $basePeer;
-
-  /**
-   * Map of columns by name.
-   *
-   * @var        array
-   */
-  private $columnsByName = array();
-
-  /**
-   * Map of columns by phpName.
-   *
-   * @var        array
-   */
-  private $columnsByPhpName = array();
-
-  /**
-   * Whether this table needs to use transactions in Postgres.
-   *
-   * @var        string
-   * @deprecated
-   */
-  private $needsTransactionInPostgres;
-
-  /**
-   * Whether to perform additional indexing on this table.
-   *
-   * @var        boolean
-   */
-  private $heavyIndexing;
-
-  /**
-   * Whether this table is for reference only.
-   *
-   * @var        boolean
-   */
-  private $forReferenceOnly;
-
-  /**
-   * The tree mode (nested set, etc.) implemented by this table.
-   *
-   * @var        string
-   */
-  private $treeMode;
-
-  /**
-   * Whether to reload the rows in this table after insert.
-   *
-   * @var        boolean
-   */
-  private $reloadOnInsert;
-
-  /**
-   * Whether to reload the rows in this table after update.
-   *
-   * @var        boolean
-   */
-  private $reloadOnUpdate;
-
-  /**
-   * List of behaviors registered for this table
-   * 
-   * @var array
-   */
-  protected $behaviors = array();
-
-  /**
-   * Constructs a table object with a name
-   *
-   * @param      string $name table name
-   */
-  public function __construct($name = null)
-  {
-    $this->name = $name;
-  }
-
-  /**
-   * Sets up the Rule object based on the attributes that were passed to loadFromXML().
-   * @see        parent::loadFromXML()
-   */
-  public function setupObject()
-  {
-    $this->name = $this->getAttribute("name");
-    $this->phpName = $this->getAttribute("phpName");
-    $this->idMethod = $this->getAttribute("idMethod", $this->getDatabase()->getDefaultIdMethod());
-    $this->allowPkInsert = $this->booleanValue($this->getAttribute("allowPkInsert"));
-
-    // retrieves the method for converting from specified name to a PHP name.
-    $this->phpNamingMethod = $this->getAttribute("phpNamingMethod", $this->getDatabase()->getDefaultPhpNamingMethod());
-
-    $this->skipSql = $this->booleanValue($this->getAttribute("skipSql"));
-    $this->readOnly = $this->booleanValue($this->getAttribute("readOnly"));
-
-    $this->pkg = $this->getAttribute("package");
-    $this->abstractValue = $this->booleanValue($this->getAttribute("abstract"));
-    $this->baseClass = $this->getAttribute("baseClass");
-    $this->basePeer = $this->getAttribute("basePeer");
-    $this->alias = $this->getAttribute("alias");
-
-    $this->heavyIndexing = ( $this->booleanValue($this->getAttribute("heavyIndexing"))
-    || ("false" !== $this->getAttribute("heavyIndexing")
-    && $this->getDatabase()->isHeavyIndexing() ) );
-    $this->description = $this->getAttribute("description");
-    $this->enterface = $this->getAttribute("interface"); // sic ('interface' is reserved word)
-    $this->treeMode = $this->getAttribute("treeMode");
-
-    $this->reloadOnInsert = $this->booleanValue($this->getAttribute("reloadOnInsert"));
-    $this->reloadOnUpdate = $this->booleanValue($this->getAttribute("reloadOnUpdate"));
-  }
-
-  /**
-   * <p>A hook for the SAX XML parser to call when this table has
-   * been fully loaded from the XML, and all nested elements have
-   * been processed.</p>
-   *
-   * <p>Performs heavy indexing and naming of elements which weren't
-   * provided with a name.</p>
-   */
-  public function doFinalInitialization()
-  {
-    // Heavy indexing must wait until after all columns composing
-    // a table's primary key have been parsed.
-    if ($this->heavyIndexing) {
-      $this->doHeavyIndexing();
-    }
-
-    // Name any indices which are missing a name using the
-    // appropriate algorithm.
-    $this->doNaming();
-
-    // execute behavior table modifiers
-    foreach ($this->getBehaviors() as $behavior)
-    {
-      $behavior->getTableModifier()->modifyTable();
-    }
-    
-    // if idMethod is "native" and in fact there are no autoIncrement
-    // columns in the table, then change it to "none"
-    $anyAutoInc = false;
-    foreach ($this->getColumns() as $col) {
-      if ($col->isAutoIncrement()) {
-        $anyAutoInc = true;
-      }
-    }
-    if ($this->getIdMethod() === IDMethod::NATIVE && !$anyAutoInc) {
-      $this->setIdMethod(IDMethod::NO_ID_METHOD);
-    }
-    
-    // If there is no PK, then throw an error. Propel 1.3 requires primary keys.
-    $pk = $this->getPrimaryKey();
-    if (empty($pk)) {
-      throw new EngineException("Table '".$this->getName()."' does not have a primary key defined.  Propel requires all tables to have a primary key.");
-    }
-
-  }
-
-  /**
-   * <p>Adds extra indices for multi-part primary key columns.</p>
-   *
-   * <p>For databases like MySQL, values in a where clause much
-   * match key part order from the left to right.  So, in the key
-   * definition <code>PRIMARY KEY (FOO_ID, BAR_ID)</code>,
-   * <code>FOO_ID</code> <i>must</i> be the first element used in
-   * the <code>where</code> clause of the SQL query used against
-   * this table for the primary key index to be used.  This feature
-   * could cause problems under MySQL with heavily indexed tables,
-   * as MySQL currently only supports 16 indices per table (i.e. it
-   * might cause too many indices to be created).</p>
-   *
-   * <p>See <a href="http://www.mysql.com/doc/E/X/EXPLAIN.html">the
-   * manual</a> for a better description of why heavy indexing is
-   * useful for quickly searchable database tables.</p>
-   */
-  private function doHeavyIndexing()
-  {
-    if (self::DEBUG) {
-      print("doHeavyIndex() called on table " . $this->name."\n");
-    }
-
-    $pk = $this->getPrimaryKey();
-    $size = count($pk);
-
-    // We start at an offset of 1 because the entire column
-    // list is generally implicitly indexed by the fact that
-    // it's a primary key.
-    for ($i=1; $i < $size; $i++) {
-      $idx = new Index();
-      $idx->setColumns(array_slice($pk, $i, $size));
-      $this->addIndex($idx);
-    }
-  }
-
-  /**
-   * Names composing objects which haven't yet been named.  This
-   * currently consists of foreign-key and index entities.
-   */
-  private function doNaming() {
-
-    // Assure names are unique across all databases.
-    try {
-      for ($i=0, $size = count($this->foreignKeys); $i < $size; $i++) {
-        $fk = $this->foreignKeys[$i];
-        $name = $fk->getName();
-        if (empty($name)) {
-          $name = $this->acquireConstraintName("FK", $i + 1);
-          $fk->setName($name);
-        }
-      }
-
-      for ($i = 0, $size = count($this->indices); $i < $size; $i++) {
-        $index = $this->indices[$i];
-        $name = $index->getName();
-        if (empty($name)) {
-          $name = $this->acquireConstraintName("I", $i + 1);
-          $index->setName($name);
-        }
-      }
-
-      for ($i = 0, $size = count($this->unices); $i < $size; $i++) {
-        $index = $this->unices[$i];
-        $name = $index->getName();
-        if (empty($name)) {
-          $name = $this->acquireConstraintName("U", $i + 1);
-          $index->setName($name);
-        }
-      }
-
-      // NOTE: Most RDBMSes can apparently name unique column
-      // constraints/indices themselves (using MySQL and Oracle
-      // as test cases), so we'll assume that we needn't add an
-      // entry to the system name list for these.
-    } catch (EngineException $nameAlreadyInUse) {
-      print $nameAlreadyInUse->getMessage() . "\n";
-      print $nameAlreadyInUse->getTraceAsString();
-    }
-  }
-
-  /**
-   * Macro to a constraint name.
-   *
-   * @param      nameType constraint type
-   * @param      nbr unique number for this constraint type
-   * @return     unique name for constraint
-   * @throws     EngineException
-   */
-  private function acquireConstraintName($nameType, $nbr)
-  {
-    $inputs = array();
-    $inputs[] = $this->getDatabase();
-    $inputs[] = $this->getName();
-    $inputs[] = $nameType;
-    $inputs[] = $nbr;
-    return NameFactory::generateName(NameFactory::CONSTRAINT_GENERATOR, $inputs);
-  }
-
-  /**
-   * Gets the value of base class for classes produced from this table.
-   *
-   * @return     The base class for classes produced from this table.
-   */
-  public function getBaseClass()
-  {
-    if ($this->isAlias() && $this->baseClass === null) {
-      return $this->alias;
-    } elseif ($this->baseClass === null) {
-      return $this->getDatabase()->getBaseClass();
-    } else {
-      return $this->baseClass;
-    }
-  }
-
-  /**
-   * Set the value of baseClass.
-   * @param      v  Value to assign to baseClass.
-   */
-  public function setBaseClass($v)
-  {
-    $this->baseClass = $v;
-  }
-
-  /**
-   * Get the value of basePeer.
-   * @return     value of basePeer.
-   */
-  public function getBasePeer()
-  {
-    if ($this->isAlias() && $this->basePeer === null) {
-      return $this->alias . "Peer";
-    } elseif ($this->basePeer === null) {
-      return $this->getDatabase()->getBasePeer();
-    } else {
-      return $this->basePeer;
-    }
-  }
-
-  /**
-   * Set the value of basePeer.
-   * @param      v  Value to assign to basePeer.
-   */
-  public function setBasePeer($v)
-  {
-    $this->basePeer = $v;
-  }
-
-  /**
-   * A utility function to create a new column from attrib and add it to this
-   * table.
-   *
-   * @param      $coldata xml attributes or Column class for the column to add
-   * @return     the added column
-   */
-  public function addColumn($data)
-  {
-    if ($data instanceof Column) {
-      $col = $data;
-      $col->setTable($this);
-      if ($col->isInheritance()) {
-        $this->inheritanceColumn = $col;
-      }
-      $this->columnList[] = $col;
-      $this->columnsByName[$col->getName()] = $col;
-      $this->columnsByPhpName[$col->getPhpName()] = $col;
-      $col->setPosition(count($this->columnList));
-      $this->needsTransactionInPostgres |= $col->requiresTransactionInPostgres();
-      return $col;
-    } else {
-      $col = new Column();
-      $col->setTable($this);
-      $col->loadFromXML($data);
-      return $this->addColumn($col); // call self w/ different param
-    }
-  }
-
-  /**
-   * Add a validator to this table.
-   *
-   * Supports two signatures:
-   * - addValidator(Validator $validator)
-   * - addValidator(array $attribs)
-   *
-   * @param      mixed $data Validator object or XML attribs (array) from <validator /> element.
-   * @return     Validator The added Validator.
-   * @throws     EngineException
-   */
-  public function addValidator($data)
-  {
-    if ($data instanceof Validator) {
-      $validator = $data;
-      $col = $this->getColumn($validator->getColumnName());
-      if ($col == null) {
-        throw new EngineException("Failed adding validator to table '" . $this->getName() .
-        "': column '" . $validator->getColumnName() . "' does not exist !");
-      }
-      $validator->setColumn($col);
-      $validator->setTable($this);
-      $this->validatorList[] = $validator;
-      return $validator;
-    } else {
-      $validator = new Validator();
-      $validator->setTable($this);
-      $validator->loadFromXML($data);
-      return $this->addValidator($validator);
-    }
-  }
-
-  /**
-   * A utility function to create a new foreign key
-   * from attrib and add it to this table.
-   */
-  public function addForeignKey($fkdata)
-  {
-    if ($fkdata instanceof ForeignKey) {
-      $fk = $fkdata;
-      $fk->setTable($this);
-      $this->foreignKeys[] = $fk;
-
-      if ($this->foreignTableNames === null) {
-        $this->foreignTableNames = array();
-      }
-      if (!in_array($fk->getForeignTableName(), $this->foreignTableNames)) {
-        $this->foreignTableNames[] = $fk->getForeignTableName();
-      }
-      return $fk;
-    } else {
-      $fk = new ForeignKey();
-      $fk->loadFromXML($fkdata);
-      return $this->addForeignKey($fk);
-    }
-  }
-
-  /**
-   * Gets the column that subclasses of the class representing this
-   * table can be produced from.
-   * @return     Column
-   */
-  public function getChildrenColumn()
-  {
-    return $this->inheritanceColumn;
-  }
-
-  /**
-   * Get the subclasses that can be created from this table.
-   * @return     array string[] Class names
-   */
-  public function getChildrenNames()
-  {
-    if ($this->inheritanceColumn === null
-    || !$this->inheritanceColumn->isEnumeratedClasses()) {
-      return null;
-    }
-    $children = $this->inheritanceColumn->getChildren();
-    $names = array();
-    for ($i = 0, $size=count($children); $i < $size; $i++) {
-      $names[] = get_class($children[$i]);
-    }
-    return $names;
-  }
-
-  /**
-   * Adds the foreign key from another table that refers to this table.
-   */
-  public function addReferrer(ForeignKey $fk)
-  {
-    if ($this->referrers === null) {
-      $this->referrers = array();
-    }
-    $this->referrers[] = $fk;
-  }
-
-  /**
-   * Get list of references to this table.
-   */
-  public function getReferrers()
-  {
-    return $this->referrers;
-  }
-
-  /**
-   * Set whether this table contains a foreign PK
-   */
-  public function setContainsForeignPK($b)
-  {
-    $this->containsForeignPK = (boolean) $b;
-  }
-
-  /**
-   * Determine if this table contains a foreign PK
-   */
-  public function getContainsForeignPK()
-  {
-    return $this->containsForeignPK;
-  }
-
-  /**
-   * A list of tables referenced by foreign keys in this table
-   */
-  public function getForeignTableNames()
-  {
-    if ($this->foreignTableNames === null) {
-      $this->foreignTableNames = array();
-    }
-    return $this->foreignTableNames;
-  }
-
-  /**
-   * Return true if the column requires a transaction in Postgres
-   */
-  public function requiresTransactionInPostgres()
-  {
-    return $this->needsTransactionInPostgres;
-  }
-
-  /**
-   * A utility function to create a new id method parameter
-   * from attrib or object and add it to this table.
-   */
-  public function addIdMethodParameter($impdata)
-  {
-    if ($impdata instanceof IdMethodParameter) {
-      $imp = $impdata;
-      $imp->setTable($this);
-      if ($this->idMethodParameters === null) {
-        $this->idMethodParameters = array();
-      }
-      $this->idMethodParameters[] = $imp;
-      return $imp;
-    } else {
-      $imp = new IdMethodParameter();
-      $imp->loadFromXML($impdata);
-      return $this->addIdMethodParameter($imp); // call self w/ diff param
-    }
-  }
-
-  /**
-   * Adds a new index to the index list and set the
-   * parent table of the column to the current table
-   */
-  public function addIndex($idxdata)
-  {
-    if ($idxdata instanceof Index) {
-      $index = $idxdata;
-      $index->setTable($this);
-      $index->getName(); // we call this method so that the name is created now if it doesn't already exist.
-      $this->indices[] = $index;
-      return $index;
-    } else {
-      $index = new Index($this);
-      $index->loadFromXML($idxdata);
-      return $this->addIndex($index);
-    }
-  }
-
-  /**
-   * Adds a new Unique to the Unique list and set the
-   * parent table of the column to the current table
-   */
-  public function addUnique($unqdata)
-  {
-    if ($unqdata instanceof Unique) {
-      $unique = $unqdata;
-      $unique->setTable($this);
-      $unique->getName(); // we call this method so that the name is created now if it doesn't already exist.
-      $this->unices[] = $unique;
-      return $unique;
-    } else {
-      $unique = new Unique($this);
-      $unique->loadFromXML($unqdata);
-      return $this->addUnique($unique);
-    }
-  }
-
-  /**
-   * Retrieves the configuration object, filled by build.properties
-   *
-   * @return GeneratorConfig
-   */
-  public function getGeneratorConfig()
-  {
-    return $this->getDatabase()->getAppData()->getPlatform()->getGeneratorConfig();
-  }
-  
-  /**
-   * Adds a new Behavior to the table
-   * @return Behavior A behavior instance
-   */
-  public function addBehavior($bdata)
-  {
-    if ($bdata instanceof Behavior) {
-      $behavior = $bdata;
-      $behavior->setTable($this);
-      $this->behaviors[$behavior->getName()] = $behavior;
-      return $behavior;
-    } else {
-      $class = $this->getConfiguredBehavior($bdata['name']);
-      $behavior = new $class();
-      $behavior->loadFromXML($bdata);
-      return $this->addBehavior($behavior);
-    }
-  }
-  
-  /**
-   * Get the table behaviors
-   * @return Array of Behavior objects
-   */
-  public function getBehaviors()
-  {
-    return $this->behaviors;
-  }
-  
-  /**
-   * Get one table behavior by name
-   * @param string $name the behavior name
-   * @return Behavior a behavior object
-   */
-  public function getBehavior($name)
-  {
-    return $this->behaviors[$name];
-  }
-
-  /**
-   * Get the name of the Table
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set the name of the Table
-   */
-  public function setName($newName)
-  {
-    $this->name = $newName;
-  }
-
-  /**
-   * Get the description for the Table
-   */
-  public function getDescription()
-  {
-    return $this->description;
-  }
-
-  /**
-   * Set the description for the Table
-   *
-   * @param      newDescription description for the Table
-   */
-  public function setDescription($newDescription)
-  {
-    $this->description = $newDescription;
-  }
-
-  /**
-   * Get name to use in PHP sources
-   * @return     string
-   */
-  public function getPhpName()
-  {
-    if ($this->phpName === null) {
-      $inputs = array();
-      $inputs[] = $this->name;
-      $inputs[] = $this->phpNamingMethod;
-      try {
-        $this->phpName = NameFactory::generateName(NameFactory::PHP_GENERATOR, $inputs);
-      } catch (EngineException $e) {
-        print $e->getMessage() . "\n";
-        print $e->getTraceAsString();
-      }
-    }
-    return $this->phpName;
-  }
-
-  /**
-   * Set name to use in PHP sources
-   * @param      string $phpName
-   */
-  public function setPhpName($phpName)
-  {
-    $this->phpName = $phpName;
-  }
-
-  /**
-   * Get the method for generating pk's
-   * [HL] changing behavior so that Database default
-   *        method is returned if no method has been specified
-   *        for the table.
-   * @return     string
-   */
-  public function getIdMethod()
-  {
-    if ($this->idMethod === null) {
-      return IDMethod::NO_ID_METHOD;
-    } else {
-      return $this->idMethod;
-    }
-  }
-
-  /**
-   * Whether we allow to insert primary keys on tables with
-   * idMethod=native
-   *
-   * @return     boolean
-   */
-  public function isAllowPkInsert()
-  {
-    return $this->allowPkInsert;
-  }
-
-
-  /**
-   * Set the method for generating pk's
-   */
-  public function setIdMethod($idMethod)
-  {
-    $this->idMethod = $idMethod;
-  }
-
-  /**
-   * Skip generating sql for this table (in the event it should
-   * not be created from scratch).
-   * @return     boolean Value of skipSql.
-   */
-  public function isSkipSql()
-  {
-    return ($this->skipSql || $this->isAlias() || $this->isForReferenceOnly());
-  }
-
-  /**
-   * Is table read-only, in which case only accessors (and relationship setters)
-   * will be created.
-   * @return     boolan Value of readOnly.
-   */
-  public function isReadOnly()
-  {
-    return $this->readOnly;
-  }
-
-  /**
-   * Set whether this table should have its creation sql generated.
-   * @param      boolean $v Value to assign to skipSql.
-   */
-  public function setSkipSql($v)
-  {
-    $this->skipSql = $v;
-  }
-
-  /**
-   * Whether to force object to reload on INSERT.
-   * @return     boolean
-   */
-  public function isReloadOnInsert()
-  {
-    return $this->reloadOnInsert;
-  }
-
-  /**
-   * Whether to force object to reload on UPDATE.
-   * @return     boolean
-   */
-  public function isReloadOnUpdate()
-  {
-    return $this->reloadOnUpdate;
-  }
-
-  /**
-   * PhpName of om object this entry references.
-   * @return     value of external.
-   */
-  public function getAlias()
-  {
-    return $this->alias;
-  }
-
-  /**
-   * Is this table specified in the schema or is there just
-   * a foreign key reference to it.
-   * @return     value of external.
-   */
-  public function isAlias()
-  {
-    return ($this->alias !== null);
-  }
-
-  /**
-   * Set whether this table specified in the schema or is there just
-   * a foreign key reference to it.
-   * @param      v  Value to assign to alias.
-   */
-  public function setAlias($v)
-  {
-    $this->alias = $v;
-  }
-
-
-  /**
-   * Interface which objects for this table will implement
-   * @return     value of interface.
-   */
-  public function getInterface()
-  {
-    return $this->enterface;
-  }
-
-  /**
-   * Interface which objects for this table will implement
-   * @param      v  Value to assign to interface.
-   */
-  public function setInterface($v)
-  {
-    $this->enterface = $v;
-  }
-
-  /**
-   * When a table is abstract, it marks the business object class that is
-   * generated as being abstract. If you have a table called "FOO", then the
-   * Foo BO will be <code>public abstract class Foo</code>
-   * This helps support class hierarchies
-   *
-   * @return     value of abstractValue.
-   */
-  public function isAbstract()
-  {
-    return $this->abstractValue;
-  }
-
-  /**
-   * When a table is abstract, it marks the business object
-   * class that is generated as being abstract. If you have a
-   * table called "FOO", then the Foo BO will be
-   * <code>public abstract class Foo</code>
-   * This helps support class hierarchies
-   *
-   * @param      v  Value to assign to abstractValue.
-   */
-  public function setAbstract($v)
-  {
-    $this->abstractValue = (boolean) $v;
-  }
-
-  /**
-   * Get the value of package.
-   * @return     value of package.
-   */
-  public function getPackage()
-  {
-    return $this->pkg;
-  }
-
-  /**
-   * Set the value of package.
-   * @param      v  Value to assign to package.
-   */
-  public function setPackage($v)
-  {
-    $this->pkg = $v;
-  }
-
-  /**
-   * Returns an Array containing all the columns in the table
-   * @return     array Column[]
-   */
-  public function getColumns()
-  {
-    return $this->columnList;
-  }
-
-  /**
-   * Utility method to get the number of columns in this table
-   */
-  public function getNumColumns()
-  {
-    return count($this->columnList);
-  }
-
-  /**
-   * Utility method to get the number of columns in this table
-   */
-  public function getNumLazyLoadColumns()
-  {
-    $count = 0;
-    foreach ($this->columnList as $col) {
-      if ($col->isLazyLoad()) {
-        $count++;
-      }
-    }
-    return $count;
-  }
-
-  /**
-   * Returns an Array containing all the validators in the table
-   * @return     array Validator[]
-   */
-  public function getValidators()
-  {
-    return $this->validatorList;
-  }
-
-  /**
-   * Returns an Array containing all the FKs in the table.
-   * @return     array ForeignKey[]
-   */
-  public function getForeignKeys()
-  {
-    return $this->foreignKeys;
-  }
-
-  /**
-   * Returns a Collection of parameters relevant for the chosen
-   * id generation method.
-   */
-  public function getIdMethodParameters()
-  {
-    return $this->idMethodParameters;
-  }
-
-  /**
-   * Returns an Array containing all the FKs in the table
-   * @return     array Index[]
-   */
-  public function getIndices()
-  {
-    return $this->indices;
-  }
-
-  /**
-   * Returns an Array containing all the UKs in the table
-   * @return     array Unique[]
-   */
-  public function getUnices()
-  {
-    return $this->unices;
-  }
-
-  /**
-   * Returns a specified column.
-   * @return     Column Return a Column object or null if it does not exist.
-   */
-  public function getColumn($name)
-  {
-    return @$this->columnsByName[$name];
-  }
-
-  /**
-   * Returns a specified column.
-   * @return     Column Return a Column object or null if it does not exist.
-   */
-  public function getColumnByPhpName($phpName)
-  {
-    return @$this->columnsByPhpName[$phpName];
-  }
-
-  /**
-   * Get all the foreign keys from this table to the specufued tabke.
-   * @return     array ForeignKey[]
-   */
-  public function getForeignKeysReferencingTable($tablename)
-  {
-    $matches = array();
-    $keys = $this->getForeignKeys();
-    foreach ($keys as $fk) {
-      if ($fk->getForeignTableName() === $tablename) {
-        $matches[] = $fk;
-      }
-    }
-    return $matches;
-  }
-
-  /**
-   * Return the foreign keys that includes col in it's list of local columns.
-   * Eg. Foreign key (a,b,c) refrences tbl(x,y,z) will be returned of col is either a,b or c.
-   * @param      string $col
-   * @return     array ForeignKey[] or null if there is no FK for specified column.
-   */
-  public function getColumnForeignKeys($colname)
-  {
-    $matches = array();
-    foreach ($this->foreignKeys as $fk) {
-      if (in_array($colname, $fk->getLocalColumns())) {
-        $matches[] = $fk;
-      }
-    }
-    return $matches;
-  }
-
-  /**
-   * Returns true if the table contains a specified column
-   * @param      mixed $col Column or column name.
-   */
-  public function containsColumn($col)
-  {
-    if ($col instanceof Column) {
-      return in_array($col, $this->columnList);
-    } else {
-      return ($this->getColumn($col) !== null);
-    }
-  }
-
-  /**
-   * Set the database that contains this table.
-   *
-   * @param      Database $db
-   */
-  public function setDatabase(Database $db)
-  {
-    $this->database = $db;
-  }
-
-  /**
-   * Get the database that contains this table.
-   *
-   * @return     Database
-   */
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-
-  /**
-   * Flag to determine if code/sql gets created for this table.
-   * Table will be skipped, if return true.
-   * @return     boolean
-   */
-  public function isForReferenceOnly()
-  {
-    return $this->forReferenceOnly;
-  }
-
-  /**
-   * Flag to determine if code/sql gets created for this table.
-   * Table will be skipped, if set to true.
-   * @param      boolean $v
-   */
-  public function setForReferenceOnly($v)
-  {
-    $this->forReferenceOnly = (boolean) $v;
-  }
-
-  /**
-   * Flag to determine if tree node class should be generated for this table.
-   * @return     valur of treeMode
-   */
-  public function treeMode()
-  {
-    return $this->treeMode;
-  }
-
-  /**
-   * Flag to determine if tree node class should be generated for this table.
-   * @param      v  Value to assign to treeMode.
-   */
-  public function setTreeMode($v)
-  {
-    $this->treeMode = $v;
-  }
-
-  /**
-   * Appends XML nodes to passed-in DOMNode.
-   *
-   * @param      DOMNode $node
-   */
-  public function appendXml(DOMNode $node)
-  {
-    $doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-    $tableNode = $node->appendChild($doc->createElement('table'));
-    $tableNode->setAttribute('name', $this->getName());
-
-    if ($this->phpName !== null) {
-      $tableNode->setAttribute('phpName', $this->phpName);
-    }
-
-    if ($this->idMethod !== null) {
-      $tableNode->setAttribute('idMethod', $this->idMethod);
-    }
-
-    if ($this->skipSql !== null) {
-      $tableNode->setAttribute('idMethod', var_export($this->skipSql, true));
-    }
-
-    if ($this->readOnly !== null) {
-      $tableNode->setAttribute('readOnly', var_export($this->readOnly, true));
-    }
-
-    if ($this->treeMode !== null) {
-      $tableNode->setAttribute('treeMode', $this->treeMode);
-    }
-
-    if ($this->reloadOnInsert !== null) {
-      $tableNode->setAttribute('reloadOnInsert', var_export($this->reloadOnInsert, true));
-    }
-
-    if ($this->reloadOnUpdate !== null) {
-      $tableNode->setAttribute('reloadOnUpdate', var_export($this->reloadOnUpdate, true));
-    }
-
-    if ($this->forReferenceOnly !== null) {
-      $tableNode->setAttribute('forReferenceOnly', var_export($this->forReferenceOnly, true));
-    }
-
-    if ($this->abstractValue !== null) {
-      $tableNode->setAttribute('abstract', var_export($this->abstractValue, true));
-    }
-
-    if ($this->enterface !== null) {
-      $tableNode->setAttribute('interface', $this->enterface);
-    }
-
-    if ($this->description !== null) {
-      $tableNode->setAttribute('description', $this->description);
-    }
-
-    if ($this->baseClass !== null) {
-      $tableNode->setAttribute('baseClass', $this->baseClass);
-    }
-
-    if ($this->basePeer !== null) {
-      $tableNode->setAttribute('basePeer', $this->basePeer);
-    }
-
-    foreach ($this->columnList as $col) {
-      $col->appendXml($tableNode);
-    }
-
-    foreach ($this->validatorList as $validator) {
-      $validator->appendXml($tableNode);
-    }
-
-    foreach ($this->foreignKeys as $fk) {
-      $fk->appendXml($tableNode);
-    }
-
-    foreach ($this->idMethodParameters as $param) {
-      $param->appendXml($tableNode);
-    }
-
-    foreach ($this->indices as $index) {
-      $index->appendXml($tableNode);
-    }
-
-    foreach ($this->unices as $unique) {
-      $unique->appendXml($tableNode);
-    }
-
-    foreach ($this->vendorInfos as $vi) {
-      $vi->appendXml($tableNode);
-    }
-
-  }
-
-  /**
-   * Returns the collection of Columns which make up the single primary
-   * key for this table.
-   *
-   * @return     array Column[] A list of the primary key parts.
-   */
-  public function getPrimaryKey()
-  {
-    $pk = array();
-    foreach ($this->columnList as $col) {
-      if ($col->isPrimaryKey()) {
-        $pk[] = $col;
-      }
-    }
-    return $pk;
-  }
-
-  /**
-   * Determine whether this table has a primary key.
-   *
-   * @return     boolean Whether this table has any primary key parts.
-   */
-  public function hasPrimaryKey()
-  {
-    return (count($this->getPrimaryKey()) > 0);
-  }
-
-  /**
-   * Determine whether this table has any auto-increment primary key(s).
-   *
-   * @return     boolean Whether this table has a non-"none" id method and has a primary key column that is auto-increment.
-   */
-  public function hasAutoIncrementPrimaryKey()
-  {
-    if ($this->getIdMethod() != IDMethod::NO_ID_METHOD) {
-      $pks =$this->getPrimaryKey();
-      foreach ($pks as $pk) {
-        if ($pk->isAutoIncrement()) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Gets the auto increment PK
-   *
-   * @return    Column if any auto increment PK column
-   */
-  public function getAutoIncrementPrimaryKey()
-  {
-    if ($this->getIdMethod() != IDMethod::NO_ID_METHOD) {
-      $pks =$this->getPrimaryKey();
-      foreach ($pks as $pk) {
-        if ($pk->isAutoIncrement()) {
-          return $pk;
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns all parts of the primary key, separated by commas.
-   *
-   * @return     A CSV list of primary key parts.
-   * @deprecated Use the DDLBuilder->getColumnList() with the #getPrimaryKey() method.
-   */
-  public function printPrimaryKey()
-  {
-    return $this->printList($this->columnList);
-  }
-
-  /**
-   * Returns the elements of the list, separated by commas.
-   * @param      array $list
-   * @return     A CSV list.
-   * @deprecated Use the DDLBuilder->getColumnList() with the #getPrimaryKey() method.
-   */
-  private function printList($list){
-    $result = "";
-    $comma = 0;
-    for ($i=0,$_i=count($list); $i < $_i; $i++) {
-      $col = $list[$i];
-      if ($col->isPrimaryKey()) {
-        $result .= ($comma++ ? ',' : '') . $this->getDatabase()->getPlatform()->quoteIdentifier($col->getName());
-      }
-    }
-    return $result;
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Unique.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Unique.php
deleted file mode 100644
index 4ef0fe7..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Unique.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- *  $Id: Unique.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/Index.php';
-
-/**
- * Information about unique columns of a table.  This class assumes
- * that in the underlying RDBMS, unique constraints and unique indices
- * are roughly equivalent.  For example, adding a unique constraint to
- * a column also creates an index on that column (this is known to be
- * true for MySQL and Oracle).
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jason van Zyl <jvanzyl at apache.org> (Torque)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Unique extends Index {
-
-	/**
-	 * Returns <code>true</code>.
-	 */
-	public function isUnique()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$uniqueNode = $node->appendChild($doc->createElement('unique'));
-		$uniqueNode->setAttribute('name', $this->getName());
-		$columns = $this->getColumns();
-		foreach ($this->getColumns() as $colname) {
-			$uniqueColNode = $uniqueNode->appendChild($doc->createElement('unique-column'));
-			$uniqueColNode->setAttribute('name', $colname);
-		}
-
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($uniqueNode);
-		}
-	}
-
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Validator.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Validator.php
deleted file mode 100644
index 5cd34e8..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/Validator.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/*
- *  $Id: Validator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-include_once 'propel/engine/database/model/Rule.php';
-
-/**
- * Validator.
- *
- * @author     Michael Aichler <aichler at mediacluster.de> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Validator extends XMLElement {
-
-	const TRANSLATE_NONE = "none";
-	const TRANSLATE_GETTEXT = "gettext";
-
-	/**
-	 * The column this validator applies to.
-	 *
-	 * @var        Column
-	 */
-	private $column;
-
-	/**
-	 * The rules for the validation.
-	 *
-	 * @var        array Rule[]
-	 */
-	private $ruleList = array();
-
-	/**
-	 * The translation mode.
-	 *
-	 * @var        string
-	 */
-	private $translate;
-
-	/**
-	 * Parent table.
-	 *
-	 * @var        Table
-	 */
-	private $table;
-
-	/**
-	 * Sets up the Validator object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->column = $this->getTable()->getColumn($this->getAttribute("column"));
-		$this->translate = $this->getAttribute("translate", $this->getTable()->getDatabase()->getDefaultTranslateMethod());;
-	}
-
-	/**
-	 * Add a Rule to this validator.
-	 * Supports two signatures:
-	 * - addRule(Rule $rule)
-	 * - addRule(array $attribs)
-	 * @param      mixed $data Rule object or XML attribs (array) from <rule/> element.
-	 * @return     Rule The added Rule.
-	 */
-	public function addRule($data)
-	{
-		if ($data instanceof Rule) {
-			$rule = $data; // alias
-			$rule->setValidator($this);
-			$this->ruleList[] = $rule;
-			return $rule;
-		}
-		else {
-			$rule = new Rule();
-			$rule->setValidator($this);
-			$rule->loadFromXML($data);
-			return $this->addRule($rule); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Gets an array of all added rules for this validator.
-	 * @return     array Rule[]
-	 */
-	public function getRules()
-	{
-		return $this->ruleList;
-	}
-
-	/**
-	 * Gets the name of the column that this Validator applies to.
-	 * @return     string
-	 */
-	public function getColumnName()
-	{
-		return $this->column->getName();
-	}
-
-	/**
-	 * Sets the Column object that this validator applies to.
-	 * @param      Column $column
-	 * @see        Table::addValidator()
-	 */
-	public function setColumn(Column $column)
-	{
-		$this->column = $column;
-	}
-
-	/**
-	 * Gets the Column object that this validator applies to.
-	 * @return     Column
-	 */
-	public function getColumn()
-	{
-		return $this->column;
-	}
-
-	/**
-	 * Set the owning Table.
-	 * @param      Table $table
-	 */
-	public function setTable(Table $table)
-	{
-		$this->table = $table;
-	}
-
-	/**
-	 * Get the owning Table.
-	 * @return     Table
-	 */
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	/**
-	 * Set the translation mode to use for the message.
-	 * Currently only "gettext" and "none" are supported.  The default is "none".
-	 * @param      string $method Translation method ("gettext", "none").
-	 */
-	public function setTranslate($method)
-	{
-		$this->translate = $method;
-	}
-
-	/**
-	 * Get the translation mode to use for the message.
-	 * Currently only "gettext" and "none" are supported.  The default is "none".
-	 * @return     string Translation method ("gettext", "none").
-	 */
-	public function getTranslate()
-	{
-		return $this->translate;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$valNode = $node->appendChild($doc->createElement('validator'));
-		$valNode->setAttribute('column', $this->getColumnName());
-
-		if ($this->translate !== null) {
-			$valNode->setAttribute('translate', $this->translate);
-		}
-
-		foreach ($this->ruleList as $rule) {
-			$rule->appendXml($valNode);
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/VendorInfo.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/VendorInfo.php
deleted file mode 100644
index f163c64..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/VendorInfo.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*
- *  $Id: VendorInfo.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-
-/**
- * Object to hold vendor-specific info.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class VendorInfo extends XMLElement {
-
-	/**
-	 * The vendor RDBMS type.
-	 *
-	 * @var        string
-	 */
-	private $type;
-
-	/**
-	 * Vendor parameters.
-	 *
-	 * @var        array
-	 */
-	private $parameters = array();
-
-	/**
-	 * Creates a new VendorInfo instance.
-	 *
-	 * @param      string $type RDBMS type (optional)
-	 */
-	public function __construct($type = null)
-	{
-		$this->type = $type;
-	}
-
-	/**
-	 * Sets up this object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->type = $this->getAttribute("type");
-	}
-
-	/**
-	 * Set RDBMS type for this vendor-specific info.
-	 *
-	 * @param      string $v
-	 */
-	public function setType($v)
-	{
-		$this->type = $v;
-	}
-
-	/**
-	 * Get RDBMS type for this vendor-specific info.
-	 *
-	 * @return     string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * Adds a new vendor parameter to this object.
-	 * @param      array $attrib Attributes from XML.
-	 */
-	public function addParameter($attrib)
-	{
-		$name = $attrib["name"];
-		$this->parameters[$name] = $attrib["value"];
-	}
-
-	/**
-	 * Sets parameter value.
-	 *
-	 * @param      string $name
-	 * @param      mixed $value The value for the parameter.
-	 */
-	public function setParameter($name, $value)
-	{
-		$this->parameters[$name] = $value;
-	}
-
-	/**
-	 * Gets parameter value.
-	 *
-	 * @param      string $name
-	 * @return     mixed Paramter value.
-	 */
-	public function getParameter($name)
-	{
-		if (isset($this->parameters[$name])) {
-			return $this->parameters[$name];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * Whether parameter exists.
-	 *
-	 * @param      string $name
-	 */
-	public function hasParameter($name)
-	{
-		return isset($this->parameters[$name]);
-	}
-
-	/**
-	 * Sets assoc array of parameters for venfor specific info.
-	 *
-	 * @param      array $params Paramter data.
-	 */
-	public function setParameters(array $params = array())
-	{
-		$this->parameters = $params;
-	}
-
-	/**
-	 * Gets assoc array of parameters for venfor specific info.
-	 *
-	 * @return     array
-	 */
-	public function getParameters()
-	{
-		return $this->parameters;
-	}
-
-	/**
-	 * Gets a new merged VendorInfo object.
-	 * @param      VendorInfo $info
-	 * @return     VendorInfo new object with merged parameters
-	 */
-	public function getMergedVendorInfo(VendorInfo $merge)
-	{
-		$newParams = array_merge($this->getParameters(), $merge->getParameters());
-		$newInfo = new VendorInfo($this->getType());
-		$newInfo->setParameters($newParams);
-		return $newInfo;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$vendorNode = $node->appendChild($doc->createElement("vendor"));
-		$vendorNode->setAttribute("type", $this->getType());
-
-		foreach ($this->parameters as $key => $value) {
-			$parameterNode = $doc->createElement("parameter");
-			$parameterNode->setAttribute("name", $key);
-			$parameterNode->setAttribute("value", $value);
-			$vendorNode->appendChild($parameterNode);
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/XMLElement.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/XMLElement.php
deleted file mode 100644
index 7e57128..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/model/XMLElement.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- *  $Id: XMLElement.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/VendorInfo.php';
-
-/**
- * An abstract class for elements represented by XML tags (e.g. Column, Table).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-abstract class XMLElement {
-
-	/**
-	 * The name => value attributes from XML.
-	 *
-	 * @var        array
-	 */
-	protected $attributes = array();
-
-	/**
-	 * Any associated vendor-specific information objects.
-	 *
-	 * @var        array VendorInfo[]
-	 */
-	protected $vendorInfos = array();
-
-	/**
-	 * Replaces the old loadFromXML() so that we can use loadFromXML() to load the attribs into the class.
-	 */
-	abstract protected function setupObject();
-
-	/**
-	 * This is the entry point method for loading data from XML.
-	 * It calls a setupObject() method that must be implemented by the child class.
-	 * @param      array $attributes The attributes for the XML tag.
-	 */
-	public function loadFromXML($attributes)
-	{
-		$this->attributes = array_change_key_case($attributes, CASE_LOWER);
-		$this->setupObject();
-	}
-
-	/**
-	 * Returns the assoc array of attributes.
-	 * All attribute names (keys) are lowercase.
-	 * @return     array
-	 */
-	public function getAttributes()
-	{
-		return $this->attributes;
-	}
-
-	/**
-	 * Gets a particular attribute by [case-insensitive] name.
-	 * If attribute is not set then the $defaultValue is returned.
-	 * @param      string $name The [case-insensitive] name of the attribute to lookup.
-	 * @param      mixed $defaultValue The default value to use in case the attribute is not set.
-	 * @return     mixed The value of the attribute or $defaultValue if not set.
-	 */
-	public function getAttribute($name, $defaultValue = null)
-	{
-		$name = strtolower($name);
-		if (isset($this->attributes[$name])) {
-			return $this->attributes[$name];
-		} else {
-			return $defaultValue;
-		}
-	}
-
-	/**
-	 * Converts value specified in XML to a boolean value.
-	 * This is to support the default value when used w/ a boolean column.
-	 * @return     value
-	 */
-	protected function booleanValue($val)
-	{
-		if (is_numeric($val)) {
-			return (bool) $val;
-		} else {
-			return (in_array(strtolower($val), array('true', 't', 'y', 'yes'), true) ? true : false);
-		}
-	}
-
-	/**
-	 * Appends DOM elements to represent this object in XML.
-	 * @param      DOMNode $node
-	 */
-	abstract public function appendXml(DOMNode $node);
-
-	/**
-	 * Sets an associated VendorInfo object.
-	 *
-	 * @param      mixed $data VendorInfo object or XML attrib data (array)
-	 * @return     VendorInfo
-	 */
-	public function addVendorInfo($data)
-	{
-		if ($data instanceof VendorInfo) {
-			$vi = $data;
-			$this->vendorInfos[$vi->getType()] = $vi;
-			return $vi;
-		} else {
-			$vi = new VendorInfo();
-			$vi->loadFromXML($data);
-			return $this->addVendorInfo($vi); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Gets the any associated VendorInfo object.
-	 * @return     VendorInfo
-	 */
-	public function getVendorInfoForType($type)
-	{
-		if (isset($this->vendorInfos[$type])) {
-			return $this->vendorInfos[$type];
-		} else {
-			// return an empty object
-			return new VendorInfo();
-		}
-	}
-
-  /**
-   * Find the best class name for a given behavior
-   * Looks in build.properties for path like propel.behavior.[bname].class
-   * If not found, tries to autoload [Bname]Behavior
-   * If no success, returns 'Behavior'
-   * 
-   * @param  string $bname behavior name, e.g. 'timestampable'
-   * @return string        behavior class name, e.g. 'TimestampableBehavior'
-   */
-  public function getConfiguredBehavior($bname)
-  {
-    if ($config = $this->getGeneratorConfig()) {
-      if ($class = $config->getConfiguredBehavior($bname)) {
-        return $class;
-      }
-    }
-    // first fallback: maybe the behavior is loaded or autoloaded
-    $gen = new PhpNameGenerator();
-    if(class_exists($class = $gen->generateName($bname, PhpNameGenerator::CONV_METHOD_PHPNAME) . 'Behavior')) {
-      return $class;
-    }
-    // second fallback: use parent behavior class (mostly for unit tests)
-    return 'Behavior';
-  }
-
-	/**
-	 * String representation of the current object.
-	 *
-	 * This is an xml representation with the XML declaration removed.
-	 *
-	 * @see        appendXml()
-	 */
-	public function toString()
-	{
-		$doc = new DOMDocument('1.0');
-		$doc->formatOutput = true;
-		$this->appendXml($doc);
-		$xmlstr = $doc->saveXML();
-		return trim(preg_replace('/<\?xml.*?\?>/', '', $xmlstr));
-	}
-	
-	/**
-	 * Magic string method
-	 * @see toString()
-	 */
-	public function __toString()
-	{
-	  return $this->toString();
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/BaseSchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/BaseSchemaParser.php
deleted file mode 100644
index 81ca637..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/BaseSchemaParser.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/*
- *  $Id: BaseSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/SchemaParser.php';
-
-/**
- * Base class for reverse engineering a database schema.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse
- */
-abstract class BaseSchemaParser implements SchemaParser {
-
-	/**
-	 * The database connection.
-	 * @var        PDO
-	 */
-	protected $dbh;
-
-	/**
-	 * Stack of warnings.
-	 *
-	 * @var        array string[]
-	 */
-	protected $warnings = array();
-
-	/**
-	 * GeneratorConfig object holding build properties.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * Map native DB types to Propel types.
-	 * (Override in subclasses.)
-	 * @var        array
-	 */
-	protected $nativeToPropelTypeMap;
-
-	/**
-	 * Map to hold reverse type mapping (initialized on-demand).
-	 *
-	 * @var        array
-	 */
-	protected $reverseTypeMap;
-
-	/**
-	 * @param      PDO $dbh Optional database connection
-	 */
-	public function __construct(PDO $dbh = null)
-	{
-		if ($dbh) $this->setConnection($dbh);
-	}
-
-	/**
-	 * Sets the database connection.
-	 *
-	 * @param      PDO $dbh
-	 */
-	public function setConnection(PDO $dbh)
-	{
-		$this->dbh = $dbh;
-	}
-
-	/**
-	 * Gets the database connection.
-	 * @return     PDO
-	 */
-	public function getConnection()
-	{
-		return $this->dbh;
-	}
-
-	/**
-	 * Pushes a message onto the stack of warnings.
-	 *
-	 * @param      string $msg The warning message.
-	 */
-	protected function warn($msg)
-	{
-		$this->warnings[] = $msg;
-	}
-
-	/**
-	 * Gets array of warning messages.
-	 *
-	 * @return     array string[]
-	 */
-	public function getWarnings()
-	{
-		return $this->warnings;
-	}
-
-	/**
-	 * Sets the GeneratorConfig to use in the parsing.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config)
-	{
-		$this->generatorConfig = $config;
-	}
-
-	/**
-	 * Gets the GeneratorConfig option.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig()
-	{
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Gets a specific propel (renamed) property from the build.
-	 *
-	 * @param      string $name
-	 * @return     mixed
-	 */
-	public function getBuildProperty($name)
-	{
-		if ($this->generatorConfig !== null) {
-			return $this->generatorConfig->getBuildProperty($name);
-		}
-		return null;
-	}
-
-	/**
-	 * Gets a type mapping from native type to Propel type.
-	 *
-	 * @return     array The mapped Propel type.
-	 */
-	abstract protected function getTypeMapping();
-
-	/**
-	 * Gets a mapped Propel type for specified native type.
-	 *
-	 * @param      string $nativeType
-	 * @return     string The mapped Propel type.
-	 */
-	protected function getMappedPropelType($nativeType)
-	{
-		if ($this->nativeToPropelTypeMap === null) {
-			$this->nativeToPropelTypeMap = $this->getTypeMapping();
-		}
-		if (isset($this->nativeToPropelTypeMap[$nativeType])) {
-			return $this->nativeToPropelTypeMap[$nativeType];
-		}
-		return null;
-	}
-
-	/**
-	 * Give a best guess at the native type.
-	 *
-	 * @param      string $propelType
-	 * @return     string The native SQL type that best matches the specified Propel type.
-	 */
-	protected function getMappedNativeType($propelType)
-	{
-		if ($this->reverseTypeMap === null) {
-			$this->reverseTypeMap = array_flip($this->getTypeMapping());
-		}
-		return isset($this->reverseTypeMap[$propelType]) ? $this->reverseTypeMap[$propelType] : null;
-	}
-
-	/**
-	 * Gets a new VendorInfo object for this platform with specified params.
-	 *
-	 * @param      array $params
-	 */
-	protected function getNewVendorInfoObject(array $params)
-	{
-		$type = $this->getGeneratorConfig()->getConfiguredPlatform()->getDatabaseType();
-		$vi = new VendorInfo($type);
-		$vi->setParameters($params);
-		return $vi;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/SchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/SchemaParser.php
deleted file mode 100644
index 6f5fbfe..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/SchemaParser.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- *  $Id: SchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Interface for reverse engineering schema parsers.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse
- */
-interface SchemaParser {
-
-	/**
-	 * Gets the database connection.
-	 * @return     PDO
-	 */
-	public function getConnection();
-
-	/**
-	 * Sets the database connection.
-	 *
-	 * @param      PDO $dbh
-	 */
-	public function setConnection(PDO $dbh);
-
-	/**
-	 * Sets the GeneratorConfig to use in the parsing.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config);
-
-	/**
-	 * Gets a specific propel (renamed) property from the build.
-	 *
-	 * @param      string $name
-	 * @return     mixed
-	 */
-	public function getBuildProperty($name);
-
-	/**
-	 * Gets array of warning messages.
-	 * @return     array string[]
-	 */
-	public function getWarnings();
-
-	/**
-	 * Parse the schema and populate passed-in Database model object.
-	 *
-	 * @param      Database $database
-	 */
-	public function parse(Database $database);
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php
deleted file mode 100644
index 9cab29a..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/*
- *  $Id: MssqlSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Microsoft SQL Server database schema parser.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse.mssql
- */
-class MssqlSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map MSSQL native types to Propel types.
-	 * @var        array
-	 */
-	private static $mssqlTypeMap = array(
-		"binary" => CreoleTypes::BINARY,
-		"bit" => PropelTypes::BOOLEAN,
-		"char" => PropelTypes::CHAR,
-		"datetime" => PropelTypes::TIMESTAMP,
-		"decimal() identity"  => PropelTypes::DECIMAL,
-		"decimal"  => PropelTypes::DECIMAL,
-		"image" => PropelTypes::LONGVARBINARY,
-		"int" => PropelTypes::INTEGER,
-		"int identity" => PropelTypes::INTEGER,
-		"integer" => PropelTypes::INTEGER,
-		"money" => PropelTypes::DECIMAL,
-		"nchar" => PropelTypes::CHAR,
-		"ntext" => PropelTypes::LONGVARCHAR,
-		"numeric() identity" => PropelTypes::NUMERIC,
-		"numeric" => PropelTypes::NUMERIC,
-		"nvarchar" => PropelTypes::VARCHAR,
-		"real" => PropelTypes::REAL,
-		"float" => PropelTypes::FLOAT,
-		"smalldatetime" => PropelTypes::TIMESTAMP,
-		"smallint" => PropelTypes::SMALLINT,
-		"smallint identity" => PropelTypes::SMALLINT,
-		"smallmoney" => PropelTypes::DECIMAL,
-		"sysname" => PropelTypes::VARCHAR,
-		"text" => PropelTypes::LONGVARCHAR,
-		"timestamp" => PropelTypes::BINARY,
-		"tinyint identity" => PropelTypes::TINYINT,
-		"tinyint" => PropelTypes::TINYINT,
-		"uniqueidentifier" => PropelTypes::CHAR,
-		"varbinary" => PropelTypes::VARBINARY,
-		"varchar" => PropelTypes::VARCHAR,
-		"uniqueidentifier" => PropelTypes::CHAR,
-	// SQL Server 2000 only
-		"bigint identity" => PropelTypes::BIGINT,
-		"bigint" => PropelTypes::BIGINT,
-		"sql_variant" => PropelTypes::VARCHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$mssqlTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$stmt = $this->dbh->query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties'");
-
-		// First load the tables (important that this happen before filling out details of tables)
-		$tables = array();
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table = new Table($name);
-			$database->addTable($table);
-			$tables[] = $table;
-		}
-
-		// Now populate only columns.
-		foreach ($tables as $table) {
-			$this->addColumns($table);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tables as $table) {
-			$this->addForeignKeys($table);
-			$this->addIndexes($table);
-			$this->addPrimaryKey($table);
-		}
-
-	}
-
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("sp_columns '" . $table->getName() . "'");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['COLUMN_NAME'];
-			$type = $row['TYPE_NAME'];
-			$size = $row['LENGTH'];
-			$is_nullable = $row['NULLABLE'];
-			$default = $row['COLUMN_DEF'];
-			$precision = $row['PRECISION'];
-			$scale = $row['SCALE'];
-			$autoincrement = false;
-			if (strtolower($type) == "int identity") {
-				$autoincrement = true;
-			}
-
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$type.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull(!$is_nullable);
-
-			$table->addColumn($column);
-		}
-
-
-	} // addColumn()
-
-	/**
-	 * Load foreign keys for this table.
-	 */
-	protected function addForeignKeys(Table $table)
-	{
-		$database = $table->getDatabase();
-
-		$stmt = $this->dbh->query("SELECT ccu1.TABLE_NAME, ccu1.COLUMN_NAME, ccu2.TABLE_NAME AS FK_TABLE_NAME, ccu2.COLUMN_NAME AS FK_COLUMN_NAME
-									FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ccu1 INNER JOIN
-								      INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc1 ON tc1.CONSTRAINT_NAME = ccu1.CONSTRAINT_NAME AND
-								      CONSTRAINT_TYPE = 'Foreign Key' INNER JOIN
-								      INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc1 ON rc1.CONSTRAINT_NAME = tc1.CONSTRAINT_NAME INNER JOIN
-								      INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ccu2 ON ccu2.CONSTRAINT_NAME = rc1.UNIQUE_CONSTRAINT_NAME
-									WHERE (ccu1.table_name = '".$table->getName()."')");
-
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-
-		$foreignKeys = array(); // local store to avoid duplicates
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$lcol = $row['COLUMN_NAME'];
-			$ftbl = $row['FK_TABLE_NAME'];
-			$fcol = $row['FK_COLUMN_NAME'];
-
-
-			$foreignTable = $database->getTable($ftbl);
-			$foreignColumn = $foreignTable->getColumn($fcol);
-			$localColumn   = $table->getColumn($lcol);
-
-			if (!isset($foreignKeys[$name])) {
-				$fk = new ForeignKey($name);
-				$fk->setForeignTableName($foreignTable->getName());
-				//$fk->setOnDelete($fkactions['ON DELETE']);
-				//$fk->setOnUpdate($fkactions['ON UPDATE']);
-				$table->addForeignKey($fk);
-				$foreignKeys[$name] = $fk;
-			}
-			$foreignKeys[$name]->addReference($localColumn, $foreignColumn);
-		}
-
-	}
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("sp_indexes_rowset " . $table->getName());
-
-		$indexes = array();
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$colName = $row["COLUMN_NAME"];
-			$name = $row['INDEX_NAME'];
-
-			// FIXME -- Add UNIQUE support
-			if (!isset($indexes[$name])) {
-				$indexes[$name] = new Index($name);
-				$table->addIndex($indexes[$name]);
-			}
-
-			$indexes[$name]->addColumn($table->getColumn($colName));
-		}
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 */
-	protected function addPrimaryKey(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLUMN_NAME
-						FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
-								INNER JOIN INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ON
-					  INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_NAME = INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE.constraint_name
-						WHERE     (INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_TYPE = 'PRIMARY KEY') AND
-					  (INFORMATION_SCHEMA.TABLE_CONSTRAINTS.TABLE_NAME = '".$table->getName()."')");
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table->getColumn($name)->setPrimaryKey(true);
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php
deleted file mode 100644
index e7991b6..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/*
- *  $Id: MysqlSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Mysql database schema parser.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse.mysql
- */
-class MysqlSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * @var        boolean
-	 */
-	private $addVendorInfo = false;
-
-	/**
-	 * Map MySQL native types to Propel types.
-	 * @var        array
-	 */
-	private static $mysqlTypeMap = array(
-		'tinyint' => PropelTypes::TINYINT,
-		'smallint' => PropelTypes::SMALLINT,
-		'mediumint' => PropelTypes::SMALLINT,
-		'int' => PropelTypes::INTEGER,
-		'integer' => PropelTypes::INTEGER,
-		'bigint' => PropelTypes::BIGINT,
-		'int24' => PropelTypes::BIGINT,
-		'real' => PropelTypes::REAL,
-		'float' => PropelTypes::FLOAT,
-		'decimal' => PropelTypes::DECIMAL,
-		'numeric' => PropelTypes::NUMERIC,
-		'double' => PropelTypes::DOUBLE,
-		'char' => PropelTypes::CHAR,
-		'varchar' => PropelTypes::VARCHAR,
-		'date' => PropelTypes::DATE,
-		'time' => PropelTypes::TIME,
-		'year' => PropelTypes::INTEGER,
-		'datetime' => PropelTypes::TIMESTAMP,
-		'timestamp' => PropelTypes::TIMESTAMP,
-		'tinyblob' => PropelTypes::BINARY,
-		'blob' => PropelTypes::BLOB,
-		'mediumblob' => PropelTypes::BLOB,
-		'longblob' => PropelTypes::BLOB,
-		'longtext' => PropelTypes::CLOB,
-		'tinytext' => PropelTypes::VARCHAR,
-		'mediumtext' => PropelTypes::LONGVARCHAR,
-		'text' => PropelTypes::LONGVARCHAR,
-		'enum' => PropelTypes::CHAR,
-		'set' => PropelTypes::CHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$mysqlTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$this->addVendorInfo = $this->getGeneratorConfig()->getBuildProperty('addVendorInfo');
-
-		$stmt = $this->dbh->query("SHOW TABLES");
-
-		// First load the tables (important that this happen before filling out details of tables)
-		$tables = array();
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table = new Table($name);
-			$database->addTable($table);
-			$tables[] = $table;
-		}
-
-		// Now populate only columns.
-		foreach ($tables as $table) {
-			$this->addColumns($table);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tables as $table) {
-			$this->addForeignKeys($table);
-			$this->addIndexes($table);
-			$this->addPrimaryKey($table);
-			if ($this->addVendorInfo) {
-				$this->addTableVendorInfo($table);
-			}
-		}
-	}
-
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW COLUMNS FROM `" . $table->getName() . "`");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['Field'];
-			$is_nullable = ($row['Null'] == 'YES');
-			$autoincrement = (strpos($row['Extra'], 'auto_increment') !== false);
-			$size = null;
-			$precision = null;
-			$scale = null;
-
-			if (preg_match('/^(\w+)[\(]?([\d,]*)[\)]?( |$)/', $row['Type'], $matches)) {
-				//            colname[1]   size/precision[2]
-				$nativeType = $matches[1];
-				if ($matches[2]) {
-					if ( ($cpos = strpos($matches[2], ',')) !== false) {
-						$size = (int) substr($matches[2], 0, $cpos);
-						$precision = $size;
-						$scale = (int) substr($matches[2], $cpos + 1);
-					} else {
-						$size = (int) $matches[2];
-					}
-				}
-			} elseif (preg_match('/^(\w+)\(/', $row['Type'], $matches)) {
-				$nativeType = $matches[1];
-			} else {
-				$nativeType = $row['Type'];
-			}
-
-			//BLOBs can't have any default values in MySQL
-			$default = preg_match('~blob|text~', $nativeType) ? null : $row['Default'];
-
-			$propelType = $this->getMappedPropelType($nativeType);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$nativeType.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull(!$is_nullable);
-
-			if ($this->addVendorInfo) {
-				$vi = $this->getNewVendorInfoObject($row);
-				$column->addVendorInfo($vi);
-			}
-
-			$table->addColumn($column);
-		}
-
-
-	} // addColumn()
-
-	/**
-	 * Load foreign keys for this table.
-	 */
-	protected function addForeignKeys(Table $table)
-	{
-		$database = $table->getDatabase();
-
-		$stmt = $this->dbh->query("SHOW CREATE TABLE `" . $table->getName(). "`");
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-
-		$foreignKeys = array(); // local store to avoid duplicates
-
-		// Get the information on all the foreign keys
-		$regEx = '/CONSTRAINT `([^`]+)` FOREIGN KEY \((.+)\) REFERENCES `([^`]*)` \((.+)\)(.*)/';
-		if (preg_match_all($regEx,$row[1],$matches)) {
-			$tmpArray = array_keys($matches[0]);
-			foreach ($tmpArray as $curKey) {
-				$name = $matches[1][$curKey];
-				$rawlcol = $matches[2][$curKey];
-				$ftbl = $matches[3][$curKey];
-				$rawfcol = $matches[4][$curKey];
-				$fkey = $matches[5][$curKey];
-				
-				$lcols = array();
-				foreach(preg_split('/`, `/', $rawlcol) as $piece) {
-					$lcols[] = trim($piece, '` ');
-				}
-				
-				$fcols = array();
-				foreach(preg_split('/`, `/', $rawfcol) as $piece) {
-					$fcols[] = trim($piece, '` ');
-				}
-				
-				//typical for mysql is RESTRICT
-				$fkactions = array(
-					'ON DELETE'	=> ForeignKey::RESTRICT,
-					'ON UPDATE'	=> ForeignKey::RESTRICT,
-				);
-
-				if ($fkey) {
-					//split foreign key information -> search for ON DELETE and afterwords for ON UPDATE action
-					foreach (array_keys($fkactions) as $fkaction) {
-						$result = NULL;
-						preg_match('/' . $fkaction . ' (' . ForeignKey::CASCADE . '|' . ForeignKey::SETNULL . ')/', $fkey, $result);
-						if ($result && is_array($result) && isset($result[1])) {
-							$fkactions[$fkaction] = $result[1];
-						}
-					}
-				}
-				
-				$localColumns = array();
-				$foreignColumns = array();
-				
-				$foreignTable = $database->getTable($ftbl);
-				
-				foreach($fcols as $fcol) {
-					$foreignColumns[] = $foreignTable->getColumn($fcol);
-				}
-				foreach($lcols as $lcol) {
-					$localColumns[] = $table->getColumn($lcol);
-				}
-
-				if (!isset($foreignKeys[$name])) {
-					$fk = new ForeignKey($name);
-					$fk->setForeignTableName($foreignTable->getName());
-					$fk->setOnDelete($fkactions['ON DELETE']);
-					$fk->setOnUpdate($fkactions['ON UPDATE']);
-					$table->addForeignKey($fk);
-					$foreignKeys[$name] = $fk;
-				}
-				
-				for($i=0; $i < count($localColumns); $i++) {
-					$foreignKeys[$name]->addReference($localColumns[$i], $foreignColumns[$i]);
-				}
-				
-			}
-
-		}
-
-	}
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW INDEX FROM `" . $table->getName() . "`");
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-
-		$indexes = array();
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$colName = $row["Column_name"];
-			$name = $row["Key_name"];
-
-			if ($name == "PRIMARY") {
-				continue;
-			}
-
-			if (!isset($indexes[$name])) {
-				$isUnique = ($row["Non_unique"] == 0);
-				if ($isUnique) {
-					$indexes[$name] = new Unique($name);
-				} else {
-					$indexes[$name] = new Index($name);
-				}
-				if ($this->addVendorInfo) {
-					$vi = $this->getNewVendorInfoObject($row);
-					$indexes[$name]->addVendorInfo($vi);
-				}
-				$table->addIndex($indexes[$name]);
-			}
-
-			$indexes[$name]->addColumn($table->getColumn($colName));
-		}
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 */
-	protected function addPrimaryKey(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW KEYS FROM `" . $table->getName() . "`");
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			// Skip any non-primary keys.
-			if ($row['Key_name'] !== 'PRIMARY') {
-				continue;
-			}
-			$name = $row["Column_name"];
-			$table->getColumn($name)->setPrimaryKey(true);
-		}
-	}
-
-	/**
-	 * Adds vendor-specific info for table.
-	 *
-	 * @param      Table $table
-	 */
-	protected function addTableVendorInfo(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW TABLE STATUS LIKE '" . $table->getName() . "'");
-		$row = $stmt->fetch(PDO::FETCH_ASSOC);
-		$vi = $this->getNewVendorInfoObject($row);
-		$table->addVendorInfo($vi);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php
deleted file mode 100644
index d2e2f68..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/*
- *  $Id: OracleSchemaParser.php 989 2008-03-11 14:29:30Z heltem $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Oracle database schema parser.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @author     Guillermo Gutierrez <ggutierrez at dailycosas.net> (Adaptation)
- * @version    $Revision: 1010 $
- * @package    propel.engine.database.reverse.oracle
- */
-class OracleSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map Oracle native types to Propel types.
-	 *
-	 * There really aren't any Oracle native types, so we're just
-	 * using the MySQL ones here.
-	 * 
-	 * Left as unsupported: 
-	 *   BFILE, 
-	 *   RAW, 
-	 *   ROWID
-	 * 
-	 * Supported but non existant as a specific type in Oracle: 
-	 *   DECIMAL (NUMBER with scale), 
-	 *   DOUBLE (FLOAT with precision = 126) 
-	 *
-	 * @var        array
-	 */
-	private static $oracleTypeMap = array(
-		'BLOB'		=> PropelTypes::BLOB,
-		'CHAR'		=> PropelTypes::CHAR,
-		'CLOB'		=> PropelTypes::CLOB,
-		'DATE'		=> PropelTypes::DATE,
-		'DECIMAL'	=> PropelTypes::DECIMAL,
-		'DOUBLE'	=> PropelTypes::DOUBLE,
-		'FLOAT'		=> PropelTypes::FLOAT,
-		'LONG'		=> PropelTypes::LONGVARCHAR,
-		'NCHAR'		=> PropelTypes::CHAR,
-		'NCLOB'		=> PropelTypes::CLOB,
-		'NUMBER'	=> PropelTypes::BIGINT,
-		'NVARCHAR2'	=> PropelTypes::VARCHAR,
-		'TIMESTAMP'	=> PropelTypes::TIMESTAMP,
-		'VARCHAR2'	=> PropelTypes::VARCHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$oracleTypeMap;
-	}
-
-	/**
-	 * Searches for tables in the database. Maybe we want to search also the views.
-	 * @param	Database $database The Database model class to add tables to.
-	 */
-	public function parse(Database $database)
-	{
-		$tables = array();
-		$stmt = $this->dbh->query("SELECT OBJECT_NAME FROM USER_OBJECTS WHERE OBJECT_TYPE = 'TABLE'");
-		/* @var stmt PDOStatement */
-		// First load the tables (important that this happen before filling out details of tables)
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$table = new Table($row['OBJECT_NAME']);
-			$database->addTable($table);
-			// Add columns, primary keys and indexes.
-			$this->addColumns($table);
-			$this->addPrimaryKey($table);
-			$this->addIndexes($table);
-			$tables[] = $table;
-		}
-		foreach ($tables as $table) {
-			$this->addForeignKeys($table);
-		}
-	}
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLUMN_NAME, DATA_TYPE, NULLABLE, DATA_LENGTH, DATA_SCALE, DATA_DEFAULT FROM USER_TAB_COLS WHERE TABLE_NAME = '" . $table->getName() . "'");
-		/* @var stmt PDOStatement */
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$size = $row["DATA_LENGTH"];
-			$scale = $row["DATA_SCALE"];
-			$default = $row['DATA_DEFAULT'];
-			$type = $row["DATA_TYPE"];
-			$isNullable = ($row['NULLABLE'] == 'Y');
-			if ($type == "NUMBER" && $row["DATA_SCALE"] > 0) {
-				$type = "DECIMAL";
-			}
-			if ($type == "FLOAT"&& $row["DATA_PRECISION"] == 126) {
-				$type = "DOUBLE";
-			}
-			if (strpos($type, 'TIMESTAMP(') !== false) {
-				$type = substr($type, 0, strpos($type, '('));
-				$default = "0000-00-00 00:00:00";
-				$size = null;
-				$scale = null;
-			}
-			if ($type == "DATE") {
-				$default = "0000-00-00";
-				$size = null;
-				$scale = null;
-			}
-				
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $row['COLUMN_NAME']. "] has a column type (".$row["DATA_TYPE"].") that Propel does not support.");
-			}
-
-			$column = new Column($row['COLUMN_NAME']);
-			$column->setPhpName(); // Prevent problems with strange col names
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement(false); // Not yet supported
-			$column->setNotNull(!$isNullable);
-			$table->addColumn($column);
-		}
-		
-	} // addColumn()
-
-	/**
-	 * Adds Indexes to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLUMN_NAME, INDEX_NAME FROM USER_IND_COLUMNS WHERE TABLE_NAME = '" . $table->getName() . "' ORDER BY COLUMN_NAME");
-		/* @var stmt PDOStatement */
-		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		if (count($rows) > 0) {
-			$index = new Index($rows[0]['INDEX_NAME']);
-			foreach($rows AS $row) {
-				$index->addColumn($row['COLUMN_NAME']);
-			}
-			$table->addIndex($index);
-		}
-	}
-	
-	/**
-	 * Load foreign keys for this table.
-	 * 
-	 * @param      Table $table The Table model class to add FKs to
-	 */
-	protected function addForeignKeys(Table $table)
-	{	
-		// local store to avoid duplicates
-		$foreignKeys = array(); 
-		
-		$stmt = $this->dbh->query("SELECT CONSTRAINT_NAME, DELETE_RULE, R_CONSTRAINT_NAME FROM USER_CONSTRAINTS WHERE CONSTRAINT_TYPE = 'R' AND TABLE_NAME = '" . $table->getName(). "'");
-		/* @var stmt PDOStatement */
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			// Local reference
-			$stmt2 = $this->dbh->query("SELECT COLUMN_NAME FROM USER_CONS_COLUMNS WHERE CONSTRAINT_NAME = '".$row['CONSTRAINT_NAME']."' AND TABLE_NAME = '" . $table->getName(). "'");
-			/* @var stmt2 PDOStatement */
-			$localReferenceInfo = $stmt2->fetch(PDO::FETCH_ASSOC);
-			
-			// Foreign reference
-			$stmt2 = $this->dbh->query("SELECT TABLE_NAME, COLUMN_NAME FROM USER_CONS_COLUMNS WHERE CONSTRAINT_NAME = '".$row['R_CONSTRAINT_NAME']."'");
-			$foreignReferenceInfo = $stmt2->fetch(PDO::FETCH_ASSOC);
-						
-			if (!isset($foreignKeys[$row["CONSTRAINT_NAME"]])) {
-				$fk = new ForeignKey($row["CONSTRAINT_NAME"]);
-				$fk->setForeignTableName($foreignReferenceInfo['TABLE_NAME']);
-				$fk->setOnDelete($row["DELETE_RULE"]);
-				$fk->setOnUpdate($row["DELETE_RULE"]);
-				$fk->addReference(array("local" => $localReferenceInfo['COLUMN_NAME'], "foreign" => $foreignReferenceInfo['COLUMN_NAME']));
-				$table->addForeignKey($fk);
-				$foreignKeys[$row["CONSTRAINT_NAME"]] = $fk;
-			}
-		}
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 * 
-	 * @param      Table $table The Table model class to add PK to. 
-	 */
-	protected function addPrimaryKey(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLS.COLUMN_NAME FROM USER_CONSTRAINTS CONS, USER_CONS_COLUMNS COLS WHERE CONS.CONSTRAINT_NAME = COLS.CONSTRAINT_NAME AND CONS.TABLE_NAME = '".$table->getName()."' AND CONS.CONSTRAINT_TYPE = 'P'");
-		/* @var stmt PDOStatement */
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			// This fixes a strange behavior by PDO. Sometimes the
-			// row values are inside an index 0 of an array
-			if (array_key_exists(0, $row)) {
-				$row = $row[0];
-			}
-			$table->getColumn($row['COLUMN_NAME'])->setPrimaryKey(true);
-		}	
-	}
-
-}
-
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php
deleted file mode 100644
index 6fabe92..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/*
- *  $Id: PgsqlSchemaParser.php 1397 2009-12-31 08:05:10Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Postgresql database schema parser.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1397 $
- * @package    propel.engine.database.reverse.pgsql
- */
-class PgsqlSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map PostgreSQL native types to Propel types.
-	 * @var        array
-	 */
-	 /** Map MySQL native types to Creole (JDBC) types. */
-	private static $pgsqlTypeMap = array(
-				'bool' => PropelTypes::BOOLEAN,
-				'boolean' => PropelTypes::BOOLEAN,
-				'tinyint' => PropelTypes::TINYINT,
-				'smallint' => PropelTypes::SMALLINT,
-				'mediumint' => PropelTypes::SMALLINT,
-				'int' => PropelTypes::INTEGER,
-				'int4' => PropelTypes::INTEGER,
-				'integer' => PropelTypes::INTEGER,
-				'int8' => PropelTypes::BIGINT,
-				'bigint' => PropelTypes::BIGINT,
-				'int24' => PropelTypes::BIGINT,
-				'real' => PropelTypes::REAL,
-				'float' => PropelTypes::FLOAT,
-				'decimal' => PropelTypes::DECIMAL,
-				'numeric' => PropelTypes::NUMERIC,
-				'double' => PropelTypes::DOUBLE,
-				'char' => PropelTypes::CHAR,
-				'varchar' => PropelTypes::VARCHAR,
-				'date' => PropelTypes::DATE,
-				'time' => PropelTypes::TIME,
-				'timetz' => PropelTypes::TIME,
-				//'year' => PropelTypes::YEAR,  PropelTypes::YEAR does not exist... does this need to be mapped to a different propel type?
-				'datetime' => PropelTypes::TIMESTAMP,
-				'timestamp' => PropelTypes::TIMESTAMP,
-				'timestamptz' => PropelTypes::TIMESTAMP,
-				'bytea' => PropelTypes::BLOB,
-				'text' => PropelTypes::LONGVARCHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$pgsqlTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$stmt = $this->dbh->query("SELECT version() as ver");
-		$nativeVersion = $stmt->fetchColumn();
-
-		if (!$nativeVersion) {
-			throw new EngineException("Failed to get database version");
-		}
-
-		$arrVersion = sscanf ($nativeVersion, '%*s %d.%d');
-		$version = sprintf ("%d.%d", $arrVersion[0], $arrVersion[1]);
-
-		// Clean up
-		$stmt = null;
-
-		$stmt = $this->dbh->query("SELECT c.oid,
-								    case when n.nspname='public' then c.relname else n.nspname||'.'||c.relname end as relname
-								    FROM pg_class c join pg_namespace n on (c.relnamespace=n.oid)
-								    WHERE c.relkind = 'r'
-								      AND n.nspname NOT IN ('information_schema','pg_catalog')
-								      AND n.nspname NOT LIKE 'pg_temp%'
-								      AND n.nspname NOT LIKE 'pg_toast%'
-								    ORDER BY relname");
-
-		$tableWraps = array();
-
-		// First load the tables (important that this happen before filling out details of tables)
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$name = $row['relname'];
-			$oid = $row['oid'];
-			$table = new Table($name);
-			$database->addTable($table);
-
-			// Create a wrapper to hold these tables and their associated OID
-			$wrap = new stdClass;
-			$wrap->table = $table;
-			$wrap->oid = $oid;
-			$tableWraps[] = $wrap;
-		}
-
-		// Now populate only columns.
-		foreach ($tableWraps as $wrap) {
-			$this->addColumns($wrap->table, $wrap->oid, $version);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tableWraps as $wrap) {
-			$this->addForeignKeys($wrap->table, $wrap->oid, $version);
-			$this->addIndexes($wrap->table, $wrap->oid, $version);
-			$this->addPrimaryKey($wrap->table, $wrap->oid, $version);
-		}
-
-		// TODO - Handle Sequences ...
-
-	}
-
-
-	 /**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 * @param      int $oid The table OID
-	 * @param      string $version The database version.
-	 */
-	protected function addColumns(Table $table, $oid, $version)
-	{
-
-		// Get the columns, types, etc.
-		// Based on code from pgAdmin3 (http://www.pgadmin.org/)
-		$stmt = $this->dbh->prepare("SELECT
-								        att.attname,
-								        att.atttypmod,
-								        att.atthasdef,
-								        att.attnotnull,
-								        def.adsrc,
-								        CASE WHEN att.attndims > 0 THEN 1 ELSE 0 END AS isarray,
-								        CASE
-								            WHEN ty.typname = 'bpchar'
-								                THEN 'char'
-								            WHEN ty.typname = '_bpchar'
-								                THEN '_char'
-								            ELSE
-								                ty.typname
-								        END AS typname,
-								        ty.typtype
-								    FROM pg_attribute att
-								        JOIN pg_type ty ON ty.oid=att.atttypid
-								        LEFT OUTER JOIN pg_attrdef def ON adrelid=att.attrelid AND adnum=att.attnum
-								    WHERE att.attrelid = ? AND att.attnum > 0
-								        AND att.attisdropped IS FALSE
-								    ORDER BY att.attnum");
-
-		$stmt->bindValue(1, $oid, PDO::PARAM_INT);
-		$stmt->execute();
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$size = null;
-			$precision = null;
-			$scale = null;
-
-			// Check to ensure that this column isn't an array data type
-			if (((int) $row['isarray']) === 1) {
-				throw new EngineException (sprintf ("Array datatypes are not currently supported [%s.%s]", $this->name, $row['attname']));
-			} // if (((int) $row['isarray']) === 1)
-
-			$name = $row['attname'];
-
-			// If they type is a domain, Process it
-			if (strtolower ($row['typtype']) == 'd') {
-				$arrDomain = $this->processDomain ($row['typname']);
-				$type = $arrDomain['type'];
-				$size = $arrDomain['length'];
-				$precision = $size;
-				$scale = $arrDomain['scale'];
-				$boolHasDefault = (strlen (trim ($row['atthasdef'])) > 0) ? $row['atthasdef'] : $arrDomain['hasdefault'];
-				$default = (strlen (trim ($row['adsrc'])) > 0) ? $row['adsrc'] : $arrDomain['default'];
-				$is_nullable = (strlen (trim ($row['attnotnull'])) > 0) ? $row['attnotnull'] : $arrDomain['notnull'];
-				$is_nullable = (($is_nullable == 't') ? false : true);
-			} else {
-				$type = $row['typname'];
-				$arrLengthPrecision = $this->processLengthScale ($row['atttypmod'], $type);
-				$size = $arrLengthPrecision['length'];
-				$precision = $size;
-				$scale = $arrLengthPrecision['scale'];
-				$boolHasDefault = $row['atthasdef'];
-				$default = $row['adsrc'];
-				$is_nullable = (($row['attnotnull'] == 't') ? false : true);
-			} // else (strtolower ($row['typtype']) == 'd')
-
-			$autoincrement = null;
-
-			// if column has a default
-			if (($boolHasDefault == 't') && (strlen (trim ($default)) > 0)) {
-				if (!preg_match('/^nextval\(/', $default)) {
-					$strDefault= preg_replace ('/::[\W\D]*/', '', $default);
-					$default = str_replace ("'", '', $strDefault);
-				} else {
-					$autoincrement = true;
-					$default = null;
-				}
-			} else {
-				$default = null;
-			}
-
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$type.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull(!$is_nullable);
-
-			$table->addColumn($column);
-		}
-
-
-	} // addColumn()
-
-	private function processLengthScale($intTypmod, $strName)
-	{
-		// Define the return array
-		$arrRetVal = array ('length'=>null, 'scale'=>null);
-
-		// Some datatypes don't have a Typmod
-		if ($intTypmod == -1)
-		{
-			return $arrRetVal;
-		} // if ($intTypmod == -1)
-
-		// Numeric Datatype?
-		if ($strName == $this->getMappedNativeType(PropelTypes::NUMERIC)) {
-			$intLen = ($intTypmod - 4) >> 16;
-			$intPrec = ($intTypmod - 4) & 0xffff;
-			$intLen = sprintf ("%ld", $intLen);
-			if ($intPrec)
-			{
-				$intPrec = sprintf ("%ld", $intPrec);
-			} // if ($intPrec)
-			$arrRetVal['length'] = $intLen;
-			$arrRetVal['scale'] = $intPrec;
-		} // if ($strName == $this->getMappedNativeType(PropelTypes::NUMERIC))
-		elseif ($strName == $this->getMappedNativeType(PropelTypes::TIME) || $strName == 'timetz'
-			|| $strName == $this->getMappedNativeType(PropelTypes::TIMESTAMP) || $strName == 'timestamptz'
-			|| $strName == 'interval' || $strName == 'bit')
-		{
-			$arrRetVal['length'] = sprintf ("%ld", $intTypmod);
-		} // elseif (TIME, TIMESTAMP, INTERVAL, BIT)
-		else
-		{
-			$arrRetVal['length'] = sprintf ("%ld", ($intTypmod - 4));
-		} // else
-		return $arrRetVal;
-	} // private function processLengthScale ($intTypmod, $strName)
-
-	private function processDomain($strDomain)
-	{
-		if (strlen(trim ($strDomain)) < 1) {
-			throw new EngineException ("Invalid domain name [" . $strDomain . "]");
-		}
-
-		$stmt = $this->dbh->prepare("SELECT
-								        d.typname as domname,
-								        b.typname as basetype,
-								        d.typlen,
-								        d.typtypmod,
-								        d.typnotnull,
-								        d.typdefault
-								    FROM pg_type d
-								        INNER JOIN pg_type b ON b.oid = CASE WHEN d.typndims > 0 then d.typelem ELSE d.typbasetype END
-								    WHERE
-								        d.typtype = 'd'
-								        AND d.typname = ?
-								    ORDER BY d.typname");
-		$stmt->bindValue(1, $strDomain);
-		$stmt->execute();
-
-		$row = $stmt->fetch(PDO::FETCH_ASSOC);
-		if (!$row) {
-			throw new EngineException ("Domain [" . $strDomain . "] not found.");
-		}
-
-		$arrDomain = array ();
-		$arrDomain['type'] = $row['basetype'];
-		$arrLengthPrecision = $this->processLengthScale($row['typtypmod'], $row['basetype']);
-		$arrDomain['length'] = $arrLengthPrecision['length'];
-		$arrDomain['scale'] = $arrLengthPrecision['scale'];
-		$arrDomain['notnull'] = $row['typnotnull'];
-		$arrDomain['default'] = $row['typdefault'];
-		$arrDomain['hasdefault'] = (strlen (trim ($row['typdefault'])) > 0) ? 't' : 'f';
-
-		$stmt = null; // cleanup
-		return $arrDomain;
-	} // private function processDomain($strDomain)
-
-	/**
-	 * Load foreign keys for this table.
-	 */
-	protected function addForeignKeys(Table $table, $oid, $version)
-	{
-		$database = $table->getDatabase();
-		$stmt = $this->dbh->prepare("SELECT
-								          conname,
-								          confupdtype,
-								          confdeltype,
-								          CASE nl.nspname WHEN 'public' THEN cl.relname ELSE nl.nspname||'.'||cl.relname END as fktab,
-								          a2.attname as fkcol,
-								          CASE nr.nspname WHEN 'public' THEN cr.relname ELSE nr.nspname||'.'||cr.relname END as reftab,
-								          a1.attname as refcol
-								    FROM pg_constraint ct
-								         JOIN pg_class cl ON cl.oid=conrelid
-								         JOIN pg_class cr ON cr.oid=confrelid
-								         JOIN pg_namespace nl ON nl.oid = cl.relnamespace
-								         JOIN pg_namespace nr ON nr.oid = cr.relnamespace
-								         LEFT JOIN pg_catalog.pg_attribute a1 ON a1.attrelid = ct.confrelid
-								         LEFT JOIN pg_catalog.pg_attribute a2 ON a2.attrelid = ct.conrelid
-								    WHERE
-								         contype='f'
-								         AND conrelid = ?
-								         AND a2.attnum = ct.conkey[1]
-								         AND a1.attnum = ct.confkey[1]
-								    ORDER BY conname");
-		$stmt->bindValue(1, $oid);
-		$stmt->execute();
-
-		$foreignKeys = array(); // local store to avoid duplicates
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['conname'];
-			$local_table = $row['fktab'];
-			$local_column = $row['fkcol'];
-			$foreign_table = $row['reftab'];
-			$foreign_column = $row['refcol'];
-
-			// On Update
-			switch ($row['confupdtype']) {
-			  case 'c':
-				$onupdate = ForeignKey::CASCADE; break;
-			  case 'd':
-				$onupdate = ForeignKey::SETDEFAULT; break;
-			  case 'n':
-				$onupdate = ForeignKey::SETNULL; break;
-			  case 'r':
-				$onupdate = ForeignKey::RESTRICT; break;
-			  default:
-			  case 'a':
-				//NOACTION is the postgresql default
-				$onupdate = ForeignKey::NONE; break;
-			}
-			// On Delete
-			switch ($row['confdeltype']) {
-			  case 'c':
-				$ondelete = ForeignKey::CASCADE; break;
-			  case 'd':
-				$ondelete = ForeignKey::SETDEFAULT; break;
-			  case 'n':
-				$ondelete = ForeignKey::SETNULL; break;
-			  case 'r':
-				$ondelete = ForeignKey::RESTRICT; break;
-			  default:
-			  case 'a':
-				//NOACTION is the postgresql default
-				$ondelete = ForeignKey::NONE; break;
-			}
-
-			$foreignTable = $database->getTable($foreign_table);
-			$foreignColumn = $foreignTable->getColumn($foreign_column);
-
-			$localTable   = $database->getTable($local_table);
-			$localColumn   = $localTable->getColumn($local_column);
-
-			if (!isset($foreignKeys[$name])) {
-				$fk = new ForeignKey($name);
-				$fk->setForeignTableName($foreignTable->getName());
-				$fk->setOnDelete($ondelete);
-				$fk->setOnUpdate($onupdate);
-				$table->addForeignKey($fk);
-				$foreignKeys[$name] = $fk;
-			}
-
-			$foreignKeys[$name]->addReference($localColumn, $foreignColumn);
-		}
-	}
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table, $oid, $version)
-	{
-		$stmt = $this->dbh->prepare("SELECT
-										DISTINCT ON(cls.relname)
-										cls.relname as idxname,
-								        indkey,
-								        indisunique
-								    FROM pg_index idx
-								         JOIN pg_class cls ON cls.oid=indexrelid
-								    WHERE indrelid = ? AND NOT indisprimary
-								    ORDER BY cls.relname");
-
-		$stmt->bindValue(1, $oid);
-		$stmt->execute();
-
-		$stmt2 = $this->dbh->prepare("SELECT a.attname
-										FROM pg_catalog.pg_class c JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
-										WHERE c.oid = ? AND a.attnum = ? AND NOT a.attisdropped
-										ORDER BY a.attnum");
-
-		$indexes = array();
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$name = $row["idxname"];
-			$unique = ($row["indisunique"] == 't') ? true : false;
-			if (!isset($indexes[$name])) {
-				if ($unique) {
-					$indexes[$name] = new Unique($name);
-				} else {
-					$indexes[$name] = new Index($name);
-				}
-				$table->addIndex($indexes[$name]);
-			}
-
-			$arrColumns = explode (' ', $row['indkey']);
-			foreach ($arrColumns as $intColNum)
-			{
-			   	$stmt2->bindValue(1, $oid);
-			   	$stmt2->bindValue(2, $intColNum);
-			   	$stmt2->execute();
-
-				$row2 = $stmt2->fetch(PDO::FETCH_ASSOC);
-
-				$indexes[$name]->addColumn($table->getColumn($row2['attname']));
-
-			} // foreach ($arrColumns as $intColNum)
-
-		}
-
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 */
-	protected function addPrimaryKey(Table $table, $oid, $version)
-	{
-
-		$stmt = $this->dbh->prepare("SELECT
-										DISTINCT ON(cls.relname)
-										cls.relname as idxname,
-										indkey,
-										indisunique
-									FROM pg_index idx
-										JOIN pg_class cls ON cls.oid=indexrelid
-									WHERE indrelid = ? AND indisprimary
-									ORDER BY cls.relname");
-		$stmt->bindValue(1, $oid);
-		$stmt->execute();
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$arrColumns = explode (' ', $row['indkey']);
-			foreach ($arrColumns as $intColNum) {
-				$stmt2 = $this->dbh->prepare("SELECT a.attname
-												FROM pg_catalog.pg_class c JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
-												WHERE c.oid = ? AND a.attnum = ? AND NOT a.attisdropped
-												ORDER BY a.attnum");
-				$stmt2->bindValue(1, $oid);
-				$stmt2->bindValue(2, $intColNum);
-				$stmt2->execute();
-
-				$row2 = $stmt2->fetch(PDO::FETCH_ASSOC);
-				$table->getColumn($row2['attname'])->setPrimaryKey(true);
-
-			} // foreach ($arrColumns as $intColNum)
-		}
-
-	}
-
-	/**
-	 * Adds the sequences for this database.
-	 *
-	 * @return     void
-	 * @throws     SQLException
-	 */
-	protected function addSequences(Database $database)
-	{
-		/*
-		-- WE DON'T HAVE ANY USE FOR THESE YET IN REVERSE ENGINEERING ...
-		$this->sequences = array();
-		$result = pg_query($this->conn->getResource(), "SELECT c.oid,
-								                        case when n.nspname='public' then c.relname else n.nspname||'.'||c.relname end as relname
-								                        FROM pg_class c join pg_namespace n on (c.relnamespace=n.oid)
-								                        WHERE c.relkind = 'S'
-								                          AND n.nspname NOT IN ('information_schema','pg_catalog')
-								                          AND n.nspname NOT LIKE 'pg_temp%'
-								                          AND n.nspname NOT LIKE 'pg_toast%'
-								                        ORDER BY relname");
-
-		if (!$result) {
-			throw new SQLException("Could not list sequences", pg_last_error($this->dblink));
-		}
-
-		while ($row = pg_fetch_assoc($result)) {
-			// FIXME -- decide what info we need for sequences & then create a SequenceInfo object (if needed)
-			$obj = new stdClass;
-			$obj->name = $row['relname'];
-			$obj->oid = $row['oid'];
-			$this->sequences[strtoupper($row['relname'])] = $obj;
-		}
-		*/
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php
deleted file mode 100644
index ca1c22f..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/*
- *  $Id: SqliteSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * SQLite database schema parser.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse.mysql
- */
-class SqliteSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map Sqlite native types to Propel types.
-	 *
-	 * There really aren't any SQLite native types, so we're just
-	 * using the MySQL ones here.
-	 *
-	 * @var        array
-	 */
-	private static $sqliteTypeMap = array(
-		'tinyint' => PropelTypes::TINYINT,
-		'smallint' => PropelTypes::SMALLINT,
-		'mediumint' => PropelTypes::SMALLINT,
-		'int' => PropelTypes::INTEGER,
-		'integer' => PropelTypes::INTEGER,
-		'bigint' => PropelTypes::BIGINT,
-		'int24' => PropelTypes::BIGINT,
-		'real' => PropelTypes::REAL,
-		'float' => PropelTypes::FLOAT,
-		'decimal' => PropelTypes::DECIMAL,
-		'numeric' => PropelTypes::NUMERIC,
-		'double' => PropelTypes::DOUBLE,
-		'char' => PropelTypes::CHAR,
-		'varchar' => PropelTypes::VARCHAR,
-		'date' => PropelTypes::DATE,
-		'time' => PropelTypes::TIME,
-		'year' => PropelTypes::INTEGER,
-		'datetime' => PropelTypes::TIMESTAMP,
-		'timestamp' => PropelTypes::TIMESTAMP,
-		'tinyblob' => PropelTypes::BINARY,
-		'blob' => PropelTypes::BLOB,
-		'mediumblob' => PropelTypes::BLOB,
-		'longblob' => PropelTypes::BLOB,
-		'longtext' => PropelTypes::CLOB,
-		'tinytext' => PropelTypes::VARCHAR,
-		'mediumtext' => PropelTypes::LONGVARCHAR,
-		'text' => PropelTypes::LONGVARCHAR,
-		'enum' => PropelTypes::CHAR,
-		'set' => PropelTypes::CHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$sqliteTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$stmt = $this->dbh->query("SELECT name FROM sqlite_master WHERE type='table' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='table' ORDER BY name;");
-
-		// First load the tables (important that this happen before filling out details of tables)
-		$tables = array();
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table = new Table($name);
-			$database->addTable($table);
-			$tables[] = $table;
-		}
-
-		// Now populate only columns.
-		foreach ($tables as $table) {
-			$this->addColumns($table);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tables as $table) {
-			$this->addIndexes($table);
-		}
-
-	}
-
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 * @param      int $oid The table OID
-	 * @param      string $version The database version.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("PRAGMA table_info('" . $table->getName() . "')");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['name'];
-
-			$fulltype = $row['type'];
-			$size = null;
-			$precision = null;
-			$scale = null;
-
-			if (preg_match('/^([^\(]+)\(\s*(\d+)\s*,\s*(\d+)\s*\)$/', $fulltype, $matches)) {
-				$type = $matches[1];
-				$precision = $matches[2];
-				$scale = $matches[3]; // aka precision
-			} elseif (preg_match('/^([^\(]+)\(\s*(\d+)\s*\)$/', $fulltype, $matches)) {
-				$type = $matches[1];
-				$size = $matches[2];
-			} else {
-				$type = $fulltype;
-			}
-			// If column is primary key and of type INTEGER, it is auto increment
-			// See: http://sqlite.org/faq.html#q1
-			$autoincrement = ($row['pk'] == 1 && strtolower($type) == 'integer');
-			$not_null = $row['notnull'];
-			$default = $row['dflt_value'];
-
-
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$type.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull($not_null);
-
-
-			if (($row['pk'] == 1) || (strtolower($type) == 'integer')) {
-				$column->setPrimaryKey(true);
-			}
-
-			$table->addColumn($column);
-
-		}
-
-
-	} // addColumn()
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("PRAGMA index_list('" . $table->getName() . "')");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['name'];
-			$index = new Index($name);
-
-			$stmt2 = $this->dbh->query("PRAGMA index_info('".$name."')");
-			while ($row2 = $stmt2->fetch(PDO::FETCH_ASSOC)) {
-				$colname = $row2['name'];
-				$index->addColumn($table->getColumn($colname));
-			}
-
-			$table->addIndex($index);
-
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/transform/XmlToAppData.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/transform/XmlToAppData.php
deleted file mode 100644
index 8e36ada..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/database/transform/XmlToAppData.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-
-/*
- *  $Id: XmlToAppData.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/AppData.php';
-
-// Phing dependencies
-require_once 'phing/parser/AbstractHandler.php';
-include_once 'phing/system/io/FileReader.php';
-
-/**
- * A class that is used to parse an input xml schema file and creates an AppData
- * PHP object.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon at opticode.co.za> (Torque)
- * @author     Jason van Zyl <jvanzyl at apache.org> (Torque)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.transform
- */
-class XmlToAppData extends AbstractHandler {
-
-	/** enables debug output */
-	const DEBUG = false;
-
-	private $app;
-	private $platform;
-	private $currDB;
-	private $currTable;
-	private $currColumn;
-	private $currFK;
-	private $currIndex;
-	private $currUnique;
-	private $currValidator;
-	private $currBehavior;
-	private $currVendorObject;
-
-	private $isForReferenceOnly;
-	private $currentPackage;
-	private $currentXmlFile;
-	private $defaultPackage;
-
-	private $encoding;
-
-	/** two-dimensional array,
-		first dimension is for schemas(key is the path to the schema file),
-		second is for tags within the schema */
-	private $schemasTagsStack = array();
-
-	public $parser;
-
-	/**
-	 * Creates a new instance for the specified database type.
-	 *
-	 * @param      Platform $platform The type of database for the application.
-	 * @param      string $defaultPackage the default PHP package used for the om
-	 * @param      string $encoding The database encoding.
-	 */
-	public function __construct(Platform $platform, $defaultPackage, $encoding = 'iso-8859-1')
-	{
-		$this->app = new AppData($platform);
-		$this->platform = $platform;
-		$this->defaultPackage = $defaultPackage;
-		$this->firstPass = true;
-		$this->encoding = $encoding;
-	}
-
-	/**
-	 * Parses a XML input file and returns a newly created and
-	 * populated AppData structure.
-	 *
-	 * @param      string $xmlFile The input file to parse.
-	 * @return     AppData populated by <code>xmlFile</code>.
-	 */
-	public function parseFile($xmlFile)
-	{
-		// we don't want infinite recursion
-		if ($this->isAlreadyParsed($xmlFile)) {
-			return;
-		}
-
-		$domDocument = new DomDocument('1.0', 'UTF-8');
-		$domDocument->load($xmlFile);
-
-		// store current schema file path
-		$this->schemasTagsStack[$xmlFile] = array();
-
-		$this->currentXmlFile = $xmlFile;
-
-		try {
-			$fr = new FileReader($xmlFile);
-		} catch (Exception $e) {
-			$f = new PhingFile($xmlFile);
-			throw new Exception("XML File not found: " . $f->getAbsolutePath());
-		}
-
-		$br = new BufferedReader($fr);
-
-		$this->parser = new ExpatParser($br);
-		$this->parser->parserSetOption(XML_OPTION_CASE_FOLDING, 0);
-		$this->parser->setHandler($this);
-
-		try {
-			$this->parser->parse();
-		} catch (Exception $e) {
-			$br->close();
-			throw $e;
-		}
-		$br->close();
-
-		array_pop($this->schemasTagsStack);
-
-		return $this->app;
-	}
-
-	/**
-	 * Handles opening elements of the xml file.
-	 *
-	 * @param      string $uri
-	 * @param      string $localName The local name (without prefix), or the empty string if
-	 *		 Namespace processing is not being performed.
-	 * @param      string $rawName The qualified name (with prefix), or the empty string if
-	 *		 qualified names are not available.
-	 * @param      string $attributes The specified or defaulted attributes
-	 */
-	public function startElement($name, $attributes) {
-
-		try {
-
-	  $parentTag = $this->peekCurrentSchemaTag();
-
-	  if ($parentTag === false) {
-
-				switch($name) {
-					case "database":
-						if ($this->isExternalSchema()) {
-							$this->currentPackage = @$attributes["package"];
-							if ($this->currentPackage === null) {
-								$this->currentPackage = $this->defaultPackage;
-							}
-						} else {
-							$this->currDB = $this->app->addDatabase($attributes);
-						}
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "database") {
-
-				switch($name) {
-
-					case "external-schema":
-						$xmlFile = @$attributes["filename"];
-
-						//"referenceOnly" attribute is valid in the main schema XML file only,
-						//and it's ingnored in the nested external-schemas
-						if (!$this->isExternalSchema()) {
-							$isForRefOnly = @$attributes["referenceOnly"];
-							$this->isForReferenceOnly = ($isForRefOnly !== null ? (strtolower($isForRefOnly) === "true") : true); // defaults to TRUE
-						}
-
-						if ($xmlFile{0} != '/') {
-							$f = new PhingFile($this->currentXmlFile);
-							$xf = new PhingFile($f->getParent(), $xmlFile);
-							$xmlFile = $xf->getPath();
-						}
-
-						$this->parseFile($xmlFile);
-					break;
-
-    		  case "domain":
-					  $this->currDB->addDomain($attributes);
-				  break;
-
-					case "table":
-						$this->currTable = $this->currDB->addTable($attributes);
-						if ($this->isExternalSchema()) {
-							$this->currTable->setForReferenceOnly($this->isForReferenceOnly);
-							$this->currTable->setPackage($this->currentPackage);
-						}
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currDB->addVendorInfo($attributes);
-					break;
-
-					case "behavior":
-					  $this->currBehavior = $this->currDB->addBehavior($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "table") {
-
-				switch($name) {
-					case "column":
-						$this->currColumn = $this->currTable->addColumn($attributes);
-					break;
-
-					case "foreign-key":
-						$this->currFK = $this->currTable->addForeignKey($attributes);
-					break;
-
-					case "index":
-						$this->currIndex = $this->currTable->addIndex($attributes);
-					break;
-
-					case "unique":
-						$this->currUnique = $this->currTable->addUnique($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currTable->addVendorInfo($attributes);
-					break;
-
-		  		case "validator":
-					  $this->currValidator = $this->currTable->addValidator($attributes);
-		  		break;
-
-		  		case "id-method-parameter":
-						$this->currTable->addIdMethodParameter($attributes);
-					break;
-          
-					case "behavior":
-					  $this->currBehavior = $this->currTable->addBehavior($attributes);
-					break;
-					
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "column") {
-
-				switch($name) {
-					case "inheritance":
-						$this->currColumn->addInheritance($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currColumn->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif ($parentTag == "foreign-key") {
-
-				switch($name) {
-					case "reference":
-						$this->currFK->addReference($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currUnique->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "index") {
-
-				switch($name) {
-					case "index-column":
-						$this->currIndex->addColumn($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currIndex->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif ($parentTag == "unique") {
-
-				switch($name) {
-					case "unique-column":
-						$this->currUnique->addColumn($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currUnique->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-			} elseif ($parentTag == "behavior") {
-
-				switch($name) {
-					case "parameter":
-						$this->currBehavior->addParameter($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-			} elseif ($parentTag == "validator") {
-				switch($name) {
-					case "rule":
-						$this->currValidator->addRule($attributes);
-					break;
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-			} elseif ($parentTag == "vendor") {
-
-				switch($name) {
-					case "parameter":
-						$this->currVendorObject->addParameter($attributes);
-					break;
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} else {
-				// it must be an invalid tag
-				$this->_throwInvalidTagException($name);
-			}
-
-			$this->pushCurrentSchemaTag($name);
-
-		} catch (BuildException $e) {
-			throw $e;
-		} catch (Exception $e) {
-			echo $e;
-			echo "\n";
-			throw $e;
-		}
-	}
-
-	function _throwInvalidTagException($tag_name)
-	{
-		throw new BuildException("Unexpected tag <" . $tag_name . ">", $this->parser->getLocation());
-	}
-
-	/**
-	 * Handles closing elements of the xml file.
-	 *
-	 * @param      uri
-	 * @param      localName The local name (without prefix), or the empty string if
-	 *		 Namespace processing is not being performed.
-	 * @param      rawName The qualified name (with prefix), or the empty string if
-	 *		 qualified names are not available.
-	 */
-	public function endElement($name)
-	{
-		if (self::DEBUG) {
-			print("endElement(" . $name . ") called\n");
-		}
-
-		$this->popCurrentSchemaTag();
-	}
-
-	protected function peekCurrentSchemaTag()
-	{
-				$keys = array_keys($this->schemasTagsStack);
-		return end($this->schemasTagsStack[end($keys)]);
-	}
-
-	protected function popCurrentSchemaTag()
-	{
-				$keys = array_keys($this->schemasTagsStack);
-		array_pop($this->schemasTagsStack[end($keys)]);
-	}
-
-	protected function pushCurrentSchemaTag($tag)
-	{
-				$keys = array_keys($this->schemasTagsStack);
-		$this->schemasTagsStack[end($keys)][] = $tag;
-	}
-
-	protected function isExternalSchema()
-	{
-		return (sizeof($this->schemasTagsStack) > 1);
-	}
-
-	protected function isAlreadyParsed($filePath)
-	{
-		return isset($this->schemasTagsStack[$filePath]);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/DefaultPlatform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/DefaultPlatform.php
deleted file mode 100644
index f8710e8..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/DefaultPlatform.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/*
- *  $Id: DefaultPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/Platform.php';
-include_once 'propel/engine/database/model/Domain.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * Default implementation for the Platform interface.
- *
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class DefaultPlatform implements Platform {
-
-	/**
-	 * Mapping from Propel types to Domain objects.
-	 *
-	 * @var        array
-	 */
-	private $schemaDomainMap;
-
-	/**
-	 * GeneratorConfig object holding build properties.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * @var        PDO Database connection.
-	 */
-	private $con;
-
-	/**
-	 * Default constructor.
-	 * @param      PDO $con Optional database connection to use in this platform.
-	 */
-	public function __construct(PDO $con = null)
-	{
-		if ($con) $this->setConnection($con);
-		$this->initialize();
-	}
-
-	/**
-	 * Set the database connection to use for this Platform class.
-	 * @param      PDO $con Database connection to use in this platform.
-	 */
-	public function setConnection(PDO $con = null)
-	{
-		$this->con = $con;
-	}
-
-	/**
-	 * Sets the GeneratorConfig to use in the parsing.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config)
-	{
-		$this->generatorConfig = $config;
-	}
-
-	/**
-	 * Gets the GeneratorConfig option.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig()
-	{
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Gets a specific propel (renamed) property from the build.
-	 *
-	 * @param      string $name
-	 * @return     mixed
-	 */
-	protected function getBuildProperty($name)
-	{
-		if ($this->generatorConfig !== null) {
-			return $this->generatorConfig->getBuildProperty($name);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the database connection to use for this Platform class.
-	 * @return     PDO The database connection or NULL if none has been set.
-	 */
-	public function getConnection()
-	{
-		return $this->con;
-	}
-
-	/**
-	 * Initialize the type -> Domain mapping.
-	 */
-	protected function initialize()
-	{
-		$this->schemaDomainMap = array();
-		foreach (PropelTypes::getPropelTypes() as $type) {
-			$this->schemaDomainMap[$type] = new Domain($type);
-		}
-		// BU_* no longer needed, so map these to the DATE/TIMESTAMP domains
-		$this->schemaDomainMap[PropelTypes::BU_DATE] = new Domain(PropelTypes::DATE);
-		$this->schemaDomainMap[PropelTypes::BU_TIMESTAMP] = new Domain(PropelTypes::TIMESTAMP);
-
-		// Boolean is a bit special, since typically it must be mapped to INT type.
-		$this->schemaDomainMap[PropelTypes::BOOLEAN] = new Domain(PropelTypes::BOOLEAN, "INTEGER");
-	}
-
-	/**
-	 * Adds a mapping entry for specified Domain.
-	 * @param      Domain $domain
-	 */
-	protected function setSchemaDomainMapping(Domain $domain)
-	{
-		$this->schemaDomainMap[$domain->getType()] = $domain;
-	}
-
-	/**
-	 * Returns the short name of the database type that this platform represents.
-	 * For example MysqlPlatform->getDatabaseType() returns 'mysql'.
-	 * @return     string
-	 */
-	public function getDatabaseType()
-	{
-		$clazz = get_class($this);
-		$pos = strpos($clazz, 'Platform');
-		return strtolower(substr($clazz,0,$pos));
-	}
-
-	/**
-	 * @see        Platform::getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 64;
-	}
-
-	/**
-	 * @see        Platform::getNativeIdMethod()
-	 */
-	public function getNativeIdMethod()
-	{
-		return Platform::IDENTITY;
-	}
-
-	/**
-	 * @see        Platform::getDomainForType()
-	 */
-	public function getDomainForType($propelType)
-	{
-		if (!isset($this->schemaDomainMap[$propelType])) {
-			throw new EngineException("Cannot map unknown Propel type " . var_export($propelType, true) . " to native database type.");
-		}
-		return $this->schemaDomainMap[$propelType];
-	}
-
-	/**
-	 * @return     string Returns the SQL fragment to use if null values are disallowed.
-	 * @see        Platform::getNullString(boolean)
-	 */
-	public function getNullString($notNull)
-	{
-		return ($notNull ? "NOT NULL" : "");
-	}
-
-	/**
-	 * @see        Platform::getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "IDENTITY";
-	}
-
-	/**
-	 * @see        Platform::hasScale(String)
-	 */
-	public function hasScale($sqlType)
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::hasSize(String)
-	 */
-	public function hasSize($sqlType)
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::quote()
-	 */
-	public function quote($text)
-	{
-		if ($this->getConnection()) {
-			return $this->getConnection()->quote($text);
-		} else {
-			return "'" . $this->disconnectedEscapeText($text) . "'";
-		}
-	}
-
-	/**
-	 * Method to escape text when no connection has been set.
-	 *
-	 * The subclasses can implement this using string replacement functions
-	 * or native DB methods.
-	 *
-	 * @param      string $text Text that needs to be escaped.
-	 * @return     string
-	 */
-	protected function disconnectedEscapeText($text)
-	{
-		return str_replace("'", "''", $text);
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '"' . $text . '"';
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return false;
-	}
-
-	/**
-	 * @see        Platform::supportsInsertNullPk()
-	 */
-	public function supportsInsertNullPk()
-	{
-		return true;
-	}
-	
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl()
-	{
-		return false;
-	}
-
-	/**
-	 * @see        Platform::getBooleanString()
-	 */
-	public function getBooleanString($b)
-	{
-		$b = ($b === true || strtolower($b) === 'true' || $b === 1 || $b === '1' || strtolower($b) === 'y' || strtolower($b) === 'yes');
-		return ($b ? '1' : '0');
-	}
-
-	/**
-	 * Gets the preferred timestamp formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return DateTime::ISO8601;
-	}
-
-	/**
-	 * Gets the preferred time formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimeFormatter()
-	{
-		return 'H:i:s';
-	}
-
-	/**
-	 * Gets the preferred date formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getDateFormatter()
-	{
-		return 'Y-m-d';
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/MssqlPlatform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/MssqlPlatform.php
deleted file mode 100644
index a486a7c..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/MssqlPlatform.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/*
- *  $Id: MssqlPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-include_once 'propel/engine/database/model/Domain.php';
-
-/**
- * MS SQL Platform implementation.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class MssqlPlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "INT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "INT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_DATE, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIME, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_TIMESTAMP, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BINARY(7132)"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "IMAGE"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "IMAGE"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "IMAGE"));
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 128;
-	}
-
-	/**
-	 * @return     Explicitly returns <code>NULL</code> if null values are
-	 * allowed (as recomended by Microsoft).
-	 * @see        Platform#getNullString(boolean)
-	 */
-	public function getNullString($notNull)
-	{
-		return ($notNull ? "NOT NULL" : "NULL");
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::supportsInsertNullPk()
-	 */
-	public function supportsInsertNullPk()
-	{
-		return false;
-	}
-	
-	/**
-	 * @see        Platform::hasSize(String)
-	 */
-	public function hasSize($sqlType)
-	{
-		return !("INT" == $sqlType || "TEXT" == $sqlType);
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-
-   /**
-   * Gets the preferred timestamp formatter for setting date/time values.
-   * @return     string
-   */
-  public function getTimestampFormatter()
-  {
-    return 'Y-m-d H:i:s';
-  }
-
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/MysqlPlatform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/MysqlPlatform.php
deleted file mode 100644
index 68ff402..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/MysqlPlatform.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/*
- *  $Id: MysqlPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * MySql Platform implementation.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class MysqlPlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "TINYINT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "DECIMAL"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "MEDIUMBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "LONGTEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "DATETIME"));
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "AUTO_INCREMENT";
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 64;
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		$usingInnoDB = false;
-		if (class_exists('DataModelBuilder', false))
-		{
-			$usingInnoDB = strtolower($this->getBuildProperty('mysqlTableType')) == 'innodb';
-		}
-		return $usingInnoDB || false;
-	}
-
-	/**
-	 * @see        Platform#hasSize(String)
-	 */
-	public function hasSize($sqlType)
-	{
-		return !("MEDIUMTEXT" == $sqlType || "LONGTEXT" == $sqlType
-				|| "BLOB" == $sqlType || "MEDIUMBLOB" == $sqlType
-				|| "LONGBLOB" == $sqlType);
-	}
-
-	/**
-	 * Escape the string for RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function disconnectedEscapeText($text)
-	{
-		if (function_exists('mysql_escape_string')) {
-			return mysql_escape_string($text);
-		} else {
-			return addslashes($text);
-		}
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '`' . $text . '`';
-	}
-
-	/**
-	 * Gets the preferred timestamp formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return 'Y-m-d H:i:s';
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/OraclePlatform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/OraclePlatform.php
deleted file mode 100644
index 06217c9..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/OraclePlatform.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/*
- *  $Id: OraclePlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * Oracle Platform implementation.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class OraclePlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "NUMBER", "1", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TINYINT, "NUMBER", "3", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::SMALLINT, "NUMBER", "5", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BIGINT, "NUMBER", "20", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::REAL, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DECIMAL, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARCHAR, "NVARCHAR2"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "NVARCHAR2", "2000")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIME, "TIME")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "DATE")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "TIMESTAMP")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "LONG RAW"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "BLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "LONG RAW"));
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 30;
-	}
-
-	/**
-	 * @see        Platform#getNativeIdMethod()
-	 */
-	public function getNativeIdMethod()
-	{
-		return Platform::SEQUENCE;
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "";
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return true;
-	}
-
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl()
-	{
-		return true;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/PgsqlPlatform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/PgsqlPlatform.php
deleted file mode 100644
index 99e919e..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/PgsqlPlatform.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/*
- *  $Id: PgsqlPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * Postgresql Platform implementation.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class PgsqlPlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "BOOLEAN"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TINYINT, "INT2"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::SMALLINT, "INT2"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BIGINT, "INT8"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::REAL, "FLOAT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "DOUBLE PRECISION"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "TEXT"));
-	}
-
-	/**
-	 * @see        Platform#getNativeIdMethod()
-	 */
-	public function getNativeIdMethod()
-	{
-		return Platform::SERIAL;
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "";
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 32;
-	}
-
-	/**
-	 * Escape the string for RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function disconnectedEscapeText($text)
-	{
-		if (function_exists('pg_escape_string')) {
-			return pg_escape_string($text);
-		} else {
-			return parent::disconnectedEscapeText($text);
-		}
-	}
-
-	/**
-	 * @see        Platform::getBooleanString()
-	 */
-	public function getBooleanString($b)
-	{
-		// parent method does the checking for allowes tring
-		// representations & returns integer
-		$b = parent::getBooleanString($b);
-		return ($b ? "'t'" : "'f'");
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::hasSize(String)
-	 * TODO collect info for all platforms
-	 */
-	public function hasSize($sqlType)
-	{
-		return !("BYTEA" == $sqlType || "TEXT" == $sqlType);
-	}
-
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl()
-	{
-		return true;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/Platform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/Platform.php
deleted file mode 100644
index bf5b449..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/Platform.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- *  $Id: Platform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Interface for RDBMS platform specific behaviour.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-interface Platform {
-
-	/**
-	 * Constant for auto-increment id method.
-	 */
-	const IDENTITY = "identity";
-
-	/**
-	 * Constant for sequence id method.
-	 */
-	const SEQUENCE = "sequence";
-
-	/**
-	 * Constant for serial id method (postgresql).
-	 */
-	const SERIAL = "serial";
-
-	/**
-	 * Sets a database connection to use (for quoting, etc.).
-	 * @param      PDO $con The database connection to use in this Platform class.
-	 */
-	public function setConnection(PDO $con = null);
-
-	/**
-	 * Returns the database connection to use for this Platform class.
-	 * @return     PDO The database connection or NULL if none has been set.
-	 */
-	public function getConnection();
-
-	/**
-	 * Sets the GeneratorConfig which contains any generator build properties.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config);
-
-	/**
-	 * Gets the GeneratorConfig object.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig();
-
-	/**
-	 * Returns the short name of the database type that this platform represents.
-	 * For example MysqlPlatform->getDatabaseType() returns 'mysql'.
-	 * @return     string
-	 */
-	public function getDatabaseType();
-
-	/**
-	 * Returns the native IdMethod (sequence|identity)
-	 *
-	 * @return     string The native IdMethod (Platform:IDENTITY, Platform::SEQUENCE).
-	 */
-	public function getNativeIdMethod();
-
-	/**
-	 * Returns the max column length supported by the db.
-	 *
-	 * @return     int The max column length
-	 */
-	public function getMaxColumnNameLength();
-
-	/**
-	 * Returns the db specific domain for a jdbcType.
-	 *
-	 * @param      string $creoleType the creole type name.
-	 * @return     Domain The db specific domain.
-	 */
-	public function getDomainForType($creoleType);
-
-	/**
-	 * @return     string The RDBMS-specific SQL fragment for <code>NULL</code>
-	 * or <code>NOT NULL</code>.
-	 */
-	public function getNullString($notNull);
-
-	/**
-	 * @return     The RDBMS-specific SQL fragment for autoincrement.
-	 */
-	public function getAutoIncrement();
-
-	/**
-	 * Returns if the RDBMS-specific SQL type has a size attribute.
-	 *
-	 * @param      string $sqlType the SQL type
-	 * @return     boolean True if the type has a size attribute
-	 */
-	public function hasSize($sqlType);
-
-	/**
-	 * Returns if the RDBMS-specific SQL type has a scale attribute.
-	 *
-	 * @param      string $sqlType the SQL type
-	 * @return     boolean True if the type has a scale attribute
-	 */
-	public function hasScale($sqlType);
-
-	/**
-	 * Quote and escape needed characters in the string for unerlying RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function quote($text);
-
-	/**
-	 * Quotes identifiers used in database SQL.
-	 * @param      string $text
-	 * @return     string Quoted identifier.
-	 */
-	public function quoteIdentifier($text);
-
-	/**
-	 * Whether RDBMS supports native ON DELETE triggers (e.g. ON DELETE CASCADE).
-	 * @return     boolean
-	 */
-	public function supportsNativeDeleteTrigger();
-  
-	/**
-	 * Whether RDBMS supports INSERT null values in autoincremented primary keys
-	 * @return     boolean
-	 */
-	public function supportsInsertNullPk();
-	
-	/**
-	 * Returns the boolean value for the RDBMS.
-	 *
-	 * This value should match the boolean value that is set
-	 * when using Creole's PreparedStatement::setBoolean().
-	 *
-	 * This function is used to set default column values when building
-	 * SQL.
-	 *
-	 * @param      mixed $tf A boolean or string representation of boolean ('y', 'true').
-	 * @return     mixed
-	 */
-	public function getBooleanString($tf);
-
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl();
-
-	/**
-	 * Gets the preferred timestamp formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimestampFormatter();
-
-	/**
-	 * Gets the preferred date formatter for setting time values.
-	 * @return     string
-	 */
-	public function getDateFormatter();
-
-	/**
-	 * Gets the preferred time formatter for setting time values.
-	 * @return     string
-	 */
-	public function getTimeFormatter();
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/SqlitePlatform.php b/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/SqlitePlatform.php
deleted file mode 100644
index 350c717..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/engine/platform/SqlitePlatform.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- *  $Id: SqlitePlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * SQLite Platform implementation.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class SqlitePlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "DECIMAL"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "MEDIUMTEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "MEDIUMBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "LONGTEXT"));
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 * @link       http://www.sqlite.org/autoinc.html
-	 */
-	public function getAutoIncrement()
-	{
-
-		return "PRIMARY KEY";
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 1024;
-	}
-
-	/**
-	 * @see        Platform#hasSize(String)
-	 */
-	public function hasSize($sqlType) {
-		return !("MEDIUMTEXT" == $sqlType || "LONGTEXT" == $sqlType
-				|| "BLOB" == $sqlType || "MEDIUMBLOB" == $sqlType
-				|| "LONGBLOB" == $sqlType);
-	}
-
-	/**
-	 * Escape the string for RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function disconnectedEscapeText($text)
-	{
-		if (function_exists('sqlite_escape_string')) {
-			return sqlite_escape_string($text);
-		} else {
-			return parent::disconnectedEscapeText($text);
-		}
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/AbstractPropelDataModelTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/AbstractPropelDataModelTask.php
deleted file mode 100644
index c914d61..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/AbstractPropelDataModelTask.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-
-/*
- *  $Id: AbstractPropelDataModelTask.php 1297 2009-11-08 07:26:13Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-//include_once 'phing/tasks/ext/CapsuleTask.php';
-require_once 'phing/Task.php';
-include_once 'propel/engine/GeneratorConfig.php';
-include_once 'propel/engine/database/model/AppData.php';
-include_once 'propel/engine/database/model/Database.php';
-include_once 'propel/engine/database/transform/XmlToAppData.php';
-
-/**
- * An abstract base Propel task to perform work related to the XML schema file.
- *
- * The subclasses invoke templates to do the actual writing of the resulting files.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jason van Zyl <jvanzyl at zenplex.com> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @package    propel.phing
- */
-abstract class AbstractPropelDataModelTask extends Task {
-
-	/**
-	 * Fileset of XML schemas which represent our data models.
-	 * @var        array Fileset[]
-	 */
-	protected $schemaFilesets = array();
-
-	/**
-	 * Data models that we collect. One from each XML schema file.
-	 */
-	protected $dataModels = array();
-
-	/**
-	 * Have datamodels been initialized?
-	 * @var        boolean
-	 */
-	private $dataModelsLoaded = false;
-
-	/**
-	 * Map of data model name to database name.
-	 * Should probably stick to the convention
-	 * of them being the same but I know right now
-	 * in a lot of cases they won't be.
-	 */
-	protected $dataModelDbMap;
-
-	/**
-	 * Hashtable containing the names of all the databases
-	 * in our collection of schemas.
-	 */
-	protected $databaseNames; // doesn't seem to be used anywhere
-
-	/**
-	 * The target database(s) we are generating SQL
-	 * for. Right now we can only deal with a single
-	 * target, but we will support multiple targets
-	 * soon.
-	 */
-	protected $targetDatabase;
-
-	/**
-	 * DB encoding to use for XmlToAppData object
-	 */
-	protected $dbEncoding = 'iso-8859-1';
-
-	/**
-	 * Target PHP package to place the generated files in.
-	 */
-	protected $targetPackage;
-
-	/**
-	 * @var        Mapper
-	 */
-	protected $mapperElement;
-
-	/**
-	 * Destination directory for results of template scripts.
-	 * @var        PhingFile
-	 */
-	protected $outputDirectory;
-
-	/**
-	 * Whether to package the datamodels or not
-	 * @var        PhingFile
-	 */
-	protected $packageObjectModel;
-
-	/**
-	 * Whether to perform validation (XSD) on the schema.xml file(s).
-	 * @var        boolean
-	 */
-	protected $validate;
-
-	/**
-	 * The XSD schema file to use for validation.
-	 * @var        PhingFile
-	 */
-	protected $xsdFile;
-
-	/**
-	 * XSL file to use to normalize (or otherwise transform) schema before validation.
-	 * @var        PhingFile
-	 */
-	protected $xslFile;
-
-	/**
-	 * Optional database connection url.
-	 * @var        string
-	 */
-	private $url = null;
-
-	/**
-	 * Optional database connection user name.
-	 * @var        string
-	 */
-	private $userId = null;
-
-	/**
-	 * Optional database connection password.
-	 * @var        string
-	 */
-	private $password = null;
-
-	/**
-	 * PDO Connection.
-	 * @var        PDO
-	 */
-	private $conn = false;
-
-	/**
-	 * An initialized GeneratorConfig object containing the converted Phing props.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * Return the data models that have been
-	 * processed.
-	 *
-	 * @return     List data models
-	 */
-	public function getDataModels()
-	{
-		if (!$this->dataModelsLoaded) $this->loadDataModels();
-		return $this->dataModels;
-	}
-
-	/**
-	 * Return the data model to database name map.
-	 *
-	 * @return     Hashtable data model name to database name map.
-	 */
-	public function getDataModelDbMap()
-	{
-		if (!$this->dataModelsLoaded) $this->loadDataModels();
-		return $this->dataModelDbMap;
-	}
-
-	/**
-	 * Adds a set of xml schema files (nested fileset attribute).
-	 *
-	 * @param      set a Set of xml schema files
-	 */
-	public function addSchemaFileset(Fileset $set)
-	{
-		$this->schemaFilesets[] = $set;
-	}
-
-	/**
-	 * Get the current target database.
-	 *
-	 * @return     String target database(s)
-	 */
-	public function getTargetDatabase()
-	{
-		return $this->targetDatabase;
-	}
-
-	/**
-	 * Set the current target database. (e.g. mysql, oracle, ..)
-	 *
-	 * @param      v target database(s)
-	 */
-	public function setTargetDatabase($v)
-	{
-		$this->targetDatabase = $v;
-	}
-
-	/**
-	 * Get the current target package.
-	 *
-	 * @return     string target PHP package.
-	 */
-	public function getTargetPackage()
-	{
-		return $this->targetPackage;
-	}
-
-	/**
-	 * Set the current target package. This is where generated PHP classes will
-	 * live.
-	 *
-	 * @param      string $v target PHP package.
-	 */
-	public function setTargetPackage($v)
-	{
-		$this->targetPackage = $v;
-	}
-
-	/**
-	 * Set the packageObjectModel switch on/off
-	 *
-	 * @param      string $v The build.property packageObjectModel
-	 */
-	public function setPackageObjectModel($v)
-	{
-		$this->packageObjectModel = ($v === '1' ? true : false);
-	}
-
-	/**
-	 * Set whether to perform validation on the datamodel schema.xml file(s).
-	 * @param      boolean $v
-	 */
-	public function setValidate($v)
-	{
-		$this->validate = $v;
-	}
-
-	/**
-	 * Set the XSD schema to use for validation of any datamodel schema.xml file(s).
-	 * @param      $v PhingFile
-	 */
-	public function setXsd(PhingFile $v)
-	{
-		$this->xsdFile = $v;
-	}
-
-	/**
-	 * Set the normalization XSLT to use to transform datamodel schema.xml file(s) before validation and parsing.
-	 * @param      $v PhingFile
-	 */
-	public function setXsl(PhingFile $v)
-	{
-		$this->xslFile = $v;
-	}
-
-	/**
-	 * [REQUIRED] Set the output directory. It will be
-	 * created if it doesn't exist.
-	 * @param      PhingFile $outputDirectory
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function setOutputDirectory(PhingFile $outputDirectory) {
-		try {
-			if (!$outputDirectory->exists()) {
-				$this->log("Output directory does not exist, creating: " . $outputDirectory->getPath(),Project::MSG_VERBOSE);
-				if (!$outputDirectory->mkdirs()) {
-					throw new IOException("Unable to create Ouptut directory: " . $outputDirectory->getAbsolutePath());
-				}
-			}
-			$this->outputDirectory = $outputDirectory->getCanonicalPath();
-		} catch (IOException $ioe) {
-			throw new BuildException($ioe);
-		}
-	}
-
-	/**
-	 * Set the current target database encoding.
-	 *
-	 * @param      v target database encoding
-	 */
-	public function setDbEncoding($v)
-	{
-		$this->dbEncoding = $v;
-	}
-
-	/**
-	 * Set the DB connection url.
-	 *
-	 * @param      string $url connection url
-	 */
-	public function setUrl($url)
-	{
-		$this->url = $url;
-	}
-
-	/**
-	 * Set the user name for the DB connection.
-	 *
-	 * @param      string $userId database user
-	 */
-	public function setUserid($userId)
-	{
-		$this->userId = $userId;
-	}
-
-	/**
-	 * Set the password for the DB connection.
-	 *
-	 * @param      string $password database password
-	 */
-	public function setPassword($password)
-	{
-		$this->password = $password;
-	}
-
-	/**
-	 * Get the output directory.
-	 * @return     string
-	 */
-	public function getOutputDirectory() {
-		return $this->outputDirectory;
-	}
-
-	/**
-	 * Nested creator, creates one Mapper for this task.
-	 *
-	 * @return     Mapper  The created Mapper type object.
-	 * @throws     BuildException
-	 */
-	public function createMapper() {
-		if ($this->mapperElement !== null) {
-			throw new BuildException("Cannot define more than one mapper.", $this->location);
-		}
-		$this->mapperElement = new Mapper($this->project);
-		return $this->mapperElement;
-	}
-
-	/**
-	 * Maps the passed in name to a new filename & returns resolved File object.
-	 * @param      string $from
-	 * @return     PhingFile Resolved File object.
-	 * @throws     BuilException    - if no Mapper element se
-	 *                          - if unable to map new filename.
-	 */
-	protected function getMappedFile($from)
-	{
-		if (!$this->mapperElement) {
-			throw new BuildException("This task requires you to use a <mapper/> element to describe how filename changes should be handled.");
-		}
-
-		$mapper = $this->mapperElement->getImplementation();
-		$mapped = $mapper->main($from);
-		if (!$mapped) {
-			throw new BuildException("Cannot create new filename based on: " . $from);
-		}
-		// Mappers always return arrays since it's possible for some mappers to map to multiple names.
-		$outFilename = array_shift($mapped);
-		$outFile = new PhingFile($this->getOutputDirectory(), $outFilename);
-		return $outFile;
-	}
-
-	/**
-	 * Gets the PDO connection, if URL specified.
-	 * @return     PDO Connection to use (for quoting, Platform class, etc.) or NULL if no connection params were specified.
-	 */
-	public function getConnection()
-	{
-		if ($this->conn === false) {
-			$this->conn = null;
-			if ($this->url) {
-				$buf = "Using database settings:\n"
-					. " URL: " . $this->url . "\n"
-					. ($this->userId ? " user: " . $this->userId . "\n" : "")
-				. ($this->password ? " password: " . $this->password . "\n" : "");
-
-				$this->log($buf, Project::MSG_VERBOSE);
-
-				// Set user + password to null if they are empty strings
-				if (!$this->userId) { $this->userId = null; }
-				if (!$this->password) { $this->password = null; }
-				try {
-					$this->conn = new PDO($this->url, $this->userId, $this->password);
-					$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-				} catch (PDOException $x) {
-					$this->log("Unable to create a PDO connection: " . $x->getMessage(), Project::MSG_WARN);
-				}
-			}
-		}
-		return $this->conn;
-	}
-
-	/**
-	 * Gets all matching XML schema files and loads them into data models for class.
-	 * @return     void
-	 */
-	protected function loadDataModels()
-	{
-		$ads = array();
-
-		// Get all matched files from schemaFilesets
-		foreach ($this->schemaFilesets as $fs) {
-			$ds = $fs->getDirectoryScanner($this->project);
-			$srcDir = $fs->getDir($this->project);
-
-			$dataModelFiles = $ds->getIncludedFiles();
-
-			$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-			// Make a transaction for each file
-			foreach ($dataModelFiles as $dmFilename) {
-
-				$this->log("Processing: ".$dmFilename);
-				$xmlFile = new PhingFile($srcDir, $dmFilename);
-
-				$dom = new DomDocument('1.0', 'UTF-8');
-				$dom->load($xmlFile->getAbsolutePath());
-
-				// normalize (or transform) the XML document using XSLT
-				if ($this->xslFile) {
-					$this->log("Transforming " . $xmlFile->getPath() . " using stylesheet " . $this->xslFile->getPath(), Project::MSG_VERBOSE);
-					if (!class_exists('XSLTProcessor')) {
-						$this->log("Could not perform XLST transformation.  Make sure PHP has been compiled/configured to support XSLT.", Project::MSG_ERR);
-					} else {
-						// modify schema to include any external schema's (and remove the external-schema nodes)
-						$this->includeExternalSchemas($dom, $srcDir);
-						// normalize the document using normalizer stylesheet
-
-						$xsl = new XsltProcessor();
-						$xsl->importStyleSheet(DomDocument::load($this->xslFile->getAbsolutePath()));
-						$transformed = $xsl->transformToDoc($dom);
-						$newXmlFilename = substr($xmlFile->getName(), 0, strrpos($xmlFile->getName(), '.')) . '-transformed.xml';
-
-						// now overwrite previous vars to point to newly transformed file
-						$xmlFile = new PhingFile($srcDir, $newXmlFilename);
-						$transformed->save($xmlFile->getAbsolutePath());
-						$this->log("\t- Using new (post-transformation) XML file: " . $xmlFile->getPath(), Project::MSG_VERBOSE);
-
-						$dom = new DomDocument('1.0', 'UTF-8');
-						$dom->load($xmlFile->getAbsolutePath());
-					}
-				}
-
-				// validate the XML document using XSD schema
-				if ($this->validate && $this->xsdFile) {
-					$this->log("Validating XML doc (".$xmlFile->getPath().") using schema file " . $this->xsdFile->getPath(), Project::MSG_VERBOSE);
-					if (!$dom->schemaValidate($this->xsdFile->getAbsolutePath())) {
-						throw new EngineException("XML schema file (".$xmlFile->getPath().") does not validate. See warnings above for reasons validation failed (make sure error_reporting is set to show E_WARNING if you don't see any).", $this->getLocation());
-					}
-				}
-
-				$xmlParser = new XmlToAppData($platform, $this->getTargetPackage(), $this->dbEncoding);
-				$ad = $xmlParser->parseFile($xmlFile->getAbsolutePath());
-				$ad->setName($dmFilename); // <-- Important: use the original name, not the -transformed name.
-				$ads[] = $ad;
-			}
-		}
-
-		if (empty($ads)) {
-			throw new BuildException("No schema files were found (matching your schema fileset definition).");
-		}
-
-		if (!$this->packageObjectModel) {
-
-			$this->dataModels = $ads;
-			$this->databaseNames = array(); // doesn't seem to be used anywhere
-			$this->dataModelDbMap = array();
-
-			// Different datamodels may state the same database
-			// names, we just want the unique names of databases.
-			foreach ($this->dataModels as $dm) {
-				$database = $dm->getDatabase();
-				$this->dataModelDbMap[$dm->getName()] = $database->getName();
-				$this->databaseNames[$database->getName()] = $database->getName(); // making list of *unique* dbnames.
-			}
-		} else {
-
-			$this->joinDatamodels($ads);
-			$this->dataModels[0]->getDatabases(); // calls doFinalInitialization()
-		}
-
-		$this->dataModelsLoaded = true;
-	}
-
-	/**
-	 * Replaces all external-schema nodes with the content of xml schema that node refers to
-	 *
-	 * Recurses to include any external schema referenced from in an included xml (and deeper)
-	 * Note: this function very much assumes at least a reasonable XML schema, maybe it'll proof
-	 * users don't have those and adding some more informative exceptions would be better
-	 *
-	 * @param      DomDocument $dom
-	 * @param      string $srcDir
-	 * @return     void (objects, DomDocument, are references by default in PHP 5, so returning it is useless)
-	 **/
-	protected function includeExternalSchemas(DomDocument $dom, $srcDir) {
-		$databaseNode = $dom->getElementsByTagName("database")->item(0);
-		$externalSchemaNodes = $dom->getElementsByTagName("external-schema");
-		while ($externalSchema = $externalSchemaNodes->item(0)) {
-			$include = $externalSchema->getAttribute("filename");
-			$externalSchema->parentNode->removeChild($externalSchema);
-			if (strpos($srcDir->getPath(), "/") === 0) {
-				$externalSchemaFile = new PhingFile($include);
-			} else {
-				$externalSchemaFile = new PhingFile($srcDir, $include);
-			}
-			$externalSchemaDom = new DomDocument('1.0', 'UTF-8');
-			$externalSchemaDom->load($externalSchemaFile->getAbsolutePath());
-			$this->includeExternalSchemas($externalSchemaDom, $srcDir);
-			foreach ($externalSchemaDom->getElementsByTagName("table") as $tableNode) { // see xsd, datatase may only have table or external-schema, the latter was just deleted so this should cover everything
-				$databaseNode->appendChild($dom->importNode($tableNode, true));
-			}
-		}
-	}
-	/**
-	 * Joins the datamodels collected from schema.xml files into one big datamodel
-	 *
-	 * This applies only when the the packageObjectModel option is set. We need to
-	 * join the datamodels in this case to allow for foreign keys that point to
-	 * tables in different packages.
-	 *
-	 * @param      array $ads The datamodels to join
-	 */
-	protected function joinDatamodels($ads) {
-
-		foreach ($ads as $ad) {
-			$db = $ad->getDatabase(null, false);
-			$this->dataModelDbMap[$ad->getName()] = $db->getName();
-		}
-
-		foreach ($ads as $addAd) {
-
-			$ad = &$this->dataModels[0];
-			if (!isset($ad)) {
-				$addAd->setName('JoinedDataModel');
-				$ad = $addAd;
-				continue;
-			}
-			foreach ($addAd->getDatabases(false) as $addDb) {
-				$addDbName = $addDb->getName();
-				if (!$package = $addDb->getPackage()) {
-					throw new BuildException('No package found for database "' . $addDbName . '" in ' . $addAd->getName() . '. The propel.packageObjectModel property requires the package attribute to be set for each database.');
-				}
-				$db = $ad->getDatabase($addDbName, false);
-				if (!$db) {
-					$ad->addDatabase($addDb);
-					continue;
-				}
-				foreach ($addDb->getTables() as $addTable) {
-					$table = $db->getTable($addTable->getName());
-					if ($table) {
-						throw new BuildException('Duplicate table found: ' . $addDbName . '.');
-					}
-					$db->addTable($addTable);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Gets the GeneratorConfig object for this task or creates it on-demand.
-	 * @return     GeneratorConfig
-	 */
-	protected function getGeneratorConfig()
-	{
-		if ($this->generatorConfig === null) {
-			$this->generatorConfig = new GeneratorConfig();
-			$this->generatorConfig->setBuildProperties($this->getProject()->getProperties());
-		}
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Checks this class against Basic requrements of any propel datamodel task.
-	 *
-	 * @throws     BuildException 	- if schema fileset was not defined
-	 * 							- if no output directory was specified
-	 */
-	protected function validate()
-	{
-		if (empty($this->schemaFilesets)) {
-			throw new BuildException("You must specify a fileset of XML schemas.", $this->getLocation());
-		}
-
-		// Make sure the output directory is set.
-		if ($this->outputDirectory === null) {
-			throw new BuildException("The output directory needs to be defined!", $this->getLocation());
-		}
-
-		if ($this->validate) {
-			if (!$this->xsdFile) {
-				throw new BuildException("'validate' set to TRUE, but no XSD specified (use 'xsd' attribute).", $this->getLocation());
-			}
-		}
-
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelConvertConfTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelConvertConfTask.php
deleted file mode 100644
index f5f9c28..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelConvertConfTask.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelConvertConfTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/Task.php';
-require_once 'propel/phing/PropelDataModelTemplateTask.php';
-require_once 'propel/engine/builder/om/OMBuilder.php';
-include_once 'propel/engine/builder/om/ClassTools.php';
-
-/**
- * This Task converts the XML runtime configuration file into a PHP array for faster performance.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.phing
- */
-class PropelConvertConfTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * @var        PhingFile The XML runtime configuration file to be converted.
-	 */
-	private $xmlConfFile;
-
-	/**
-	 * @var        string This is the file where the converted conf array dump will be placed.
-	 */
-	private $outputFile;
-
-	/**
-	 * @var        string This is the file where the classmap manifest converted conf array dump will be placed.
-	 */
-	private $outputClassmapFile;
-
-	/**
-	 * [REQUIRED] Set the input XML runtime conf file.
-	 * @param      PhingFile $v The XML runtime configuration file to be converted.
-	 */
-	public function setXmlConfFile(PhingFile $v)
-	{
-		$this->xmlConfFile = $v;
-	}
-
-	/**
-	 * [REQUIRED] Set the output filename for the converted runtime conf.
-	 * The directory is specified using AbstractPropelDataModelTask#setOutputDirectory().
-	 * @param      string $outputFile
-	 * @see        AbstractPropelDataModelTask#setOutputDirectory()
-	 */
-	public function setOutputFile($outputFile)
-	{
-		// this is a string, not a file
-		$this->outputFile = $outputFile;
-	}
-
-	/**
-	 * [REQUIRED] Set the output filename for the autoload classmap.
-	 * The directory is specified using AbstractPropelDataModelTask#setOutputDirectory().
-	 * @param      string $outputFile
-	 * @see        AbstractPropelDataModelTask#setOutputDirectory()
-	 */
-	public function setOutputClassmapFile($outputFile)
-	{
-		// this is a string, not a file
-		$this->outputClassmapFile = $outputFile;
-	}
-
-	/**
-	 * The main method does the work of the task.
-	 */
-	public function main()
-	{
-		// Check to make sure the input and output files were specified and that the input file exists.
-
-		if (!$this->xmlConfFile || !$this->xmlConfFile->exists()) {
-			throw new BuildException("No valid xmlConfFile specified.", $this->getLocation());
-		}
-
-		if (!$this->outputFile) {
-			throw new BuildException("No outputFile specified.", $this->getLocation());
-		}
-
-		// Create a PHP array from the XML file
-
-		$xmlDom = new DOMDocument();
-		$xmlDom->load($this->xmlConfFile->getAbsolutePath());
-		$xml = simplexml_load_string($xmlDom->saveXML());
-		$phpconf = self::simpleXmlToArray($xml);
-		
-		/* For some reason the array generated from runtime-conf.xml has separate
-		 * 'log' section and 'propel' sections. To maintain backward compatibility
-		 * we need to put 'log' back into the 'propel' section.
-		 */
-		$log = array();
-		if (isset($phpconf['log'])) {
-			$phpconf['propel']['log'] = $phpconf['log'];
-			unset($phpconf['log']);
-		}
-
-		if(isset($phpconf['propel'])) {
-			$phpconf = $phpconf['propel'];
-		}
-			
-		// add generator version
-		$phpconf['generator_version'] = $this->getGeneratorConfig()->getBuildProperty('version');
-		
-		// add classmap
-		$phpconf['classmap'] = $this->getClassMap();
-		
-		// Write resulting PHP data to output file:
-
-		$outfile = new PhingFile($this->outputDirectory, $this->outputFile);
-		$output = "<?php\n";
-		$output .= "// This file generated by Propel " . $phpconf['propel']['generator_version'] . " convert-conf target".($this->getGeneratorConfig()->getBuildProperty('addTimestamp') ? " on " . strftime("%c") : '') . "\n";
-		$output .= "// from XML runtime conf file " . $this->xmlConfFile->getPath() . "\n";
-		$output .= "return ";
-		$output .= var_export($phpconf, true);
-		$output .= ";";
-
-		$this->log("Creating PHP runtime conf file: " . $outfile->getPath());
-		if (!file_put_contents($outfile->getAbsolutePath(), $output)) {
-			throw new BuildException("Error creating output file: " . $outfile->getAbsolutePath(), $this->getLocation());
-		}
-
-	} // main()
-
-	/**
-	 * Recursive function that converts an SimpleXML object into an array.
-	 * @author     Christophe VG (based on code form php.net manual comment)
-	 * @param      object SimpleXML object.
-	 * @return     array Array representation of SimpleXML object.
-	 */
-	private static function simpleXmlToArray($xml)
-	{
-		$ar = array();
-
-		foreach ( $xml->children() as $k => $v ) {
-
-			// recurse the child
-			$child = self::simpleXmlToArray( $v );
-
-			//print "Recursed down and found: " . var_export($child, true) . "\n";
-
-			// if it's not an array, then it was empty, thus a value/string
-			if ( count($child) == 0 ) {
-				$child = self::getConvertedXmlValue($v);
-
-			}
-
-			// add the childs attributes as if they where children
-			foreach ( $v->attributes() as $ak => $av ) {
-
-				// if the child is not an array, transform it into one
-				if ( !is_array( $child ) ) {
-					$child = array( "value" => $child );
-				}
-
-				if ($ak == 'id') {
-					// special exception: if there is a key named 'id'
-					// then we will name the current key after that id
-					$k = self::getConvertedXmlValue($av);
-				} else {
-					// otherwise, just add the attribute like a child element
-					$child[$ak] = self::getConvertedXmlValue($av);
-				}
-			}
-
-			// if the $k is already in our children list, we need to transform
-			// it into an array, else we add it as a value
-			if ( !in_array( $k, array_keys($ar) ) ) {
-				$ar[$k] = $child;
-			} else {
-				// (This only applies to nested nodes that do not have an @id attribute)
-
-				// if the $ar[$k] element is not already an array, then we need to make it one.
-				// this is a bit of a hack, but here we check to also make sure that if it is an
-				// array, that it has numeric keys.  this distinguishes it from simply having other
-				// nested element data.
-
-				if ( !is_array($ar[$k]) || !isset($ar[$k][0]) ) { $ar[$k] = array($ar[$k]); }
-				$ar[$k][] = $child;
-			}
-
-		}
-
-		return $ar;
-	}
-
-	/**
-	 * Process XML value, handling boolean, if appropriate.
-	 * @param      object The simplexml value object.
-	 * @return     mixed
-	 */
-	private static function getConvertedXmlValue($value)
-	{
-		$value = (string) $value; // convert from simplexml to string
-		// handle booleans specially
-		$lwr = strtolower($value);
-		if ($lwr === "false") {
-			$value = false;
-		} elseif ($lwr === "true") {
-			$value = true;
-		}
-		return $value;
-	}
-	
-	/**
-	 * Lists data model classes and builds an associative array className => classPath
-	 * To be used for autoloading
-	 * @return array
-	 */
-	protected function getClassMap()
-	{
-		$phpconfClassmap = array();
-
-		$generatorConfig = $this->getGeneratorConfig();
-
-		foreach ($this->getDataModels() as $dataModel) {
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$classMap = array();
-
-				foreach ($database->getTables() as $table) {
-
-					if (!$table->isForReferenceOnly()) {
-
-						// Classes that I'm assuming do not need to be mapped (because they will be required by subclasses):
-						//	- base peer and object classes
-						//	- interfaces
-						//	- base node peer and object classes
-
-						// -----------------------------------------------------
-						// Add Peer & Object stub classes and MapBuilder classes
-						// -----------------------------------------------------
-						// (this code is based on PropelOMTask)
-
-						foreach (array('tablemap', 'peerstub', 'objectstub') as $target) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-							$this->log("Adding class mapping: " . $builder->getClassname() . ' => ' . $builder->getClassFilePath());
-							$classMap[$builder->getClassname()] = $builder->getClassFilePath();
-						}
-
-						if ($col = $table->getChildrenColumn()) {
-							if ($col->isEnumeratedClasses()) {
-								foreach ($col->getChildren() as $child) {
-									$builder = $generatorConfig->getConfiguredBuilder($table, 'objectmultiextend');
-									$builder->setChild($child);
-									$this->log("Adding class mapping: " . $builder->getClassname() . ' => ' . $builder->getClassFilePath());
-									$classMap[$builder->getClassname()] = $builder->getClassFilePath();
-								}
-							}
-						}
-
-						$baseClass = $table->getBaseClass();
-						if ( $baseClass !== null ) {
-							$className = ClassTools::classname($baseClass);
-							if (!isset($classMap[$className])) {
-								$classPath = ClassTools::getFilePath($baseClass);
-								$this->log('Adding class mapping: ' . $className . ' => ' . $classPath);
-								$classMap[$className] = $classPath;
-							}
-						}
-
-						$basePeer = $table->getBasePeer();
-						if ( $basePeer !== null ) {
-							$className = ClassTools::classname($basePeer);
-							if (!isset($classMap[$className])) {
-								$classPath = ClassTools::getFilePath($basePeer);
-								$this->log('Adding class mapping: ' . $className . ' => ' . $classPath);
-								$classMap[$className] = $classPath;
-							}
-						}
-						
-						// ------------------------
-						// Create tree Node classes
-						// ------------------------
-
-						if ('MaterializedPath' == $table->treeMode()) {
-							foreach (array('nodepeerstub', 'nodestub') as $target) {
-								$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-								$this->log("Adding class mapping: " . $builder->getClassname() . ' => ' . $builder->getClassFilePath());
-								$classMap[$builder->getClassname()] = $builder->getClassFilePath();
-							}
-						}
-
-					} // if (!$table->isReferenceOnly())
-				}
-
-				$phpconfClassmap = array_merge($phpconfClassmap, $classMap);
-			}
-		}
-		
-		return $phpconfClassmap;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelCreoleTransformTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelCreoleTransformTask.php
deleted file mode 100644
index 4446907..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelCreoleTransformTask.php
+++ /dev/null
@@ -1,829 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelCreoleTransformTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/Task.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * This class generates an XML schema of an existing database from
- * Creole metadata.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jason van Zyl <jvanzyl at periapt.com> (Torque)
- * @author     Fedor Karpelevitch <fedor.karpelevitch at barra.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelCreoleTransformTask extends Task {
-
-	/** Name of XML database schema produced. */
-	protected $xmlSchema;
-
-	/** Creole URL. */
-	protected $dbUrl;
-
-	/** Creole driver. */
-	protected $dbDriver;
-
-	/** Creole user name. */
-	protected $dbUser;
-
-	/** Creole password. */
-	protected $dbPassword;
-
-	/** DB encoding to use */
-	protected $dbEncoding = 'iso-8859-1';
-
-	/** DB schema to use. */
-	protected $dbSchema;
-
-	/** parsed DB DSN */
-	protected $dsn;
-
-	/** DOM document produced. */
-	protected $doc;
-
-	/** The document root element. */
-	protected $databaseNode;
-
-	/** Hashtable of columns that have primary keys. */
-	protected $primaryKeys;
-
-	/** Hashtable to track what table a column belongs to. */
-	// doesn't seem to be used
-	// protected $columnTableMap;
-
-	/** whether to use same name for phpName or not */
-	protected $samePhpName;
-
-	/** whether to add vendor info or not */
-	protected $addVendorInfo;
-
-	/**
-	 * Bitfield to switch on/off which validators will be created.
-	 *
-	 * @var        int
-	 */
-	protected $validatorBits;
-
-	/**
-	 * Collect validatorInfos to create validators.
-	 *
-	 * @var        int
-	 */
-	protected $validatorInfos;
-
-	/**
-	 * Zero bit for no validators
-	 */
-	const VALIDATORS_NONE = 0;
-
-	/**
-	 * Bit for maxLength validator
-	 */
-	const VALIDATORS_MAXLENGTH = 1;
-
-	/**
-	 * Bit for maxValue validator
-	 */
-	const VALIDATORS_MAXVALUE = 2;
-
-	/**
-	 * Bit for type validator
-	 */
-	const VALIDATORS_TYPE = 4;
-
-	/**
-	 * Bit for required validator
-	 */
-	const VALIDATORS_REQUIRED = 8;
-
-	/**
-	 * Bit for unique validator
-	 */
-	const VALIDATORS_UNIQUE = 16;
-
-	/**
-	 * Bit for all validators
-	 */
-	const VALIDATORS_ALL = 255;
-
-	/**
-	 * Maps validator type tokens to bits
-	 *
-	 * The tokens are used in the propel.addValidators property to define
-	 * which validators are to be added
-	 *
-	 * @static
-	 * @var        array
-	 */
-	static protected $validatorBitMap = array (
-		'none' => PropelCreoleTransformTask::VALIDATORS_NONE,
-		'maxlength' => PropelCreoleTransformTask::VALIDATORS_MAXLENGTH,
-		'maxvalue' => PropelCreoleTransformTask::VALIDATORS_MAXVALUE,
-		'type' => PropelCreoleTransformTask::VALIDATORS_TYPE,
-		'required' => PropelCreoleTransformTask::VALIDATORS_REQUIRED,
-		'unique' => PropelCreoleTransformTask::VALIDATORS_UNIQUE,
-		'all' => PropelCreoleTransformTask::VALIDATORS_ALL,
-	);
-
-	/**
-	 * Defines messages that are added to validators
-	 *
-	 * @static
-	 * @var        array
-	 */
-	static protected $validatorMessages = array (
-		'maxlength' => array (
-			'msg' => 'The field %s must be not longer than %s characters.',
-			'var' => array('colName', 'value')
-	),
-		'maxvalue' => array (
-			'msg' => 'The field %s must be not greater than %s.',
-			'var' => array('colName', 'value')
-	),
-		'type' => array (
-			'msg' => 'The field %s is not a valid value.',
-			'var' => array('colName')
-	),
-		'required' => array (
-			'msg' => 'The field %s is required.',
-			'var' => array('colName')
-	),
-		'unique' => array (
-			'msg' => 'This %s already exists in table %s.',
-			'var' => array('colName', 'tableName')
-	),
-	);
-
-	public function getDbSchema()
-	{
-		return $this->dbSchema;
-	}
-
-	public function setDbSchema($dbSchema)
-	{
-		$this->dbSchema = $dbSchema;
-	}
-
-	public function setDbUrl($v)
-	{
-		$this->dbUrl = $v;
-	}
-
-	public function setDbDriver($v)
-	{
-		$this->dbDriver = $v;
-	}
-
-	public function setDbUser($v)
-	{
-		$this->dbUser = $v;
-	}
-
-	public function setDbPassword($v)
-	{
-		$this->dbPassword = $v;
-	}
-
-	public function setDbEncoding($v)
-	{
-		$this->dbEncoding = $v;
-	}
-
-	public function setOutputFile($v)
-	{
-		$this->xmlSchema = $v;
-	}
-
-	public function setSamePhpName($v)
-	{
-		$this->samePhpName = $v;
-	}
-
-	public function setAddVendorInfo($v)
-	{
-		$this->addVendorInfo = (boolean) $v;
-	}
-
-	/**
-	 * Sets set validator bitfield from a comma-separated list of "validator bit" names.
-	 *
-	 * @param      string $v The comma-separated list of which validators to add.
-	 * @return     void
-	 */
-	public function setAddValidators($v)
-	{
-		$validKeys = array_keys(self::$validatorBitMap);
-
-		// lowercase input
-		$v = strtolower($v);
-
-		$bits = self::VALIDATORS_NONE;
-
-		$exprs = explode(',', $v);
-		foreach ($exprs as $expr) {
-			$expr = trim($expr);
-			if (!isset(self::$validatorBitMap[$expr])) {
-				throw new BuildException("Unable to interpret validator in expression ('$v'): " . $expr);
-			}
-			$bits |= self::$validatorBitMap[$expr];
-		}
-
-		$this->validatorBits = $bits;
-	}
-
-	public function isSamePhpName()
-	{
-		return $this->samePhpName;
-	}
-
-	/**
-	 * Default constructor.
-	 * @return     void
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		include_once 'creole/Creole.php';
-		if (!class_exists('Creole')) {
-			throw new BuildException( get_class($this) . " task depends on Creole classes being on include_path. (i.e. include of 'creole/Creole.php' failed.)", $this->getLocation());
-		}
-
-		$this->log("Propel - CreoleToXMLSchema starting");
-		$this->log("Your DB settings are:");
-		$this->log("driver : " . ($this->dbDriver ? $this->dbDriver : "(default)"));
-		$this->log("URL : " . $this->dbUrl);
-
-		//(not yet supported) $this->log("schema : " . $this->dbSchema);
-		//DocumentTypeImpl docType = new DocumentTypeImpl(null, "database", null,
-		//	   "http://jakarta.apache.org/turbine/dtd/database.dtd");
-
-		$this->doc = new DOMDocument('1.0', 'utf-8');
-		$this->doc->formatOutput = true; // pretty printing
-
-		$this->doc->appendChild($this->doc->createComment("Autogenerated by CreoleToXMLSchema!"));
-
-		try {
-			$this->generateXML();
-			$this->log("Writing XML to file: " . $this->xmlSchema);
-			$outFile = new PhingFile($this->xmlSchema);
-			$out = new FileWriter($outFile);
-			$xmlstr = $this->doc->saveXML();
-			$out->write($xmlstr);
-			$out->close();
-		} catch (Exception $e) {
-			$this->log("There was an error building XML from metadata: " . $e->getMessage(), Project::MSG_ERR);
-		}
-		$this->log("Propel - CreoleToXMLSchema finished");
-	}
-
-	/**
-	 * Generates an XML database schema from Creole metadata.
-	 *
-	 * @return     void
-	 * @throws     Exception a generic exception.
-	 */
-	public function generateXML()
-	{
-		// Establish db connection
-		$con = $this->getConnection();
-
-		// Get the database Metadata.
-		$dbInfo = $con->getDatabaseInfo();
-
-		// create and add the database node
-		$databaseNode = $this->createDatabaseNode($dbInfo);
-		$this->doc->appendChild($databaseNode);
-	}
-
-	/**
-	 * Establishes a Creole database connection
-	 *
-	 * @return     object The connection
-	 */
-	protected function getConnection() {
-
-		// Attemtp to connect to a database.
-		$this->dsn = Creole::parseDSN($this->dbUrl);
-		if ($this->dbUser) {
-			$this->dsn["username"] = $this->dbUser;
-		}
-		if ($this->dbPassword) {
-			$this->dsn["password"] = $this->dbPassword;
-		}
-		if ($this->dbDriver) {
-			Creole::registerDriver($this->dsn['phptype'], $this->dbDriver);
-		}
-		$con = Creole::getConnection($this->dsn);
-		$this->log("DB connection established");
-
-		return $con;
-	}
-
-	/**
-	 * Creates a database node
-	 *
-	 * @param      object $dbInfo The dbInfo for this db
-	 * @return     object The database node instance
-	 */
-	protected function createDatabaseNode($dbInfo) {
-
-		$this->log("Processing database");
-
-		$node = $this->doc->createElement("database");
-		$node->setAttribute("name", $dbInfo->getName());
-
-		if ($vendorNode = $this->createVendorInfoNode($dbInfo->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		// create and add table nodes
-		foreach ($dbInfo->getTables() as $table) {
-			$tableNode = $this->createTableNode($table);
-			$node->appendChild($tableNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Creates a table node
-	 *
-	 * @param      object $table The table
-	 * @return     object The table node instance
-	 */
-	protected function createTableNode($table) {
-
-		$this->log("Processing table: " . $table->toString());
-
-		$node = $this->doc->createElement("table");
-		$node->setAttribute("name", $table->getName());
-		if ($this->isSamePhpName()) {
-			$node->setAttribute("phpName", $table->getName());
-		}
-		if ($vendorNode = $this->createVendorInfoNode($table->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		// Create and add column nodes, register column validators
-		$columns = $table->getColumns();
-		foreach ($columns as $column) {
-			$columnNode = $this->createColumnNode($column);
-			$node->appendChild($columnNode);
-			$this->registerValidatorsForColumn($column);
-			if ($column->isAutoIncrement()) {
-				$idMethod = 'native';
-			}
-		}
-		if (isset($idMethod)) {
-			$node->setAttribute("idMethod", $idMethod);
-		}
-
-		// Create and add foreign key nodes.
-		$foreignKeys = $table->getForeignKeys();
-		foreach ($foreignKeys as $foreignKey) {
-			$foreignKeyNode = $this->createForeignKeyNode($foreignKey);
-			$node->appendChild($foreignKeyNode);
-		}
-
-		// Create and add index nodes.
-		$indices =  $table->getIndices();
-		foreach ($indices as $index) {
-			$indexNode = $this->createIndexNode($index);
-			$node->appendChild($indexNode);
-		}
-
-		// add an id-method-parameter if we have a sequence that matches table_colname_seq
-		//
-		//
-		$pkey = $table->getPrimaryKey();
-		if ($pkey) {
-			$cols = $pkey->getColumns();
-			if (count($cols) === 1) {
-				$col = array_shift($cols);
-				if ($col->isAutoIncrement()) {
-					$seq_name = $table->getName().'_'.$col->getName().'_seq';
-					if ($table->getDatabase()->isSequence($seq_name)) {
-						$idMethodParameterNode = $this->doc->createElement("id-method-parameter");
-						$idMethodParameterNode->setAttribute("value", $seq_name);
-						$node->appendChild($idMethodParameterNode);
-					}
-				}
-			}
-		}
-
-
-		// Create and add validator and rule nodes.
-		$nodes = array();
-		$tableName = $table->getName();
-		if (isset($this->validatorInfos[$tableName])) {
-			foreach ($this->validatorInfos[$tableName] as $colName => $rules) {
-				$column = $table->getColumn($colName);
-				$colName = $column->getName();
-				foreach ($rules as $rule) {
-					if (!isset($nodes[$colName])) {
-						$nodes[$colName] = $this->createValidator($column, $rule['type']);
-						$node->appendChild($nodes[$colName]);
-					}
-					$ruleNode = $this->createRuleNode($column, $rule);
-					$nodes[$colName]->appendChild($ruleNode);
-				}
-			}
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Returns the Propel type for given Creole type.
-	 *
-	 * This used to be part of the PropelTypes class when Creole was an integral
-	 * part of the Propel build process.  As of Propel 1.3, though, this method
-	 * is only needed in this reverse-engineering code.
-	 *
-	 * @param      int $creoleType Creole type (e.g. CreoleTypes::CHAR)
-	 * @return     string Equivalent Propel type (e.g. PropelTypes::CHAR)
-	 */
-	protected static function getMappedPropelType($creoleType)
-	{
-		static $creoleToPropelTypeMap;
-		if ($creoleToPropelTypeMap === null) {
-			$creoleToPropelTypeMap = array();
-			$creoleToPropelTypeMap[CreoleTypes::CHAR] = PropelTypes::CHAR;
-			$creoleToPropelTypeMap[CreoleTypes::VARCHAR] = PropelTypes::VARCHAR;
-			$creoleToPropelTypeMap[CreoleTypes::LONGVARCHAR] = PropelTypes::LONGVARCHAR;
-			$creoleToPropelTypeMap[CreoleTypes::CLOB] = PropelTypes::CLOB;
-			$creoleToPropelTypeMap[CreoleTypes::NUMERIC] = PropelTypes::NUMERIC;
-			$creoleToPropelTypeMap[CreoleTypes::DECIMAL] = PropelTypes::DECIMAL;
-			$creoleToPropelTypeMap[CreoleTypes::TINYINT] = PropelTypes::TINYINT;
-			$creoleToPropelTypeMap[CreoleTypes::SMALLINT] = PropelTypes::SMALLINT;
-			$creoleToPropelTypeMap[CreoleTypes::INTEGER] = PropelTypes::INTEGER;
-			$creoleToPropelTypeMap[CreoleTypes::BIGINT] = PropelTypes::BIGINT;
-			$creoleToPropelTypeMap[CreoleTypes::REAL] = PropelTypes::REAL;
-			$creoleToPropelTypeMap[CreoleTypes::FLOAT] = PropelTypes::FLOAT;
-			$creoleToPropelTypeMap[CreoleTypes::DOUBLE] = PropelTypes::DOUBLE;
-			$creoleToPropelTypeMap[CreoleTypes::BINARY] = PropelTypes::BINARY;
-			$creoleToPropelTypeMap[CreoleTypes::VARBINARY] = PropelTypes::VARBINARY;
-			$creoleToPropelTypeMap[CreoleTypes::LONGVARBINARY] = PropelTypes::LONGVARBINARY;
-			$creoleToPropelTypeMap[CreoleTypes::BLOB] = PropelTypes::BLOB;
-			$creoleToPropelTypeMap[CreoleTypes::DATE] = PropelTypes::DATE;
-			$creoleToPropelTypeMap[CreoleTypes::TIME] = PropelTypes::TIME;
-			$creoleToPropelTypeMap[CreoleTypes::TIMESTAMP] = PropelTypes::TIMESTAMP;
-			$creoleToPropelTypeMap[CreoleTypes::BOOLEAN] = PropelTypes::BOOLEAN;
-			$creoleToPropelTypeMap[CreoleTypes::YEAR] = PropelTypes::INTEGER;
-		}
-
-		if (isset($creoleToPropelTypeMap[$creoleType])) {
-			return $creoleToPropelTypeMap[$creoleType];
-		}
-	}
-
-	/**
-	 * Creates an column node
-	 *
-	 * @param      object $column The Creole column
-	 * @return     object The column node instance
-	 */
-	protected function createColumnNode($column) {
-
-		$node = $this->doc->createElement("column");
-
-		$table = $column->getTable();
-		$colName = $column->getName();
-		$colType = $column->getType();
-		$colSize = $column->getSize();
-		$colScale = $column->getScale();
-
-		if ($colType === CreoleTypes::OTHER) {
-			$this->log("Column [" . $table->getName() . "." . $colName . "] has a column type (".$column->getNativeType().") that Propel does not support.", Project::MSG_WARN);
-		}
-
-		$node->setAttribute("name", $colName);
-
-		if ($this->isSamePhpName()) {
-			$node->setAttribute("phpName", $colName);
-		}
-
-		$node->setAttribute("type", self::getMappedPropelType($colType));
-
-		if ($colSize > 0 && (
-		$colType == CreoleTypes::CHAR
-		|| $colType == CreoleTypes::VARCHAR
-		|| $colType == CreoleTypes::LONGVARCHAR
-		|| $colType == CreoleTypes::DECIMAL
-		|| $colType == CreoleTypes::FLOAT
-		|| $colType == CreoleTypes::NUMERIC)) {
-			$node->setAttribute("size", (string) $colSize);
-		}
-
-		if ($colScale > 0 && (
-		$colType == CreoleTypes::DECIMAL
-		|| $colType == CreoleTypes::FLOAT
-		|| $colType == CreoleTypes::NUMERIC)) {
-			$node->setAttribute("scale", (string) $colScale);
-		}
-
-		if (!$column->isNullable()) {
-			$node->setAttribute("required", "true");
-		}
-
-		if ($column->isAutoIncrement()) {
-			$node->setAttribute("autoIncrement", "true");
-		}
-
-		if (in_array($colName, $this->getTablePkCols($table))) {
-			$node->setAttribute("primaryKey", "true");
-		}
-
-		if (($defValue = $column->getDefaultValue()) !== null) {
-			$node->setAttribute("default", iconv($this->dbEncoding, 'utf-8', $defValue));
-		}
-
-		if ($vendorNode = $this->createVendorInfoNode($column->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Returns the primary key columns for a table
-	 *
-	 * @param      object $table The table
-	 * @return     array The primary keys
-	 */
-	protected function getTablePkCols($table) {
-
-		static $columns = array();
-
-		$tableName = $table->getName();
-		if (!isset($columns[$tableName])) {
-			$columns[$tableName] = array();
-			$primaryKey = $table->getPrimaryKey();
-			if ($primaryKey) {
-				foreach ($primaryKey->getColumns() as $colObject) {
-					$columns[$tableName][] = $colObject->getName();
-				}
-			}
-		}
-		return $columns[$tableName];
-	}
-
-	/**
-	 * Creates an foreign key node
-	 *
-	 * @param      object $foreignKey The foreign key
-	 * @return     object The foreign key node instance
-	 */
-	protected function createForeignKeyNode($foreignKey) {
-
-		$node = $this->doc->createElement("foreign-key");
-		if ($vendorNode = $this->createVendorInfoNode($foreignKey->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		$refs = $foreignKey->getReferences();
-		// all references must be to same table, so we can grab table from the first, foreign column
-		$node->setAttribute("foreignTable", $refs[0][1]->getTable()->getName());
-		$node->setAttribute("onDelete", $refs[0][2]);
-		$node->setAttribute("onUpdate", $refs[0][3]);
-		for ($m = 0, $size = count($refs); $m < $size; $m++) {
-			$refNode = $this->doc->createElement("reference");
-			$refData = $refs[$m];
-			$refNode->setAttribute("local", $refData[0]->getName());
-			$refNode->setAttribute("foreign", $refData[1]->getName());
-			$node->appendChild($refNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Creates an index node
-	 *
-	 * @param      object $index The index
-	 * @return     object The index node instance
-	 */
-	protected function createIndexNode($index) {
-
-		$indexType = $index->isUnique() ?  'unique' : 'index';
-
-		$node = $this->doc->createElement($indexType);
-		$node->setAttribute("name", $index->getName());
-
-		$columns = $index->getColumns();
-		foreach ($columns as $column) {
-			$tableName = $column->getTable()->getName();
-			$colName = $column->getName();
-			$columnNode = $this->doc->createElement("{$indexType}-column");
-			$columnNode->setAttribute("name", $colName);
-			$node->appendChild($columnNode);
-			if ($indexType == 'unique' && $this->isValidatorRequired('unique')) {
-				$this->validatorInfos[$tableName][$colName][] = array('type' => 'unique');
-			}
-		}
-
-		if ($vendorNode = $this->createVendorInfoNode($index->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Checks whether to add validators of specified type or not
-	 *
-	 * @param      int $type The validator type constant.
-	 * @return     boolean
-	 */
-	protected function isValidatorRequired($type) {
-		return (($this->validatorBits & $type) === $type);
-	}
-
-	/**
-	 * Registers column type specific validators if necessary
-	 *
-	 * We'll first collect the validators/rule infos and add them later on to
-	 * have them appended to the table tag as a block.
-	 *
-	 * CreoleTypes are:
-	 *
-	 * 		BOOLEAN
-	 * 		BIGINT, SMALLINT, TINYINT, INTEGER
-	 * 		FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL
-	 * 		BIGINT, SMALLINT, TINYINT, INTEGER
-	 * 		TEXT
-	 * 		BLOB, CLOB, BINARY, VARBINARY, LONGVARBINARY
-	 * 		DATE, YEAR, TIME
-	 * 		TIMESTAMP
-	 *
-	 * We will add the following type specific validators:
-	 *
-	 *      for notNull columns: required validator
-	 *      for unique indexes: unique validator
-	 * 		for varchar types: maxLength validators (CHAR, VARCHAR, LONGVARCHAR)
-	 * 		for numeric types: maxValue validators (BIGINT, SMALLINT, TINYINT, INTEGER, FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 * 		for integer and timestamp types: notMatch validator with [^\d]+ (BIGINT, SMALLINT, TINYINT, INTEGER, TIMESTAMP)
-	 * 		for float types: notMatch validator with [^\d\.]+ (FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 *
-	 * @param      object $column The Creole column
-	 * @return     void
-	 * @todo       find out how to evaluate the appropriate size and adjust maxValue rule values appropriate
-	 * @todo       find out if float type column values must always notMatch('[^\d\.]+'), i.e. digits and point for any db vendor, language etc.
-	 */
-	protected function registerValidatorsForColumn($column) {
-
-		$table = $column->getTable();
-		$tableName = $table->getName();
-
-		$colName = $column->getName();
-		$colType = $column->getType();
-		$colSize = $column->getSize();
-
-		if ($this->isValidatorRequired(self::VALIDATORS_REQUIRED)) {
-			$ruleInfo = array('type' => 'required');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		$isPrimarykeyCol = in_array($colName, $this->getTablePkCols($table));
-		if ($this->isValidatorRequired(self::VALIDATORS_UNIQUE) && $isPrimarykeyCol) {
-			$ruleInfo = array('type' => 'unique');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_MAXLENGTH) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::CHAR,
-		CreoleTypes::VARCHAR,
-		CreoleTypes::LONGVARCHAR))) {
-			$ruleInfo = array('type' => 'maxLength', 'value' => $colSize);
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_MAXVALUE) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::SMALLINT,
-		CreoleTypes::TINYINT,
-		CreoleTypes::INTEGER,
-		CreoleTypes::BIGINT,
-		CreoleTypes::FLOAT,
-		CreoleTypes::DOUBLE,
-		CreoleTypes::NUMERIC,
-		CreoleTypes::DECIMAL,
-		CreoleTypes::REAL))) {
-
-			// TODO: how to evaluate the appropriate size??
-			$this->log("WARNING: maxValue validator added for column $colName. You will have to adjust the size value manually.", Project::MSG_WARN);
-			$ruleInfo = array('type' => 'maxValue', 'value' => $colSize);
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_TYPE) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::SMALLINT,
-		CreoleTypes::TINYINT,
-		CreoleTypes::INTEGER,
-		CreoleTypes::TIMESTAMP))) {
-			$ruleInfo = array('type' => 'type', 'value' => '[^\d]+');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_TYPE) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::FLOAT,
-		CreoleTypes::DOUBLE,
-		CreoleTypes::NUMERIC,
-		CreoleTypes::DECIMAL,
-		CreoleTypes::REAL))) {
-			// TODO: is this always true??
-			$ruleInfo = array('type' => 'type', 'value' => '[^\d\.]+');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-	}
-
-	/**
-	 * Creates a validator node
-	 *
-	 * @param      object  $column    The Creole column
-	 * @param      integer $type      The validator type
-	 * @return     object The validator node instance
-	 */
-	protected function createValidator($column, $type) {
-
-		$node = $this->doc->createElement('validator');
-		$node->setAttribute('column', $column->getName());
-
-		return $node;
-	}
-
-	/**
-	 * Creates a rule node
-	 *
-	 * @param      object  $column The Creole column
-	 * @param      array   $rule   The rule info
-	 * @return     object The rule node instance
-	 */
-	protected function createRuleNode($column, $rule) {
-
-		extract($rule);
-
-		// create message
-		$colName = $column->getName();
-		$tableName = $column->getTable()->getName();
-		$msg = self::$validatorMessages[strtolower($type)];
-		$tmp = compact($msg['var']);
-		array_unshift($tmp, $msg['msg']);
-		$msg = call_user_func_array('sprintf', $tmp);
-
-		// add node
-		$node = $this->doc->createElement('rule');
-		$node->setAttribute('name', $type == 'type' ? 'notMatch' : $type);
-		$node->setAttribute('message', $msg);
-
-		return $node;
-	}
-
-	/**
-	 * Creates a vendor info node
-	 *
-	 * returns false if no vendor info can or has to be added
-	 *
-	 * @param      array   $vendorInfo The validator info
-	 * @return     object|boolean The vendor info instance or false
-	 */
-	protected function createVendorInfoNode($vendorInfo)
-	{
-		if (!$vendorInfo OR !$this->addVendorInfo) {
-			return false;
-		}
-
-		$vendorNode = $this->doc->createElement("vendor");
-		$vendorNode->setAttribute("type", $this->dsn["phptype"]);
-
-		foreach ($vendorInfo as $key => $value) {
-			$parameterNode = $this->doc->createElement("parameter");
-			$value = iconv($this->dbEncoding, "utf-8", $value);
-			$parameterNode->setAttribute("name", $key);
-			$parameterNode->setAttribute("value", $value);
-			$vendorNode->appendChild($parameterNode);
-		}
-
-		return $vendorNode;
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataDTDTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataDTDTask.php
deleted file mode 100644
index e63a728..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataDTDTask.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataDTDTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/PropelDataModelTemplateTask.php';
-include_once 'propel/engine/builder/om/ClassTools.php';
-
-/**
- * This Task creates the OM classes based on the XML schema file.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.phing
- */
-class PropelDataDTDTask extends PropelDataModelTemplateTask {
-
-
-	public function main() {
-
-		// check to make sure task received all correct params
-		$this->validate();
-
-		if (!$this->mapperElement) {
-			throw new BuildException("You must use a <mapper/> element to describe how names should be transformed.");
-		}
-
-		$basepath = $this->getOutputDirectory();
-
-		// Get new Capsule context
-		$generator = $this->createContext();
-		$generator->put("basepath", $basepath); // make available to other templates
-
-		// we need some values that were loaded into the template context
-		$basePrefix = $generator->get('basePrefix');
-		$project = $generator->get('project');
-
-		foreach ($this->getDataModels() as $dataModel) {
-
-			$this->log("Processing Datamodel : " . $dataModel->getName());
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$outFile = $this->getMappedFile($dataModel->getName());
-
-				$generator->put("tables", $database->getTables());
-				$generator->parse("data/dtd/dataset.tpl", $outFile->getAbsolutePath());
-
-				$this->log("Generating DTD for database: " . $database->getName());
-				$this->log("Creating DTD file: " . $outFile->getPath());
-
-				foreach ($database->getTables() as $tbl) {
-					$this->log("\t + " . $tbl->getName());
-					$generator->put("table", $tbl);
-					$generator->parse("data/dtd/table.tpl", $outFile->getAbsolutePath(), true);
-				}
-
-			} // foreach database
-
-		} // foreach dataModel
-
-
-	} // main()
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataDumpTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataDumpTask.php
deleted file mode 100644
index 4c94d26..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataDumpTask.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataDumpTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Dumps the contenst of selected databases to XML data dump file.
- *
- * The generated XML files can have corresponding DTD files generated using the
- * PropelDataDTDTask.  The results of the data dump can be converted to SQL using
- * the PropelDataSQLTask class.
- *
- * The database may be specified (via 'databaseName' attribute) if you only want to dump
- * the contents of one database.  Otherwise it is assumed that all databases described
- * by datamodel schema file(s) will be dumped.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Fedor Karpelevitch <fedor.karpelevitch at home.com> (Torque)
- * @author     Jason van Zyl <jvanzyl at zenplex.com> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelDataDumpTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * Database name.
-	 * The database name may be optionally specified in the XML if you only want
-	 * to dump the contents of one database.
-	 */
-	private $databaseName;
-
-	/**
-	 * Database URL used for Creole connection.
-	 * This is a PEAR-compatible (loosely) DSN URL.
-	 */
-	private $databaseUrl;
-
-	/**
-	 * Database driver used for Creole connection.
-	 * This should normally be left blank so that default (Creole built-in) driver for database type is used.
-	 */
-	private $databaseDriver;
-
-	/**
-	 * Database user used for Creole connection.
-	 * @deprecated Put username in databaseUrl.
-	 */
-	private $databaseUser;
-
-	/**
-	 * Database password used for Creole connection.
-	 * @deprecated Put password in databaseUrl.
-	 */
-	private $databasePassword;
-
-	/**
-	 * Properties file that maps a data XML file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $datadbmap;
-
-	/**
-	 * The database connection used to retrieve the data to dump.
-	 * Needs to be public so that the TableInfo class can access it.
-	 */
-	public $conn;
-
-	/**
-	 * The statement used to acquire the data to dump.
-	 */
-	private $stmt;
-
-	/**
-	 * Set the file that maps between data XML files and databases.
-	 *
-	 * @param      PhingFile $sqldbmap the db map
-	 * @return     void
-	 */
-	public function setDataDbMap(PhingFile $datadbmap)
-	{
-		$this->datadbmap = $datadbmap;
-	}
-
-	/**
-	 * Get the file that maps between data XML files and databases.
-	 *
-	 * @return     PhingFile $datadbmap.
-	 */
-	public function getDataDbMap()
-	{
-		return $this->datadbmap;
-	}
-
-	/**
-	 * Get the database name to dump
-	 *
-	 * @return     The DatabaseName value
-	 */
-	public function getDatabaseName()
-	{
-		return $this->databaseName;
-	}
-
-	/**
-	 * Set the database name
-	 *
-	 * @param      v The new DatabaseName value
-	 */
-	public function setDatabaseName($v)
-	{
-		$this->databaseName = $v;
-	}
-
-	/**
-	 * Get the database url
-	 *
-	 * @return     The DatabaseUrl value
-	 */
-	public function getDatabaseUrl()
-	{
-		return $this->databaseUrl;
-	}
-
-	/**
-	 * Set the database url
-	 *
-	 * @param      string $v The PEAR-compatible database DSN URL.
-	 */
-	public function setDatabaseUrl($v)
-	{
-		$this->databaseUrl = $v;
-	}
-
-	/**
-	 * Get the database user
-	 *
-	 * @return     string database user
-	 * @deprecated
-	 */
-	public function getDatabaseUser()
-	{
-		return $this->databaseUser;
-	}
-
-	/**
-	 * Set the database user
-	 *
-	 * @param      string $v The new DatabaseUser value
-	 * @deprecated Specify user in DSN URL.
-	 */
-	public function setDatabaseUser($v)
-	{
-		$this->databaseUser = $v;
-	}
-
-	/**
-	 * Get the database password
-	 *
-	 * @return     string database password
-	 */
-	public function getDatabasePassword()
-	{
-		return $this->databasePassword;
-	}
-
-	/**
-	 * Set the database password
-	 *
-	 * @param      string $v The new DatabasePassword value
-	 * @deprecated Specify database password in DSN URL.
-	 */
-	public function setDatabasePassword($v)
-	{
-		$this->databasePassword = $v;
-	}
-
-	/**
-	 * Get the database driver name
-	 *
-	 * @return     string database driver name
-	 */
-	public function getDatabaseDriver()
-	{
-		return $this->databaseDriver;
-	}
-
-	/**
-	 * Set the database driver name
-	 *
-	 * @param      string $v The new DatabaseDriver value
-	 */
-	public function setDatabaseDriver($v)
-	{
-		$this->databaseDriver = $v;
-	}
-
-	/**
-	 * Create the data XML -> database map.
-	 *
-	 * This is necessary because there is currently no other method of knowing which
-	 * data XML files correspond to which database.  This map allows us to convert multiple
-	 * data XML files into SQL.
-	 *
-	 * @throws     IOException - if unable to store properties
-	 */
-	private function createDataDbMap()
-	{
-		if ($this->getDataDbMap() === null) {
-			return;
-		}
-
-		// Produce the sql -> database map
-		$datadbmap = new Properties();
-
-		// Check to see if the sqldbmap has already been created.
-		if ($this->getDataDbMap()->exists()) {
-			$datadbmap->load($this->getDataDbMap());
-		}
-
-		foreach ($this->getDataModels() as $dataModel) {            // there is really one 1 db per datamodel
-			foreach ($dataModel->getDatabases() as $database) {
-
-				// if database name is specified, then we only want to dump that one db.
-				if (empty($this->databaseName) || ($this->databaseName && $database->getName() == $this->databaseName)) {
-					$outFile = $this->getMappedFile($dataModel->getName());
-					$datadbmap->setProperty($outFile->getName(), $database->getName());
-				}
-			}
-		}
-
-		try {
-			$datadbmap->store($this->getDataDbMap(), "Data XML file -> Database map");
-		} catch (IOException $e) {
-			throw new IOException("Unable to store properties: ". $e->getMessage());
-		}
-	}
-
-	/**
-	 * Iterates through each datamodel/database, dumps the contents of all tables and creates a DOM XML doc.
-	 *
-	 * @return     void
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		$this->validate();
-
-		$buf = "Database settings:\n"
-			. " driver: " . ($this->databaseDriver ? $this->databaseDriver : "(default)" ). "\n"
-			. " URL: " . $this->databaseUrl . "\n"
-			. ($this->databaseUser ? " user: " . $this->databaseUser . "\n" : "")
-			. ($this->databasePassword ? " password: " . $this->databasePassword . "\n" : "");
-
-		$this->log($buf, Project::MSG_VERBOSE);
-
-		// 1) First create the Data XML -> database name map.
-		$this->createDataDbMap();
-
-		// 2) Now go create the XML files from teh database(s)
-		foreach ($this->getDataModels() as $dataModel) {            // there is really one 1 db per datamodel
-			foreach ($dataModel->getDatabases() as $database) {
-
-				// if database name is specified, then we only want to dump that one db.
-				if (empty($this->databaseName) || ($this->databaseName && $database->getName() == $this->databaseName)) {
-
-					$outFile = $this->getMappedFile($dataModel->getName());
-
-					$this->log("Dumping data to XML for database: " . $database->getName());
-					$this->log("Writing to XML file: " . $outFile->getName());
-
-					try {
-
-						$url = str_replace("@DB@", $database->getName(), $this->databaseUrl);
-
-						if ($url !== $this->databaseUrl) {
-							$this->log("New (resolved) URL: " . $url, Project::MSG_VERBOSE);
-						}
-
-						if (empty($url)) {
-							throw new BuildException("Unable to connect to database; no PDO connection URL specified.", $this->getLocation());
-						}
-
-						$this->conn = new PDO($url, $this->databaseUser, $this->databasePassword);
-						$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-						$doc = $this->createXMLDoc($database);
-						$doc->save($outFile->getAbsolutePath());
-
-					} catch (SQLException $se) {
-						$this->log("SQLException while connecting to DB: ". $se->getMessage(), Project::MSG_ERR);
-						throw new BuildException($se);
-					}
-				} // if databaseName && database->getName == databaseName
-			} // foreach database
-		} // foreach datamodel
-	}
-
-	/**
-	 * Gets PDOStatement of query to fetch all data from a table.
-	 * @param      string $tableName
-	 * @param      Platform $platform
-	 * @return     PDOStatement
-	 */
-	private function getTableDataStmt($tableName, Platform $platform)
-	{
-		return $this->conn->query("SELECT * FROM " . $platform->quoteIdentifier( $tableName ) );
-	}
-
-	/**
-	 * Creates a DOM document containing data for specified database.
-	 * @param      Database $database
-	 * @return     DOMDocument
-	 */
-	private function createXMLDoc(Database $database)
-	{
-		$doc = new DOMDocument('1.0', 'utf-8');
-		$doc->formatOutput = true; // pretty printing
-		$doc->appendChild($doc->createComment("Created by data/dump/Control.tpl template."));
-
-		$dsNode = $doc->createElement("dataset");
-		$dsNode->setAttribute("name", "all");
-		$doc->appendChild($dsNode);
-
-		$platform = $this->getGeneratorConfig()->getConfiguredPlatform($this->conn);
-
-		$this->log("Building DOM tree containing data from tables:");
-
-		foreach ($database->getTables() as $tbl) {
-			$this->log("\t+ " . $tbl->getName());
-			$stmt = $this->getTableDataStmt($tbl->getName(), $platform);
-			while ($row = $stmt->fetch()) {
-				$rowNode = $doc->createElement($tbl->getPhpName());
-				foreach ($tbl->getColumns() as $col) {
-					$cval = $row[$col->getName()];
-					if ($cval !== null) {
-						$rowNode->setAttribute($col->getPhpName(), iconv($this->dbEncoding, 'utf-8', $cval));
-					}
-				}
-				$dsNode->appendChild($rowNode);
-				unset($rowNode);
-			}
-			unset($stmt);
-		}
-
-		return $doc;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataModelTemplateTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataModelTemplateTask.php
deleted file mode 100644
index 8c6a7fd..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataModelTemplateTask.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataModelTemplateTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/AbstractPropelDataModelTask.php';
-include_once 'propel/engine/database/model/AppData.php';
-include_once 'propel/engine/database/model/Database.php';
-include_once 'propel/engine/database/transform/XmlToAppData.php';
-
-/**
- * A generic class that simply loads the data model and parses a control template.
- *
- * This class exists largely for compatibility with early Propel where this was
- * a CapsuleTask subclass.  This class also makes it easy to quickly add some custom
- * datamodel-based transformations (by allowing you to put the logic in the templates).
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.phing
- * @version    $Revision: 1262 $
- */
-class PropelDataModelTemplateTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * This is the file where the generated text
-	 * will be placed.
-	 * @var        string
-	 */
-	protected $outputFile;
-
-	/**
-	 * Path where Capsule looks for templates.
-	 * @var        PhingFile
-	 */
-	protected $templatePath;
-
-	/**
-	 * This is the control template that governs the output.
-	 * It may or may not invoke the services of worker
-	 * templates.
-	 * @var        string
-	 */
-	protected $controlTemplate;
-
-	/**
-	 * [REQUIRED] Set the output file for the
-	 * generation process.
-	 * @param      string $outputFile (TODO: change this to File)
-	 * @return     void
-	 */
-	public function setOutputFile($outputFile) {
-		$this->outputFile = $outputFile;
-	}
-
-	/**
-	 * Get the output file for the
-	 * generation process.
-	 * @return     string
-	 */
-	public function getOutputFile() {
-		return $this->outputFile;
-	}
-
-	/**
-	 * [REQUIRED] Set the control template for the
-	 * generating process.
-	 * @param      string $controlTemplate
-	 * @return     void
-	 */
-	public function setControlTemplate ($controlTemplate) {
-		$this->controlTemplate = $controlTemplate;
-	}
-
-	/**
-	 * Get the control template for the
-	 * generating process.
-	 * @return     string
-	 */
-	public function getControlTemplate() {
-		return $this->controlTemplate;
-	}
-
-	/**
-	 * [REQUIRED] Set the path where Capsule will look
-	 * for templates using the file template
-	 * loader.
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function setTemplatePath($templatePath) {
-		$resolvedPath = "";
-		$tok = strtok($templatePath, ",");
-		while ( $tok ) {
-			// resolve relative path from basedir and leave
-			// absolute path untouched.
-			$fullPath = $this->project->resolveFile($tok);
-			$cpath = $fullPath->getCanonicalPath();
-			if ($cpath === false) {
-				$this->log("Template directory does not exist: " . $fullPath->getAbsolutePath());
-			} else {
-				$resolvedPath .= $cpath;
-			}
-			$tok = strtok(",");
-			if ( $tok ) {
-				$resolvedPath .= ",";
-			}
-		}
-		$this->templatePath = $resolvedPath;
-	 }
-
-	/**
-	 * Get the path where Velocity will look
-	 * for templates using the file template
-	 * loader.
-	 * @return     string
-	 */
-	public function getTemplatePath() {
-		return $this->templatePath;
-	}
-
-	/**
-	 * Creates a new Capsule context with some basic properties set.
-	 * (Capsule is a simple PHP encapsulation system -- aka a php "template" class.)
-	 * @return     Capsule
-	 */
-	protected function createContext() {
-
-		$context = new Capsule();
-
-		// Make sure the output directory exists, if it doesn't
-		// then create it.
-		$outputDir = new PhingFile($this->outputDirectory);
-		if (!$outputDir->exists()) {
-			$this->log("Output directory does not exist, creating: " . $outputDir->getAbsolutePath());
-			$outputDir->mkdirs();
-		}
-
-		// Place our set of data models into the context along
-		// with the names of the databases as a convenience for now.
-		$context->put("targetDatabase", $this->getTargetDatabase());
-		$context->put("targetPackage", $this->getTargetPackage());
-		$context->put("now", strftime("%c"));
-
-		$this->log("Target database type: " . $this->getTargetDatabase());
-		$this->log("Target package: " . $this->getTargetPackage());
-		$this->log("Using template path: " . $this->templatePath);
-		$this->log("Output directory: " . $this->getOutputDirectory());
-
-		$context->setTemplatePath($this->templatePath);
-		$context->setOutputDirectory($this->outputDirectory);
-
-		$this->populateContextProperties($context);
-
-		return $context;
-	}
-
-	/**
-	 * Adds the propel build properties to the passed Capsule context.
-	 *
-	 * @param      Capsule $context
-	 * @see        GeneratorConfig::getBuildProperties()
-	 */
-	public function populateContextProperties(Capsule $context)
-	{
-		foreach ($this->getGeneratorConfig()->getBuildProperties() as $key => $propValue) {
-			$this->log('Adding property ${' . $key . '} to context', Project::MSG_DEBUG);
-			$context->put($key, $propValue);
-		}
-	}
-
-	/**
-	 * Performs validation for single-file mode.
-	 * @throws     BuildException - if there are any validation errors
-	 */
-	protected function singleFileValidate()
-	{
-		parent::validate();
-
-		// Make sure the control template is set.
-		if ($this->controlTemplate === null) {
-			throw new BuildException("The control template needs to be defined!");
-		}
-		// Make sure there is an output file.
-		if ($this->outputFile === null) {
-			throw new BuildException("The output file needs to be defined!");
-		}
-
-	}
-
-	/**
-	 * Creates Capsule context and parses control template.
-	 * @return     void
-	 */
-	public function main()
-	{
-		$this->singleFileValidate();
-		$context = $this->createContext();
-
-		$context->put("dataModels", $this->getDataModels());
-
-		$path = $this->outputDirectory . DIRECTORY_SEPARATOR . $this->outputFile;
-		$this->log("Generating to file " . $path);
-
-		try {
-			$this->log("Parsing control template: " . $this->controlTemplate);
-			$context->parse($this->controlTemplate, $path);
-		} catch (Exception $ioe) {
-			throw new BuildException("Cannot write parsed template: ". $ioe->getMessage());
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataSQLTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataSQLTask.php
deleted file mode 100644
index 5f397be..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelDataSQLTask.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataSQLTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/AppData.php';
-include_once 'propel/engine/database/model/Database.php';
-include_once 'propel/engine/database/transform/XmlToAppData.php';
-include_once 'propel/engine/builder/util/transform/XmlToDataSQL.php';
-
-/**
- * Task that transforms XML datadump files into files containing SQL INSERT statements.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jason van Zyl  <jvanzyl at periapt.com> (Torque)
- * @author     John McNally  <jmcnally at collab.net> (Torque)
- * @author     Fedor Karpelevitch  <fedor.karpelevitch at home.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelDataSQLTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * Properties file that maps an SQL file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $sqldbmap;
-
-	/**
-	 * Properties file that maps a data XML file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $datadbmap;
-
-	/**
-	 * The base directory in which to find data XML files.
-	 * @var        PhingFile
-	 */
-	private $srcDir;
-
-	/**
-	 * Set the file that maps between SQL files and databases.
-	 *
-	 * @param      PhingFile $sqldbmap the sql -> db map.
-	 * @return     void
-	 */
-	public function setSqlDbMap(PhingFile $sqldbmap)
-	{
-		$this->sqldbmap = $sqldbmap;
-	}
-
-	/**
-	 * Get the file that maps between SQL files and databases.
-	 *
-	 * @return     PhingFile sqldbmap.
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the file that maps between data XML files and databases.
-	 *
-	 * @param      PhingFile $sqldbmap the db map
-	 * @return     void
-	 */
-	public function setDataDbMap(PhingFile $datadbmap)
-	{
-		$this->datadbmap = $datadbmap;
-	}
-
-	/**
-	 * Get the file that maps between data XML files and databases.
-	 *
-	 * @return     PhingFile $datadbmap.
-	 */
-	public function getDataDbMap()
-	{
-		return $this->datadbmap;
-	}
-
-	/**
-	 * Set the src directory for the data xml files listed in the datadbmap file.
-	 * @param      PhingFile $srcDir data xml source directory
-	 */
-	public function setSrcDir(PhingFile $srcDir)
-	{
-		$this->srcDir = $srcDir;
-	}
-
-	/**
-	 * Get the src directory for the data xml files listed in the datadbmap file.
-	 *
-	 * @return     PhingFile data xml source directory
-	 */
-	public function getSrcDir()
-	{
-		return $this->srcDir;
-	}
-
-	/**
-	 * Search through all data models looking for matching database.
-	 * @return     Database or NULL if none found.
-	 */
-	private function getDatabase($name)
-	{
-		foreach ($this->getDataModels() as $dm) {
-			foreach ($dm->getDatabases() as $db) {
-				if ($db->getName() == $name) {
-					return $db;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Main method parses the XML files and creates SQL files.
-	 *
-	 * @return     void
-	 * @throws     Exception If there is an error parsing the data xml.
-	 */
-	public function main()
-	{
-		$this->validate();
-
-		$targetDatabase = $this->getTargetDatabase();
-
-		$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-		// Load the Data XML -> DB Name properties
-		$map = new Properties();
-		try {
-			$map->load($this->getDataDbMap());
-		} catch (IOException $ioe) {
-			throw new BuildException("Cannot open and process the datadbmap!", $ioe);
-		}
-
-		// Parse each file in the data -> db map
-		foreach ($map->keys() as $dataXMLFilename) {
-
-			$dataXMLFile = new PhingFile($this->srcDir, $dataXMLFilename);
-
-			// if file exists then proceed
-			if ($dataXMLFile->exists()) {
-
-				$dbname = $map->get($dataXMLFilename);
-
-				$db = $this->getDatabase($dbname);
-
-				if (!$db) {
-					throw new BuildException("Cannot find instantiated Database for name '$dbname' from datadbmap file.");
-				}
-
-				$db->setPlatform($platform);
-
-				$outFile = $this->getMappedFile($dataXMLFilename);
-				$sqlWriter = new FileWriter($outFile);
-
-				$this->log("Creating SQL from XML data dump file: " . $dataXMLFile->getAbsolutePath());
-
-				try {
-					$dataXmlParser = new XmlToDataSQL($db, $this->getGeneratorConfig(), $this->dbEncoding);
-					$dataXmlParser->transform($dataXMLFile, $sqlWriter);
-				} catch (Exception $e) {
-					throw new BuildException("Exception parsing data XML: " . $e->getMessage(), $x);
-				}
-
-				// Place the generated SQL file(s)
-				$p = new Properties();
-				if ($this->getSqlDbMap()->exists()) {
-					$p->load($this->getSqlDbMap());
-				}
-
-				$p->setProperty($outFile->getName(), $db->getName());
-				$p->store($this->getSqlDbMap(), "Sqlfile -> Database map");
-
-			} else {
-				$this->log("File '" . $dataXMLFile->getAbsolutePath()
-						. "' in datadbmap does not exist, so skipping it.", Project::MSG_WARN);
-			}
-
-		} // foreach data xml file
-
-	} // main()
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelGraphvizTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelGraphvizTask.php
deleted file mode 100644
index 32ceee4..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelGraphvizTask.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelGraphvizTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/AbstractPropelDataModelTask.php';
-include_once 'propel/engine/database/model/AppData.php';
-
-/**
- * A task to generate Graphviz dot files from Propel datamodel.
- *
- * @author     Mark Kimsal
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelGraphvizTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * The properties file that maps an SQL file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $sqldbmap;
-
-	/**
-	 * Name of the database.
-	 */
-	private $database;
-
-	/**
-	 * Name of the output directory.
-	 */
-	private $outDir;
-
-
-	/**
-	 * Set the sqldbmap.
-	 * @param      PhingFile $sqldbmap The db map.
-	 */
-	public function setOutputDirectory(PhingFile $out)
-	{
-		if (!$out->exists()) {
-			$out->mkdirs();
-		}
-		$this->outDir = $out;
-	}
-
-
-	/**
-	 * Set the sqldbmap.
-	 * @param      PhingFile $sqldbmap The db map.
-	 */
-	public function setSqlDbMap(PhingFile $sqldbmap)
-	{
-		$this->sqldbmap = $sqldbmap;
-	}
-
-	/**
-	 * Get the sqldbmap.
-	 * @return     PhingFile $sqldbmap.
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the database name.
-	 * @param      string $database
-	 */
-	public function setDatabase($database)
-	{
-		$this->database = $database;
-	}
-
-	/**
-	 * Get the database name.
-	 * @return     string
-	 */
-	public function getDatabase()
-	{
-		return $this->database;
-	}
-
-
-	public function main()
-	{
-
-		$count = 0;
-
-		$dotSyntax = '';
-
-		// file we are going to create
-
-		$dbMaps = $this->getDataModelDbMap();
-
-		foreach ($this->getDataModels() as $dataModel) {
-
-			$dotSyntax .= "digraph G {\n";
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$this->log("db: " . $database->getName());
-
-				//print the tables
-				foreach ($database->getTables() as $tbl) {
-
-					$this->log("\t+ " . $tbl->getName());
-
-					++$count;
-					$dotSyntax .= 'node'.$tbl->getName().' [label="{<table>'.$tbl->getName().'|<cols>';
-
-					foreach ($tbl->getColumns() as $col) {
-						$dotSyntax .= $col->getName() . ' (' . $col->getType()  . ')';
-						if (count($col->getForeignKeys()) > 0) {
-							$dotSyntax .= ' [FK]';
-						} elseif ($col->isPrimaryKey()) {
-							$dotSyntax .= ' [PK]';
-						}
-						$dotSyntax .= '\l';
-					}
-					$dotSyntax .= '}", shape=record];';
-					$dotSyntax .= "\n";
-				}
-
-				//print the relations
-
-				$count = 0;
-				$dotSyntax .= "\n";
-				foreach ($database->getTables() as $tbl) {
-					++$count;
-
-					foreach ($tbl->getColumns() as $col) {
-						$fk = $col->getForeignKeys();
-						if ( count($fk) == 0 or $fk === null ) continue;
-						if ( count($fk) > 1 ) throw( new Exception("not sure what to do here...") );
-						$fk = $fk[0];   // try first one
-						$dotSyntax .= 'node'.$tbl->getName() .':cols -> node'.$fk->getForeignTableName() . ':table [label="' . $col->getName() . '=' . implode(',', $fk->getForeignColumns()) . ' "];';
-						$dotSyntax .= "\n";
-					}
-				}
-
-
-
-			} // foreach database
-			$dotSyntax .= "}\n";
-
-			$this->writeDot($dotSyntax,$this->outDir,$database->getName());
-
-		$dotSyntax = '';
-
-		} //foreach datamodels
-
-	} // main()
-
-
-	/**
-	 * probably insecure
-	 */
-	function writeDot($dotSyntax, PhingFile $outputDir, $baseFilename) {
-		$file = new PhingFile($outputDir, $baseFilename . '.schema.dot');
-		$this->log("Writing dot file to " . $file->getAbsolutePath());
-		file_put_contents($file->getAbsolutePath(), $dotSyntax);
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelOMTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelOMTask.php
deleted file mode 100644
index f3ff240..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelOMTask.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelOMTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/AbstractPropelDataModelTask.php';
-include_once 'propel/engine/builder/om/ClassTools.php';
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * This Task creates the OM classes based on the XML schema file.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.phing
- */
-class PropelOMTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * The platform (php4, php5, etc.) for which the om is being built.
-	 * @var        string
-	 */
-	private $targetPlatform;
-
-	/**
-	 * Sets the platform (php4, php5, etc.) for which the om is being built.
-	 * @param      string $v
-	 */
-	public function setTargetPlatform($v) {
-		$this->targetPlatform = $v;
-	}
-
-	/**
-	 * Gets the platform (php4, php5, etc.) for which the om is being built.
-	 * @return     string
-	 */
-	public function getTargetPlatform() {
-		return $this->targetPlatform;
-	}
-
-	/**
-	 * Utility method to create directory for package if it doesn't already exist.
-	 * @param      string $path The [relative] package path.
-	 * @throws     BuildException - if there is an error creating directories
-	 */
-	protected function ensureDirExists($path)
-	{
-		$f = new PhingFile($this->getOutputDirectory(), $path);
-		if (!$f->exists()) {
-			if (!$f->mkdirs()) {
-				throw new BuildException("Error creating directories: ". $f->getPath());
-			}
-		}
-	}
-
-	/**
-	 * Uses a builder class to create the output class.
-	 * This method assumes that the DataModelBuilder class has been initialized with the build properties.
-	 * @param      OMBuilder $builder
-	 * @param      boolean $overwrite Whether to overwrite existing files with te new ones (default is YES).
-	 * @todo       -cPropelOMTask Consider refactoring build() method into AbstractPropelDataModelTask (would need to be more generic).
-	 */
-	protected function build(OMBuilder $builder, $overwrite = true)
-	{
-
-		$path = $builder->getClassFilePath();
-		$this->ensureDirExists(dirname($path));
-
-		$_f = new PhingFile($this->getOutputDirectory(), $path);
-		if ($overwrite || !$_f->exists()) {
-			$this->log("\t\t-> " . $builder->getClassname() . " [builder: " . get_class($builder) . "]");
-			$script = $builder->build();
-			file_put_contents($_f->getAbsolutePath(), $script);
-			foreach ($builder->getWarnings() as $warning) {
-				$this->log($warning, Project::MSG_WARN);
-			}
-		} else {
-			$this->log("\t\t-> (exists) " . $builder->getClassname());
-		}
-
-	}
-
-	/**
-	 * Main method builds all the targets for a typical propel project.
-	 */
-	public function main()
-	{
-		// check to make sure task received all correct params
-		$this->validate();
-
-		$generatorConfig = $this->getGeneratorConfig();
-
-		foreach ($this->getDataModels() as $dataModel) {
-			$this->log("Processing Datamodel : " . $dataModel->getName());
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$this->log("  - processing database : " . $database->getName());
-
-				foreach ($database->getTables() as $table) {
-
-					if (!$table->isForReferenceOnly()) {
-
-						$this->log("\t+ " . $table->getName());
-
-						// -----------------------------------------------------------------------------------------
-						// Create Peer, Object, and TableMap classes
-						// -----------------------------------------------------------------------------------------
-
-						// these files are always created / overwrite any existing files
-						foreach (array('peer', 'object', 'tablemap') as $target) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-							$this->build($builder);
-						}
-
-						// -----------------------------------------------------------------------------------------
-						// Create [empty] stub Peer and Object classes if they don't exist
-						// -----------------------------------------------------------------------------------------
-
-						// these classes are only generated if they don't already exist
-						foreach (array('peerstub', 'objectstub') as $target) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-							$this->build($builder, $overwrite=false);
-						}
-
-						// -----------------------------------------------------------------------------------------
-						// Create [empty] stub child Object classes if they don't exist
-						// -----------------------------------------------------------------------------------------
-
-						// If table has enumerated children (uses inheritance) then create the empty child stub classes if they don't already exist.
-						if ($table->getChildrenColumn()) {
-							$col = $table->getChildrenColumn();
-							if ($col->isEnumeratedClasses()) {
-								foreach ($col->getChildren() as $child) {
-									$builder = $generatorConfig->getConfiguredBuilder($table, 'objectmultiextend');
-									$builder->setChild($child);
-									$this->build($builder, $overwrite=false);
-								} // foreach
-							} // if col->is enumerated
-						} // if tbl->getChildrenCol
-
-
-						// -----------------------------------------------------------------------------------------
-						// Create [empty] Interface if it doesn't exist
-						// -----------------------------------------------------------------------------------------
-
-						// Create [empty] interface if it does not already exist
-						if ($table->getInterface()) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, 'interface');
-							$this->build($builder, $overwrite=false);
-						}
-
-						// -----------------------------------------------------------------------------------------
-						// Create tree Node classes
-						// -----------------------------------------------------------------------------------------
-
-						if ($table->treeMode()) {
-							switch($table->treeMode()) {
-								case 'NestedSet':
-									foreach (array('nestedsetpeer', 'nestedset') as $target) {
-										$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-										$this->build($builder);
-									}
-								break;
-
-								case 'MaterializedPath':
-									foreach (array('nodepeer', 'node') as $target) {
-										$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-										$this->build($builder);
-									}
-
-									foreach (array('nodepeerstub', 'nodestub') as $target) {
-										$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-										$this->build($builder, $overwrite=false);
-									}
-								break;
-
-								case 'AdjacencyList':
-									// No implementation for this yet.
-								default:
-								break;
-							}
-
-						} // if Table->treeMode()
-
-
-					} // if !$table->isForReferenceOnly()
-
-				} // foreach table
-
-			} // foreach database
-
-		} // foreach dataModel
-
-	} // main()
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSQLExec.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSQLExec.php
deleted file mode 100644
index d7bc554..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSQLExec.php
+++ /dev/null
@@ -1,711 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelSQLExec.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Executes all SQL files referenced in the sqldbmap file against their mapped databases.
- *
- * This task uses an SQL -> Database map in the form of a properties
- * file to insert each SQL file listed into its designated database.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @author     Dominik del Bondio
- * @author     Jeff Martin <jeff at custommonkey.org> (Torque)
- * @author     Michael McCallum <gholam at xtra.co.nz> (Torque)
- * @author     Tim Stephenson <tim.stephenson at sybase.com> (Torque)
- * @author     Jason van Zyl <jvanzyl at apache.org> (Torque)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelSQLExec extends Task {
-
-	private $goodSql = 0;
-	private $totalSql = 0;
-
-	const DELIM_ROW = "row";
-	const DELIM_NORMAL = "normal";
-
-	/**
-	 * The delimiter type indicating whether the delimiter will
-	 * only be recognized on a line by itself
-	 */
-	private $delimiterType = "normal"; // can't use constant just defined
-
-	//private static $delimiterTypes = array(DELIM_NORMAL, DELIM_ROW);
-	//private static $errorActions = array("continue", "stop", "abort");
-
-	/** PDO Database connection */
-	private $conn = null;
-
-	/** Autocommit flag. Default value is false */
-	private $autocommit = false;
-
-	/** DB url. */
-	private $url = null;
-
-	/** User name. */
-	private $userId = null;
-
-	/** Password */
-	private $password = null;
-
-	/** SQL input command */
-	private $sqlCommand = "";
-
-	/** SQL transactions to perform */
-	private $transactions = array();
-
-	/** SQL Statement delimiter */
-	private $delimiter = ";";
-
-	/** Print SQL results. */
-	private $print = false;
-
-	/** Print header columns. */
-	private $showheaders = true;
-
-	/** Results Output file. */
-	private $output = null;
-
-	/** RDBMS Product needed for this SQL. */
-	private $rdbms = null;
-
-	/** RDBMS Version needed for this SQL. */
-	private $version = null;
-
-	/** Action to perform if an error is found */
-	private $onError = "abort";
-
-	/** Encoding to use when reading SQL statements from a file */
-	private $encoding = null;
-
-	/** Src directory for the files listed in the sqldbmap. */
-	private $srcDir;
-
-	/** Properties file that maps an individual SQL file to a database. */
-	private $sqldbmap;
-
-	/**
-	 * Set the sqldbmap properties file.
-	 *
-	 * @param      sqldbmap filename for the sqldbmap
-	 */
-	public function setSqlDbMap($sqldbmap)
-	{
-		$this->sqldbmap = $this->project->resolveFile($sqldbmap);
-	}
-
-	/**
-	 * Get the sqldbmap properties file.
-	 *
-	 * @return     filename for the sqldbmap
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the src directory for the sql files listed in the sqldbmap file.
-	 *
-	 * @param      PhingFile $srcDir sql source directory
-	 */
-	public function setSrcDir(PhingFile $srcDir)
-	{
-		$this->srcDir = $srcDir;
-	}
-
-	/**
-	 * Get the src directory for the sql files listed in the sqldbmap file.
-	 *
-	 * @return     PhingFile SQL Source directory
-	 */
-	public function getSrcDir()
-	{
-		return $this->srcDir;
-	}
-
-	/**
-	 * Set the sql command to execute
-	 *
-	 * @param      sql sql command to execute
-	 */
-	public function addText($sql)
-	{
-		$this->sqlCommand .= $sql;
-	}
-
-	/**
-	 * Set the DB connection url.
-	 *
-	 * @param      string $url connection url
-	 */
-	public function setUrl($url)
-	{
-		$this->url = $url;
-	}
-
-	/**
-	 * Set the user name for the DB connection.
-	 *
-	 * @param      string $userId database user
-	 * @deprecated Specify userid in the DSN URL.
-	 */
-	public function setUserid($userId)
-	{
-		$this->userId = $userId;
-	}
-
-	/**
-	 * Set the password for the DB connection.
-	 *
-	 * @param      string $password database password
-	 * @deprecated Specify password in the DSN URL.
-	 */
-	public function setPassword($password)
-	{
-		$this->password = $password;
-	}
-
-	/**
-	 * Set the autocommit flag for the DB connection.
-	 *
-	 * @param      boolean $autocommit the autocommit flag
-	 */
-	public function setAutoCommit($autocommit)
-	{
-		$this->autocommit = (boolean) $autocommit;
-	}
-
-	/**
-	 * Set the statement delimiter.
-	 *
-	 * <p>For example, set this to "go" and delimitertype to "ROW" for
-	 * Sybase ASE or MS SQL Server.</p>
-	 *
-	 * @param      string $delimiter
-	 */
-	public function setDelimiter($delimiter)
-	{
-		$this->delimiter = $delimiter;
-	}
-
-	/**
-	 * Set the Delimiter type for this sql task. The delimiter type takes two
-	 * values - normal and row. Normal means that any occurence of the delimiter
-	 * terminate the SQL command whereas with row, only a line containing just
-	 * the delimiter is recognized as the end of the command.
-	 *
-	 * @param      string $delimiterType
-	 */
-	public function setDelimiterType($delimiterType)
-	{
-		$this->delimiterType = $delimiterType;
-	}
-
-	/**
-	 * Set the print flag.
-	 *
-	 * @param      boolean $print
-	 */
-	public function setPrint($print)
-	{
-		$this->print = (boolean) $print;
-	}
-
-	/**
-	 * Set the showheaders flag.
-	 *
-	 * @param      boolean $showheaders
-	 */
-	public function setShowheaders($showheaders)
-	{
-		$this->showheaders = (boolean) $showheaders;
-	}
-
-	/**
-	 * Set the output file.
-	 *
-	 * @param      PhingFile $output
-	 */
-	public function setOutput(PhingFile $output)
-	{
-		$this->output = $output;
-	}
-
-	/**
-	 * Set the action to perform onerror
-	 *
-	 * @param      string $action
-	 */
-	public function setOnerror($action)
-	{
-		$this->onError = $action;
-	}
-
-	/**
-	 * Load the sql file and then execute it
-	 *
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		$this->sqlCommand = trim($this->sqlCommand);
-
-		if ($this->sqldbmap === null || $this->getSqlDbMap()->exists() === false) {
-			throw new BuildException("You haven't provided an sqldbmap, or "
-					. "the one you specified doesn't exist: " . $this->sqldbmap->getPath());
-		}
-
-		if ($this->url === null) {
-			throw new BuildException("DSN url attribute must be set!");
-		}
-
-		$map = new Properties();
-
-		try {
-			$map->load($this->getSqlDbMap());
-		} catch (IOException $ioe) {
-			throw new BuildException("Cannot open and process the sqldbmap!");
-		}
-
-		$databases = array();
-
-		foreach ($map->keys() as $sqlfile) {
-
-			$database = $map->getProperty($sqlfile);
-
-			// Q: already there?
-			if (!isset($databases[$database])) {
-			// A: No.
-				$databases[$database] = array();
-			}
-
-			// We want to make sure that the base schemas
-			// are inserted first.
-			if (strpos($sqlfile, "schema.sql") !== false) {
-				// add to the beginning of the array
-				array_unshift($databases[$database], $sqlfile);
-			} else {
-				array_push($databases[$database], $sqlfile);
-			}
-		}
-
-		foreach ($databases as $db => $files) {
-			$transactions = array();
-
-			foreach ($files as $fileName) {
-
-				$file = new PhingFile($this->srcDir, $fileName);
-
-				if ($file->exists()) {
-					$this->log("Executing statements in file: " . $file->__toString());
-					$transaction = new PropelSQLExecTransaction($this);
-					$transaction->setSrc($file);
-					$transactions[] = $transaction;
-				} else {
-					$this->log("File '" . $file->__toString()
-							. "' in sqldbmap does not exist, so skipping it.");
-				}
-			}
-			$this->insertDatabaseSqlFiles($this->url, $db, $transactions);
-		}
-	}
-
-	/**
-	 * Take the base url, the target database and insert a set of SQL
-	 * files into the target database.
-	 *
-	 * @param      string $url
-	 * @param      string $database
-	 * @param      array $transactions
-	 */
-	private function insertDatabaseSqlFiles($url, $database, $transactions)
-	{
-		$url = str_replace("@DB@", $database, $url);
-		$this->log("Our new url -> " . $url);
-
-		try {
-
-			$buf = "Database settings:" . PHP_EOL
-			. " URL: " . $url . PHP_EOL
-			. ($this->userId ? " user: " . $this->userId . PHP_EOL : "")
-			. ($this->password ? " password: " . $this->password . PHP_EOL : "");
-
-			$this->log($buf, Project::MSG_VERBOSE);
-
-			// Set user + password to null if they are empty strings
-			if (!$this->userId) { $this->userId = null; }
-
-			if (!$this->password) { $this->password = null; }
-
-			$this->conn = new PDO($url, $this->userId, $this->password);
-			$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-			// $this->conn->setAutoCommit($this->autocommit);
-			// $this->statement = $this->conn->createStatement();
-
-			$out = null;
-
-			try {
-				if ($this->output !== null) {
-					$this->log("Opening PrintStream to output file " . $this->output->__toString(), Project::MSG_VERBOSE);
-					$out = new FileWriter($this->output);
-				}
-
-				// Process all transactions
-				for ($i=0,$size=count($transactions); $i < $size; $i++) {
-					$transactions[$i]->runTransaction($out);
-					if (!$this->autocommit) {
-						$this->log("Commiting transaction", Project::MSG_VERBOSE);
-						$this->conn->commit();
-					}
-				}
-			} catch (Exception $e) {
-				if ($out) $out->close();
-			}
-
-		} catch (IOException $e) {
-
-			if (!$this->autocommit && $this->conn !== null && $this->onError == "abort") {
-				try {
-					$this->conn->rollBack();
-				} catch (PDOException $ex) {
-					// do nothing.
-					System::println("Rollback failed.");
-				}
-			}
-			if ($this->statement) $this->statement = null; // close
-			throw new BuildException($e);
-		} catch (PDOException $e) {
-			if (!$this->autocommit && $this->conn !== null && $this->onError == "abort") {
-				try {
-					$this->conn->rollBack();
-				} catch (PDOException $ex) {
-					// do nothing.
-					System::println("Rollback failed");
-				}
-			}
-			if ($this->statement) $this->statement = null; // close
-			throw new BuildException($e);
-		}
-
-		   $this->statement = null; // close
-
-		$this->log($this->goodSql . " of " . $this->totalSql
-				. " SQL statements executed successfully");
-	}
-
-	/**
-	 * Read the statements from the .sql file and execute them.
-	 * Lines starting with '//', '--' or 'REM ' are ignored.
-	 *
-	 * Developer note:  must be public in order to be called from
-	 * sudo-"inner" class PropelSQLExecTransaction.
-	 *
-	 * @param      Reader $reader
-	 * @param      $out Optional output stream.
-	 * @throws     PDOException
-	 * @throws     IOException
-	 */
-	public function runStatements(Reader $reader, $out = null)
-	{
-		$sql = "";
-		$line = "";
-		$sqlBacklog = "";
-		$hasQuery = false;
-
-		$in = new BufferedReader($reader);
-
-		$parser['pointer'] = 0;
-		$parser['isInString'] = false;
-		$parser['stringQuotes'] = "";
-		$parser['backslashCount'] = 0;
-		$parser['parsedString'] = "";
-
-		$sqlParts = array();
-
-		while (($line = $in->readLine()) !== null) {
-
-			$line = trim($line);
-			$line = ProjectConfigurator::replaceProperties($this->project, $line,
-			$this->project->getProperties());
-
-			if (StringHelper::startsWith("//", $line)
-				|| StringHelper::startsWith("--", $line)
-		 		|| StringHelper::startsWith("#", $line)) {
-				continue;
-			}
-
-			if (strlen($line) > 4 && strtoupper(substr($line,0, 4)) == "REM ") {
-				continue;
-			}
-
-			if ($sqlBacklog !== "") {
-				$sql = $sqlBacklog;
-				$sqlBacklog = "";
-			}
-
-			$sql .= " " . $line . PHP_EOL;
-
-			// SQL defines "--" as a comment to EOL
-			// and in Oracle it may contain a hint
-			// so we cannot just remove it, instead we must end it
-			if (strpos($line, "--") !== false) {
-				$sql .= PHP_EOL;
-			}
-
-			// DELIM_ROW doesn't need this (as far as i can tell)
-			if ($this->delimiterType == self::DELIM_NORMAL) {
-
-				// old regex, being replaced due to segfaults:
-				// See: http://propel.phpdb.org/trac/ticket/294
-				//$reg = "#((?:\"(?:\\\\.|[^\"])*\"?)+|'(?:\\\\.|[^'])*'?|" . preg_quote($this->delimiter) . ")#";
-				//$sqlParts = preg_split($reg, $sql, 0, PREG_SPLIT_DELIM_CAPTURE);
-
-				$i = $parser['pointer'];
-				$c = strlen($sql);
-				while ($i < $c) {
-
-					$char = $sql[$i];
-
-					switch($char) {
-						case "\\":
-							$parser['backslashCount']++;
-							$this->log("c$i: found ".$parser['backslashCount']." backslash(es)", Project::MSG_VERBOSE);
-							break;
-						case "'":
-						case "\"":
-							if ($parser['isInString'] && $parser['stringQuotes'] == $char) {
-								if (($parser['backslashCount'] & 1) == 0) {
-									#$this->log("$i: out of string", Project::MSG_VERBOSE);
-									$parser['isInString'] = false;
-								} else {
-									$this->log("c$i: rejected quoted delimiter", Project::MSG_VERBOSE);
-								}
-
-							} elseif (!$parser['isInString']) {
-								$parser['stringQuotes']	= $char;
-								$parser['isInString'] = true;
-								#$this->log("$i: into string with $parser['stringQuotes']", Project::MSG_VERBOSE);
-							}
-							break;
-					}
-
-					if ($char == $this->delimiter && !$parser['isInString']) {
-						$this->log("c$i: valid end of command found!", Project::MSG_VERBOSE);
-						$sqlParts[] = $parser['parsedString'];
-						$sqlParts[] = $this->delimiter;
-						break;
-					}
-					$parser['parsedString'] .= $char;
-					if ($char !== "\\") {
-						if ($parser['backslashCount']) $this->log("$i: backslash reset", Project::MSG_VERBOSE);
-						$parser['backslashCount'] = 0;
-					}
-					$i++;
-					$parser['pointer']++;
-				}
-
-				$sqlBacklog = "";
-				foreach ($sqlParts as $sqlPart) {
-					// we always want to append, even if it's a delim (which will be stripped off later)
-					$sqlBacklog .= $sqlPart;
-
-					// we found a single (not enclosed by ' or ") delimiter, so we can use all stuff before the delim as the actual query
-					if ($sqlPart === $this->delimiter) {
-						$sql = $sqlBacklog;
-						$sqlBacklog = "";
-						$hasQuery = true;
-					}
-				}
-			}
-
-			if ($hasQuery || ($this->delimiterType == self::DELIM_ROW && $line == $this->delimiter)) {
-				// this assumes there is always a delimter on the end of the SQL statement.
-				$sql = StringHelper::substring($sql, 0, strlen($sql) - 1 - strlen($this->delimiter));
-				$this->log("SQL: " . $sql, Project::MSG_VERBOSE);
-				$this->execSQL($sql, $out);
-				$sql = "";
-				$hasQuery = false;
-
-				$parser['pointer'] = 0;
-				$parser['isInString'] = false;
-				$parser['stringQuotes'] = "";
-				$parser['backslashCount'] = 0;
-				$parser['parsedString'] = "";
-				$sqlParts = array();
-			}
-		}
-
-		// Catch any statements not followed by ;
-		if ($sql !== "") {
-			$this->execSQL($sql, $out);
-		}
-	}
-
-	/**
-	 * Exec the sql statement.
-	 *
-	 * @param      sql
-	 * @param      out
-	 * @throws     PDOException
-	 */
-	protected function execSQL($sql, $out = null)
-	{
-		// Check and ignore empty statements
-		if (trim($sql) == "") {
-			return;
-		}
-
-		try {
-			$this->totalSql++;
-
-			if (!$this->autocommit) $this->conn->beginTransaction();
-
-			$stmt = $this->conn->prepare($sql);
-			$stmt->execute();
-			$this->log($stmt->rowCount() . " rows affected", Project::MSG_VERBOSE);
-
-			if (!$this->autocommit) $this->conn->commit();
-
-			$this->goodSql++;
-		} catch (PDOException $e) {
-			$this->log("Failed to execute: " . $sql, Project::MSG_ERR);
-			if ($this->onError != "continue") {
-				throw $e;
-			}
-			$this->log($e->getMessage(), Project::MSG_ERR);
-		}
-	}
-
-	/**
-	 * print any results in the statement.
-	 *
-	 * @param      out
-	 * @throws     PDOException
-	 */
-	protected function printResults($out = null)
-	{
-		$rs = null;
-
-		do {
-			$rs = $this->statement->getResultSet();
-
-			if ($rs !== null) {
-
-				$this->log("Processing new result set.", Project::MSG_VERBOSE);
-
-				$line = "";
-
-				$colsprinted = false;
-
-				while ($rs->next()) {
-
-					if (!$colsprinted && $this->showheaders) {
-						$first = true;
-						foreach ($this->fields as $fieldName => $ignore) {
-							if ($first) $first = false; else $line .= ",";
-							$line .= $fieldName;
-						}
-					} // if show headers
-
-					$first = true;
-					foreach ($rs->fields as $columnValue) {
-
-						if ($columnValue != null) {
-							$columnValue = trim($columnValue);
-						}
-
-						if ($first) {
-							$first = false;
-						} else {
-							$line .= ",";
-						}
-						$line .= $columnValue;
-					}
-
-					if ($out !== null) {
-						$out->write($line);
-						$out->newLine();
-					}
-
-					System::println($line);
-					$line = "";
-				} // while rs->next()
-			}
-		} while ($this->statement->getMoreResults());
-		System::println();
-		if ($out !== null) $out->newLine();
-	}
-
-}
-
-/**
- * "Inner" class that contains the definition of a new transaction element.
- * Transactions allow several files or blocks of statements
- * to be executed using the same Creole connection and commit
- * operation in between.
- * @package    propel.phing
- */
-class PropelSQLExecTransaction {
-
-	private $tSrcFile = null;
-	private $tSqlCommand = "";
-	private $parent;
-
-	function __construct($parent)
-	{
-		// Parent is required so that we can log things ...
-		$this->parent = $parent;
-	}
-
-	public function setSrc(PhingFile $src)
-	{
-		$this->tSrcFile = $src;
-	}
-
-	public function addText($sql)
-	{
-		$this->tSqlCommand .= $sql;
-	}
-
-	/**
-	 * @throws     IOException, PDOException
-	 */
-	public function runTransaction($out = null)
-	{
-		if (!empty($this->tSqlCommand)) {
-			$this->parent->log("Executing commands", Project::MSG_INFO);
-			$this->parent->runStatements($this->tSqlCommand, $out);
-		}
-
-		if ($this->tSrcFile !== null) {
-			$this->parent->log("Executing file: " . $this->tSrcFile->getAbsolutePath(), Project::MSG_INFO);
-			$reader = new FileReader($this->tSrcFile);
-			$this->parent->runStatements($reader, $out);
-			$reader->close();
-		}
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSQLTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSQLTask.php
deleted file mode 100644
index 9da5501..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSQLTask.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelSQLTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/AppData.php';
-
-/**
- * The task for building SQL DDL based on the XML datamodel.
- *
- * This class uses the new DDLBuilder classes instead of the Capsule PHP templates.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.phing
- */
-class PropelSQLTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * The properties file that maps an SQL file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $sqldbmap;
-
-	/**
-	 * Name of the database.
-	 */
-	private $database;
-
-	/**
-	 * Set the sqldbmap.
-	 * @param      PhingFile $sqldbmap The db map.
-	 */
-	public function setSqlDbMap(PhingFile $sqldbmap)
-	{
-		$this->sqldbmap = $sqldbmap;
-	}
-
-	/**
-	 * Get the sqldbmap.
-	 * @return     PhingFile $sqldbmap.
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the database name.
-	 * @param      string $database
-	 */
-	public function setDatabase($database)
-	{
-		$this->database = $database;
-	}
-
-	/**
-	 * Get the database name.
-	 * @return     string
-	 */
-	public function getDatabase()
-	{
-		return $this->database;
-	}
-
-	/**
-	 * Create the sql -> database map.
-	 *
-	 * @throws     IOException - if unable to store properties
-	 */
-	protected function createSqlDbMap()
-	{
-		if ($this->getSqlDbMap() === null) {
-			return;
-		}
-
-		// Produce the sql -> database map
-		$sqldbmap = new Properties();
-
-		// Check to see if the sqldbmap has already been created.
-		if ($this->getSqlDbMap()->exists()) {
-			$sqldbmap->load($this->getSqlDbMap());
-		}
-
-		if ($this->packageObjectModel) {
-			// in this case we'll get the sql file name from the package attribute
-			$dataModels = $this->packageDataModels();
-			foreach ($dataModels as $package => $dataModel) {
-				foreach ($dataModel->getDatabases() as $database) {
-					$name = ($package ? $package . '.' : '') . 'schema.xml';
-					$sqlFile = $this->getMappedFile($name);
-					$sqldbmap->setProperty($sqlFile->getName(), $database->getName());
-				}
-			}
-		} else {
-			// the traditional way is to map the schema.xml filenames
-			$dmMap = $this->getDataModelDbMap();
-			foreach (array_keys($dmMap) as $dataModelName) {
-				$sqlFile = $this->getMappedFile($dataModelName);
-				if ($this->getDatabase() === null) {
-					$databaseName = $dmMap[$dataModelName];
-				} else {
-					$databaseName = $this->getDatabase();
-				}
-				$sqldbmap->setProperty($sqlFile->getName(), $databaseName);
-			}
-		}
-
-		try {
-			$sqldbmap->store($this->getSqlDbMap(), "Sqlfile -> Database map");
-		} catch (IOException $e) {
-			throw new IOException("Unable to store properties: ". $e->getMessage());
-		}
-	}
-
-	public function main() {
-
-		$this->validate();
-
-		if (!$this->mapperElement) {
-			throw new BuildException("You must use a <mapper/> element to describe how names should be transformed.");
-		}
-
-		if ($this->packageObjectModel) {
-			$dataModels = $this->packageDataModels();
-		} else {
-			$dataModels = $this->getDataModels();
-		}
-
-		// 1) first create a map of filenames to databases; this is used by other tasks like
-		// the SQLExec task.
-		$this->createSqlDbMap();
-
-		// 2) Now actually create the DDL based on the datamodel(s) from XML schema file.
-		$targetDatabase = $this->getTargetDatabase();
-
-		$generatorConfig = $this->getGeneratorConfig();
-
-		$builderClazz = $generatorConfig->getBuilderClassname('ddl');
-
-		foreach ($dataModels as $package => $dataModel) {
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				// Clear any start/end DLL
-				call_user_func(array($builderClazz, 'reset'));
-
-				// file we are going to create
-				if (!$this->packageObjectModel) {
-					$name = $dataModel->getName();
-				} else {
-					$name = ($package ? $package . '.' : '') . 'schema.xml';
-				}
-
-				$outFile = $this->getMappedFile($name);
-
-				$this->log("Writing to SQL file: " . $outFile->getPath());
-
-				// First add any "header" SQL
-				$ddl = call_user_func(array($builderClazz, 'getDatabaseStartDDL'));
-
-				foreach ($database->getTables() as $table) {
-
-					if (!$table->isSkipSql()) {
-						$builder = $generatorConfig->getConfiguredBuilder($table, 'ddl');
-						$this->log("\t+ " . $table->getName() . " [builder: " . get_class($builder) . "]");
-						$ddl .= $builder->build();
-						foreach ($builder->getWarnings() as $warning) {
-							$this->log($warning, Project::MSG_WARN);
-						}
-					} else {
-						$this->log("\t + (skipping) " . $table->getName());
-					}
-
-				} // foreach database->getTables()
-
-				// Finally check to see if there is any "footer" SQL
-				$ddl .= call_user_func(array($builderClazz, 'getDatabaseEndDDL'));
-
-				#var_dump($outFile->getAbsolutePath());
-				// Now we're done.  Write the file!
-				file_put_contents($outFile->getAbsolutePath(), $ddl);
-
-			} // foreach database
-		} //foreach datamodels
-
-	} // main()
-
-	/**
-	 * Packages the datamodels to one datamodel per package
-	 *
-	 * This applies only when the the packageObjectModel option is set. We need to
-	 * re-package the datamodels to allow the database package attribute to control
-	 * which tables go into which SQL file.
-	 *
-	 * @return     array The packaged datamodels
-	 */
-	protected function packageDataModels() {
-
-		static $packagedDataModels;
-
-		if (is_null($packagedDataModels)) {
-
-			$dataModels = $this->getDataModels();
-			$dataModel = array_shift($dataModels);
-			$packagedDataModels = array();
-
-			$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-			foreach ($dataModel->getDatabases() as $db) {
-				foreach ($db->getTables() as $table) {
-					$package = $table->getPackage();
-					if (!isset($packagedDataModels[$package])) {
-						$dbClone = $this->cloneDatabase($db);
-						$dbClone->setPackage($package);
-						$ad = new AppData($platform);
-						$ad->setName($dataModel->getName());
-						$ad->addDatabase($dbClone);
-						$packagedDataModels[$package] = $ad;
-					}
-					$packagedDataModels[$package]->getDatabase($db->getName())->addTable($table);
-				}
-			}
-		}
-
-		return $packagedDataModels;
-	}
-
-	protected function cloneDatabase($db) {
-
-		$attributes = array (
-			'name' => $db->getName(),
-			'baseClass' => $db->getBaseClass(),
-			'basePeer' => $db->getBasePeer(),
-			'defaultIdMethod' => $db->getDefaultIdMethod(),
-			'defaultPhpNamingMethod' => $db->getDefaultPhpNamingMethod(),
-			'defaultTranslateMethod' => $db->getDefaultTranslateMethod(),
-			'heavyIndexing' => $db->getHeavyIndexing(),
-		);
-
-		$clone = new Database();
-		$clone->loadFromXML($attributes);
-		return $clone;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSchemaReverseTask.php b/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSchemaReverseTask.php
deleted file mode 100644
index bfedade..0000000
--- a/debian/propel/usr/share/php/propel/generator/classes/propel/phing/PropelSchemaReverseTask.php
+++ /dev/null
@@ -1,556 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelSchemaReverseTask.php 945 2008-01-30 02:14:46Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/tasks/ext/pdo/PDOTask.php';
-include_once 'propel/engine/GeneratorConfig.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * This class generates an XML schema of an existing database from
- * the database metadata.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 945 $
- * @package    propel.phing
- */
-class PropelSchemaReverseTask extends PDOTask {
-
-	/**
-	 * Zero bit for no validators
-	 */
-	const VALIDATORS_NONE = 0;
-
-	/**
-	 * Bit for maxLength validator
-	 */
-	const VALIDATORS_MAXLENGTH = 1;
-
-	/**
-	 * Bit for maxValue validator
-	 */
-	const VALIDATORS_MAXVALUE = 2;
-
-	/**
-	 * Bit for type validator
-	 */
-	const VALIDATORS_TYPE = 4;
-
-	/**
-	 * Bit for required validator
-	 */
-	const VALIDATORS_REQUIRED = 8;
-
-	/**
-	 * Bit for unique validator
-	 */
-	const VALIDATORS_UNIQUE = 16;
-
-	/**
-	 * Bit for all validators
-	 */
-	const VALIDATORS_ALL = 255;
-
-	/**
-	 * File to contain XML database schema.
-	 * @var        PhingFIle
-	 */
-	protected $xmlSchema;
-
-	/**
-	 * DB encoding to use
-	 * @var        string
-	 */
-	protected $dbEncoding = 'iso-8859-1';
-
-	/**
-	 * DB schema to use.
-	 * @var        string
-	 */
-	protected $dbSchema;
-
-	/**
-	 * The datasource name (used for <database name=""> in schema.xml)
-	 *
-	 * @var        string
-	 */
-	protected $databaseName;
-
-	/**
-	 * DOM document produced.
-	 * @var        DOMDocument
-	 */
-	protected $doc;
-
-	/**
-	 * The document root element.
-	 * @var        DOMElement
-	 */
-	protected $databaseNode;
-
-	/**
-	 * Hashtable of columns that have primary keys.
-	 * @var        array
-	 */
-	protected $primaryKeys;
-
-	/**
-	 * Whether to use same name for phpName or not.
-	 * @var        boolean
-	 */
-	protected $samePhpName;
-
-	/**
-	 * whether to add vendor info or not
-	 * @var        boolean
-	 */
-	protected $addVendorInfo;
-
-	/**
-	 * Bitfield to switch on/off which validators will be created.
-	 *
-	 * @var        int
-	 */
-	protected $validatorBits = PropelSchemaReverseTask::VALIDATORS_NONE;
-
-	/**
-	 * Collect validatorInfos to create validators.
-	 *
-	 * @var        int
-	 */
-	protected $validatorInfos;
-
-	/**
-	 * An initialized GeneratorConfig object containing the converted Phing props.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * Maps validator type tokens to bits
-	 *
-	 * The tokens are used in the propel.addValidators property to define
-	 * which validators are to be added
-	 *
-	 * @var        array
-	 */
-	static protected $validatorBitMap = array (
-		'none' => PropelSchemaReverseTask::VALIDATORS_NONE,
-		'maxlength' => PropelSchemaReverseTask::VALIDATORS_MAXLENGTH,
-		'maxvalue' => PropelSchemaReverseTask::VALIDATORS_MAXVALUE,
-		'type' => PropelSchemaReverseTask::VALIDATORS_TYPE,
-		'required' => PropelSchemaReverseTask::VALIDATORS_REQUIRED,
-		'unique' => PropelSchemaReverseTask::VALIDATORS_UNIQUE,
-		'all' => PropelSchemaReverseTask::VALIDATORS_ALL,
-	);
-
-	/**
-	 * Defines messages that are added to validators
-	 *
-	 * @var        array
-	 */
-	static protected $validatorMessages = array (
-		'maxlength' => array (
-			'msg' => 'The field %s must be not longer than %s characters.',
-			'var' => array('colName', 'value')
-	),
-		'maxvalue' => array (
-			'msg' => 'The field %s must be not greater than %s.',
-			'var' => array('colName', 'value')
-	),
-		'type' => array (
-			'msg' => 'The column %s must be an %s value.',
-			'var' => array('colName', 'value')
-	),
-		'required' => array (
-			'msg' => 'The field %s is required.',
-			'var' => array('colName')
-	),
-		'unique' => array (
-			'msg' => 'This %s already exists in table %s.',
-			'var' => array('colName', 'tableName')
-	),
-	);
-
-	/**
-	 * Gets the (optional) schema name to use.
-	 *
-	 * @return     string
-	 */
-	public function getDbSchema()
-	{
-		return $this->dbSchema;
-	}
-
-	/**
-	 * Sets the name of a database schema to use (optional).
-	 *
-	 * @param      string $dbSchema
-	 */
-	public function setDbSchema($dbSchema)
-	{
-		$this->dbSchema = $dbSchema;
-	}
-
-	/**
-	 * Gets the database encoding.
-	 *
-	 * @return     string
-	 */
-	public function getDbEncoding($v)
-	{
-		return $this->dbEncoding;
-	}
-
-	/**
-	 * Sets the database encoding.
-	 *
-	 * @param      string $v
-	 */
-	public function setDbEncoding($v)
-	{
-		$this->dbEncoding = $v;
-	}
-
-	/**
-	 * Gets the datasource name.
-	 *
-	 * @return     string
-	 */
-	public function getDatabaseName()
-	{
-		return $this->databaseName;
-	}
-
-	/**
-	 * Sets the datasource name.
-	 *
-	 * This will be used as the <database name=""> value in the generated schema.xml
-	 *
-	 * @param      string $v
-	 */
-	public function setDatabaseName($v)
-	{
-		$this->databaseName = $v;
-	}
-
-	/**
-	 * Sets the output name for the XML file.
-	 *
-	 * @param      PhingFile $v
-	 */
-	public function setOutputFile(PhingFile $v)
-	{
-		$this->xmlSchema = $v;
-	}
-
-	/**
-	 * Set whether to use the column name as phpName without any translation.
-	 *
-	 * @param      boolean $v
-	 */
-	public function setSamePhpName($v)
-	{
-		$this->samePhpName = $v;
-	}
-
-	/**
-	 * Set whether to add vendor info to the schema.
-	 *
-	 * @param      boolean $v
-	 */
-	public function setAddVendorInfo($v)
-	{
-		$this->addVendorInfo = (boolean) $v;
-	}
-
-	/**
-	 * Sets set validator bitfield from a comma-separated list of "validator bit" names.
-	 *
-	 * @param      string $v The comma-separated list of which validators to add.
-	 * @return     void
-	 */
-	public function setAddValidators($v)
-	{
-		$validKeys = array_keys(self::$validatorBitMap);
-
-		// lowercase input
-		$v = strtolower($v);
-
-		$bits = self::VALIDATORS_NONE;
-
-		$exprs = explode(',', $v);
-		foreach ($exprs as $expr) {
-			$expr = trim($expr);
-			if(!empty($expr)) {
-  			if (!isset(self::$validatorBitMap[$expr])) {
-  				throw new BuildException("Unable to interpret validator in expression ('$v'): " . $expr);
-  			}
-  			$bits |= self::$validatorBitMap[$expr];
-			}
-		}
-
-		$this->validatorBits = $bits;
-	}
-
-	/**
-	 * Checks whether to add validators of specified type or not
-	 *
-	 * @param      int $type The validator type constant.
-	 * @return     boolean
-	 */
-	protected function isValidatorRequired($type)
-	{
-		return (($this->validatorBits & $type) === $type);
-	}
-
-	/**
-	 * Whether to use the column name as phpName without any translation.
-	 *
-	 * @return     boolean
-	 */
-	public function isSamePhpName()
-	{
-		return $this->samePhpName;
-	}
-
-	/**
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		if (!$this->getDatabaseName()) {
-			throw new BuildException("databaseName attribute is required for schema reverse engineering", $this->getLocation());
-		}
-
-		//(not yet supported) $this->log("schema : " . $this->dbSchema);
-		//DocumentTypeImpl docType = new DocumentTypeImpl(null, "database", null,
-		//	   "http://jakarta.apache.org/turbine/dtd/database.dtd");
-
-		$this->doc = new DOMDocument('1.0', 'utf-8');
-		$this->doc->formatOutput = true; // pretty printing
-
-		$this->doc->appendChild($this->doc->createComment("Autogenerated by ".get_class($this)." class."));
-
-		try {
-
-			$database = $this->buildModel();
-
-			if ($this->validatorBits !== self::VALIDATORS_NONE) {
-				$this->addValidators($database);
-			}
-
-			$database->appendXml($this->doc);
-
-			$this->log("Writing XML to file: " . $this->xmlSchema->getPath());
-			$out = new FileWriter($this->xmlSchema);
-			$xmlstr = $this->doc->saveXML();
-			$out->write($xmlstr);
-			$out->close();
-
-		} catch (Exception $e) {
-			$this->log("There was an error building XML from metadata: " . $e->getMessage(), Project::MSG_ERR);
-		}
-
-		$this->log("Schema reverse engineering finished");
-	}
-
-	/**
-	 * Gets the GeneratorConfig object for this task or creates it on-demand.
-	 * @return     GeneratorConfig
-	 */
-	protected function getGeneratorConfig()
-	{
-		if ($this->generatorConfig === null) {
-			$this->generatorConfig = new GeneratorConfig();
-			$this->generatorConfig->setBuildProperties($this->getProject()->getProperties());
-		}
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Builds the model classes from the database schema.
-	 * @return     Database The built-out Database (with all tables, etc.)
-	 */
-	protected function buildModel()
-	{
-		$config = $this->getGeneratorConfig();
-		$con = $this->getConnection();
-
-		$database = new Database($this->getDatabaseName());
-		$database->setPlatform($config->getConfiguredPlatform($con));
-
-		// Some defaults ...
-		$database->setDefaultIdMethod(IDMethod::NATIVE);
-
-		$parser = $config->getConfiguredSchemaParser($con);
-
-		$parser->parse($database);
-
-		return $database;
-	}
-
-	/**
-	 * Adds any requested validators to the data model.
-	 *
-	 * We will add the following type specific validators:
-	 *
-	 *      for notNull columns: required validator
-	 *      for unique indexes: unique validator
-	 * 		for varchar types: maxLength validators (CHAR, VARCHAR, LONGVARCHAR)
-	 * 		for numeric types: maxValue validators (BIGINT, SMALLINT, TINYINT, INTEGER, FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 * 		for integer and timestamp types: notMatch validator with [^\d]+ (BIGINT, SMALLINT, TINYINT, INTEGER, TIMESTAMP)
-	 * 		for float types: notMatch validator with [^\d\.]+ (FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 *
-	 * @param      Database $database The Database model.
-	 * @return     void
-	 * @todo       find out how to evaluate the appropriate size and adjust maxValue rule values appropriate
-	 * @todo       find out if float type column values must always notMatch('[^\d\.]+'), i.e. digits and point for any db vendor, language etc.
-	 */
-	protected function addValidators(Database $database)
-	{
-
-		$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-		foreach ($database->getTables() as $table) {
-
-			$set = new PropelSchemaReverse_ValidatorSet();
-
-			foreach ($table->getColumns() as $col) {
-
-				if ($col->isNotNull() && $this->isValidatorRequired(self::VALIDATORS_REQUIRED)) {
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'required'));
-				}
-
-				if (in_array($col->getType(), array(PropelTypes::CHAR, PropelTypes::VARCHAR, PropelTypes::LONGVARCHAR))
-						&& $col->getSize() && $this->isValidatorRequired(self::VALIDATORS_MAXLENGTH)) {
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'maxLength', $col->getSize()));
-				}
-
-				if ($col->isNumericType() && $this->isValidatorRequired(self::VALIDATORS_MAXVALUE)) {
-					$this->log("WARNING: maxValue validator added for column ".$col->getName().". You will have to adjust the size value manually.", Project::MSG_WARN);
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'maxSize', 'REPLACEME'));
-				}
-
-				if ($col->isPhpPrimitiveType() && $this->isValidatorRequired(self::VALIDATORS_TYPE)) {
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'type', $col->getPhpType()));
-				}
-
-			}
-
-			foreach ($table->getUnices() as $unique) {
-				$colnames = $unique->getColumns();
-				if (count($colnames) == 1) { // currently 'unique' validator only works w/ single columns.
-					$col = $table->getColumn($colnames[0]);
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'unique'));
-				}
-			}
-
-			foreach ($set->getValidators() as $validator) {
-				$table->addValidator($validator);
-			}
-
-		} // foreach table
-
-	}
-
-	/**
-	 * Gets validator rule for specified type (string).
-	 *
-	 * @param      Column $column The column that is being validated.
-	 * @param      string $type The type (string) for validator (e.g. 'required').
-	 * @param      mixed $value The value for the validator (if applicable)
-	 */
-	protected function getValidatorRule(Column $column, $type, $value = null)
-	{
-		$rule = new Rule();
-		$rule->setName($type);
-		if ($value !== null) {
-			$rule->setValue($value);
-		}
-		$rule->setMessage($this->getRuleMessage($column, $type, $value));
-		return $rule;
-	}
-
-	/**
-	 * Gets the message for a specified rule.
-	 *
-	 * @param      Column $column
-	 * @param      string $type
-	 * @param      mixed $value
-	 */
-	protected function getRuleMessage(Column $column, $type, $value)
-	{
-		// create message
-		$colName = $column->getName();
-		$tableName = $column->getTable()->getName();
-		$msg = self::$validatorMessages[strtolower($type)];
-		$tmp = compact($msg['var']);
-		array_unshift($tmp, $msg['msg']);
-		$msg = call_user_func_array('sprintf', $tmp);
-		return $msg;
-	}
-
-}
-
-/**
- * A helper class to store validator sets indexed by column.
- * @package    propel.phing
- */
-class PropelSchemaReverse_ValidatorSet {
-
-	/**
-	 * Map of column names to validators.
-	 *
-	 * @var        array Validator[]
-	 */
-	private $validators = array();
-
-	/**
-	 * Gets a single validator for specified column name.
-	 * @param      Column $column
-	 * @return     Validator
-	 */
-	public function getValidator(Column $column)
-	{
-		$key = $column->getName();
-		if (!isset($this->validators[$key])) {
-			$this->validators[$key] = new Validator();
-			$this->validators[$key]->setColumn($column);
-		}
-		return $this->validators[$key];
-	}
-
-	/**
-	 * Gets all validators.
-	 * @return     array Validator[]
-	 */
-	public function getValidators()
-	{
-		return $this->validators;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/generator/default.properties b/debian/propel/usr/share/php/propel/generator/default.properties
deleted file mode 100644
index 9b2144b..0000000
--- a/debian/propel/usr/share/php/propel/generator/default.properties
+++ /dev/null
@@ -1,264 +0,0 @@
-# -------------------------------------------------------------------
-#
-#  D E F A U L T   P R O P E R T I E S
-#
-# -------------------------------------------------------------------
-# This file sets default properties.  You can override any of these
-# by specifying your new value in the build.properties file for your
-# project or a top-level build.properties file. Either way, you
-# should not need to edit this file.
-# -------------------------------------------------------------------
-
-
-# -------------------------------------------------------------------
-#
-#  B A S I C   P R O P E R T I E S
-#
-# -------------------------------------------------------------------
-
-propel.version = 1.4.1
-
-propel.home = .
-
-propel.project =
-propel.database =
-propel.targetPackage = ${propel.project}
-propel.runOnlyOnSchemaChange = false
-
-# Default behavior settings
-#
-propel.targetPlatform = php5
-propel.packageObjectModel = false
-propel.schema.validate = true
-propel.useDateTimeClass = true
-propel.dateTimeClass = DateTime
-
-# controls what type of joins will be used in the doSelectJoin*() peer methods, 
-# if set to true, LEFT JOINS will be used, INNER JOINS otherwise
-# see ticket #491, #588
-propel.useLeftJoinsInDoJoinMethods = true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.database.url =
-propel.database.buildUrl = ${propel.database.url}
-propel.database.createUrl = ${propel.database.buildUrl}
-
-propel.database.driver =
-
-propel.database.schema =
-propel.database.encoding =
-propel.database.manualCreation = false
-
-# if these arent blank then when we try to connect with insert-sql to a database
-# that doesnt require them and it isnt in the build.properties it sends
-# the ${blah} for the username and password
-propel.database.user =
-propel.database.password =
-
-# Creole database settings for reverse engineering applications
-# -------------------------------------------------------------
-
-# by default leave the databaseDriver blank, so that bundled driver is used by Creole
-propel.database.creole.driver =
-propel.database.creole.url =
-
-# -------------------------------------------------------------------
-#
-#  C R E O L E  TO  X M L  S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.samePhpName = false
-propel.addVendorInfo = false
-propel.addValidators = none
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E   V A R I A B L E S
-#
-# -------------------------------------------------------------------
-
-propel.addGenericAccessors = false
-propel.addGenericMutators = false
-propel.addSaveMethod = true
-propel.addTimeStamp = false
-propel.addValidateMethod = true
-propel.addIncludes = true
-propel.addHooks = true
-propel.basePrefix = Base
-propel.saveException = PropelException
-propel.emulateForeignKeyConstraints = false
-
-# Identifier quoting is only implemented at the DDL layer at this point.
-# Since this may result in undesired behavior (especially in Postgres),
-# it can be disabled by setting this property to true in your build.properties file.
-propel.disableIdentifierQuoting = false
-
-# These are the default formats that will be used when fetching values
-# from temporal columns in Propel.  You can always specify these when
-# calling the methods directly, but for methods like getByName()
-# it is nice to change the defaults.
-
-propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat = %X
-propel.defaultDateFormat = %x
-
-propel.omtar.src.base = false
-propel.omtar.src.extension = false
-propel.omtar.bin.base = false
-propel.omtar.bin.extension = false
-propel.omtar.deleteFiles = false
-
-
-# -------------------------------------------------------------------
-#
-#  C O N T R O L   T E M P L A T E S
-#
-# -------------------------------------------------------------------
-#
-# This is a deprecated idea, that will almost certainly be completely
-# removed in Propel 1.2 and/or 2.0.
-#
-
-propel.template.conf = ${propel.home}/templates/conf/Control.tpl
-propel.template.sql = ${propel.home}/templates/sql/base/Control.tpl
-propel.template.sqlDbInit = ${propel.home}/templates/sql/db-init/Control.tpl
-
-
-# -------------------------------------------------------------------
-#
-#  D I R E C T O R I E S
-#
-# -------------------------------------------------------------------
-
-propel.project.dir = ${propel.home}/projects/${propel.project}
-
-propel.output.dir = ${propel.project.dir}/build
-propel.schema.dir = ${propel.project.dir}
-propel.templatePath = ${propel.home}/templates
-propel.conf.dir = ${propel.project.dir}
-
-propel.doc.dir = ${propel.output.dir}/doc
-propel.php.dir = ${propel.output.dir}/classes
-propel.phpconf.dir = ${propel.output.dir}/conf
-propel.phpdoc.dir = ${propel.output.dir}/phpdoc
-propel.sql.dir = ${propel.output.dir}/sql
-propel.graph.dir = ${propel.output.dir}/graph
-propel.omtar.dir = ${propel.output.dir}
-
-
-# -------------------------------------------------------------------
-#
-#  D E F A U L T   F I L E   N A M ES
-#
-# -------------------------------------------------------------------
-
-# propel.sqlfile
-
-propel.runtime.conf.file = runtime-conf.xml
-propel.runtime.phpconf.file = ${propel.project}-conf.php
-propel.runtime.phpconf-classmap.file = ${propel.project}-classmap.php
-propel.default.schema.basename = schema
-
-# Can't use because of inconsistencies in where the files
-# are named (some from build-propel.xml, but some from within templates)
-# propel.default.data.basename = ${propel.project}-data
-
-propel.schema.xsd.file = ${propel.home}/resources/xsd/database.xsd
-propel.schema.xsl.file = ${propel.home}/resources/xsl/database.xsl
-
-# -------------------------------------------------------------------
-#
-#  I N C L U D E   A N D   E X C L U D E   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.schema.sql.includes = *schema.xml
-propel.schema.sql.excludes =
-propel.schema.doc.includes = *schema.xml
-propel.schema.doc.excludes =
-propel.schema.create-db.includes = *schema.xml
-propel.schema.create-db.excludes =
-propel.schema.init-sql.includes = *schema.xml
-propel.schema.init-sql.excludes = id-table-schema.xml
-propel.schema.om.includes = *schema.xml
-propel.schema.om.excludes = id-table-schema.xml
-propel.schema.datadtd.includes = *schema.xml
-propel.schema.datadtd.excludes = id-table-schema.xml
-
-# -------------------------------------------------------------------
-#
-#  M A P P E R   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-# (note: data xml files are selected based on datadbmap file)
-propel.datasql.mapper.from = *.xml
-propel.datasql.mapper.to = *.sql
-
-propel.datadump.mapper.from = *schema.xml
-propel.datadump.mapper.to = *data.xml
-
-propel.datadtd.mapper.from = *.xml
-propel.datadtd.mapper.to = *.dtd
-
-propel.sql.mapper.from = *.xml
-propel.sql.mapper.to = *.sql
-
-
-# -------------------------------------------------------------------
-#
-#  B U I L D E R    S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-# Object Model builders
-propel.builder.peer.class = propel.engine.builder.om.php5.PHP5PeerBuilder
-propel.builder.object.class = propel.engine.builder.om.php5.PHP5ObjectBuilder
-propel.builder.objectstub.class = propel.engine.builder.om.php5.PHP5ExtensionObjectBuilder
-propel.builder.peerstub.class = propel.engine.builder.om.php5.PHP5ExtensionPeerBuilder
-
-propel.builder.objectmultiextend.class = propel.engine.builder.om.php5.PHP5MultiExtendObjectBuilder
-
-propel.builder.tablemap.class = propel.engine.builder.om.php5.PHP5TableMapBuilder
-
-propel.builder.interface.class = propel.engine.builder.om.php5.PHP5InterfaceBuilder
-
-propel.builder.node.class = propel.engine.builder.om.php5.PHP5NodeBuilder
-propel.builder.nodepeer.class = propel.engine.builder.om.php5.PHP5NodePeerBuilder
-propel.builder.nodestub.class = propel.engine.builder.om.php5.PHP5ExtensionNodeBuilder
-propel.builder.nodepeerstub.class = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder
-
-propel.builder.nestedset.class = propel.engine.builder.om.php5.PHP5NestedSetBuilder
-propel.builder.nestedsetpeer.class = propel.engine.builder.om.php5.PHP5NestedSetPeerBuilder
-
-propel.builder.pluralizer.class = propel.engine.builder.util.DefaultEnglishPluralizer
-
-# SQL builders
-
-propel.builder.ddl.class = propel.engine.builder.sql.${propel.database}.${propel.database}DDLBuilder
-propel.builder.datasql.class = propel.engine.builder.sql.${propel.database}.${propel.database}DataSQLBuilder
-
-# Platform classes
-
-propel.platform.class = propel.engine.platform.${propel.database}Platform
-
-# Schema Parser (reverse-engineering) classes
-
-propel.reverse.parser.class = propel.engine.database.reverse.${propel.database}.${propel.database}SchemaParser
-
-# -------------------------------------------------------------------
-#
-#  B E H A V I O R   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.behavior.timestampable.class = propel.engine.behavior.TimestampableBehavior
-propel.behavior.alternative_coding_standards.class = propel.engine.behavior.AlternativeCodingStandardsBehavior
-propel.behavior.soft_delete.class = propel.engine.behavior.SoftDeleteBehavior
-propel.behavior.auto_add_pk.class = propel.engine.behavior.AutoAddPkBehavior
diff --git a/debian/propel/usr/share/php/propel/generator/pear/BuildPropelGenPEARPackageTask.php b/debian/propel/usr/share/php/propel/generator/pear/BuildPropelGenPEARPackageTask.php
deleted file mode 100644
index 7d0d190..0000000
--- a/debian/propel/usr/share/php/propel/generator/pear/BuildPropelGenPEARPackageTask.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/*
- *  $Id: BuildPropelGenPEARPackageTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-include_once 'phing/types/FileSet.php';
-include_once 'phing/tasks/ext/pearpackage/Fileset.php';
-
-/**
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    phing.tasks.ext
- * @version    $Revision: 1262 $
- */
-class BuildPropelGenPEARPackageTask extends MatchingTask {
-
-	/** Base directory for reading files. */
-	private $dir;
-
-	private $version;
-	private $state = 'stable';
-	private $notes;
-
-	private $filesets = array();
-
-	/** Package file */
-	private $packageFile;
-
-	public function init() {
-		include_once 'PEAR/PackageFileManager2.php';
-		if (!class_exists('PEAR_PackageFileManager2')) {
-			throw new BuildException("You must have installed PEAR_PackageFileManager2 (PEAR_PackageFileManager >= 1.6.0) in order to create a PEAR package.xml file.");
-		}
-	}
-
-	private function setOptions($pkg){
-
-		$options['baseinstalldir'] = 'propel';
-		$options['packagedirectory'] = $this->dir->getAbsolutePath();
-
-		if (empty($this->filesets)) {
-			throw new BuildException("You must use a <fileset> tag to specify the files to include in the package.xml");
-		}
-
-		$options['filelistgenerator'] = 'Fileset';
-
-		// Some PHING-specific options needed by our Fileset reader
-		$options['phing_project'] = $this->getProject();
-		$options['phing_filesets'] = $this->filesets;
-
-		if ($this->packageFile !== null) {
-			// create one w/ full path
-			$f = new PhingFile($this->packageFile->getAbsolutePath());
-			$options['packagefile'] = $f->getName();
-			// must end in trailing slash
-			$options['outputdirectory'] = $f->getParent() . DIRECTORY_SEPARATOR;
-			$this->log("Creating package file: " . $f->getPath(), Project::MSG_INFO);
-		} else {
-			$this->log("Creating [default] package.xml file in base directory.", Project::MSG_INFO);
-		}
-
-		// add install exceptions
-		$options['installexceptions'] = array(	'pear/pear-propel-gen' => '/',
-												'pear/pear-propel-gen.bat' => '/',
-												'pear/pear-build.xml' => '/',
-												'pear/build.properties' => '/',
-												);
-
-		$options['dir_roles'] = array(	'projects' => 'data',
-										'test' => 'test',
-										'templates' => 'data',
-										'resources' => 'data');
-
-		$options['exceptions'] = array(	'pear/pear-propel-gen.bat' => 'script',
-										'pear/pear-propel-gen' => 'script',
-										'pear/pear-build.xml' => 'data',
-										'build.xml' => 'data',
-										'build-propel.xml' => 'data',
-									);
-
-		$pkg->setOptions($options);
-
-	}
-
-	/**
-	 * Main entry point.
-	 * @return     void
-	 */
-	public function main() {
-
-		if ($this->dir === null) {
-			throw new BuildException("You must specify the \"dir\" attribute for PEAR package task.");
-		}
-
-		if ($this->version === null) {
-			throw new BuildException("You must specify the \"version\" attribute for PEAR package task.");
-		}
-
-		$package = new PEAR_PackageFileManager2();
-
-		$this->setOptions($package);
-
-		// the hard-coded stuff
-		$package->setPackage('propel_generator');
-		$package->setSummary('Generator component of the Propel PHP object persistence layer');
-		$package->setDescription('Propel is an object persistence layer for PHP5 based on Apache Torque. This package provides the generator engine that builds PHP classes and SQL DDL based on an XML representation of your data model.');
-		$package->setChannel('pear.phpdb.org');
-		$package->setPackageType('php');
-
-		$package->setReleaseVersion($this->version);
-		$package->setAPIVersion($this->version);
-
-		$package->setReleaseStability($this->state);
-		$package->setAPIStability($this->state);
-
-		$package->setNotes($this->notes);
-
-		$package->setLicense('LGPL', 'http://www.gnu.org/licenses/lgpl.html');
-
-		// Add package maintainers
-		$package->addMaintainer('lead', 'hans', 'Hans Lellelid', 'hans at xmpl.org');
-		$package->addMaintainer('lead', 'david', 'David Zuelke', 'dz at bitxtender.com');
-		$package->addMaintainer('lead', 'francois', 'Francois Zaninotto', 'fzaninotto@[gmail].com');
-
-		// (wow ... this is a poor design ...)
-		//
-		// note that the order of the method calls below is creating
-		// sub-"release" sections which have specific rules.  This replaces
-		// the platformexceptions system in the older version of PEAR's package.xml
-		//
-		// Programmatically, I feel the need to re-iterate that this API for PEAR_PackageFileManager
-		// seems really wrong.  Sub-sections should be encapsulated in objects instead of having
-		// a "flat" API that does not represent the structure being created....
-
-
-		// creating a sub-section for 'windows'
-			$package->addRelease();
-			$package->setOSInstallCondition('windows');
-			$package->addInstallAs('pear/pear-propel-gen.bat', 'propel-gen.bat');
-			$package->addIgnoreToRelease('pear/pear-propel-gen');
-
-		// creating a sub-section for non-windows
-			$package->addRelease();
-			$package->addInstallAs('pear/pear-propel-gen', 'propel-gen');
-			$package->addIgnoreToRelease('pear/pear-propel-gen.bat');
-
-
-		// "core" dependencies
-		$package->setPhpDep('5.2.4');
-		$package->setPearinstallerDep('1.4.0');
-
-		// "package" dependencies
-		$package->addPackageDepWithChannel( 'required', 'phing', 'pear.phing.info', '2.3.0');
-
-		$package->addExtensionDep('required', 'pdo');
-		$package->addExtensionDep('required', 'xml');
-		$package->addExtensionDep('required', 'xsl');
-
-		// now add the replacements ....
-		$package->addReplacement('Phing.php', 'pear-config', '@DATA-DIR@', 'data_dir');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@PHP-BIN@', 'php_bin');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@BIN-DIR@', 'bin_dir');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@PEAR-DIR@', 'php_dir');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@DATA-DIR@', 'data_dir');
-
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@PHP-BIN@', 'php_bin');
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@BIN-DIR@', 'bin_dir');
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@PEAR-DIR@', 'php_dir');
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@DATA-DIR@', 'data_dir');
-
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@PHP-BIN@', 'php_bin');
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@BIN-DIR@', 'bin_dir');
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@PEAR-DIR@', 'php_dir');
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@DATA-DIR@', 'data_dir');
-
-
-		// now we run this weird generateContents() method that apparently
-		// is necessary before we can add replacements ... ?
-		$package->generateContents();
-
-		$e = $package->writePackageFile();
-
-		if (PEAR::isError($e)) {
-			throw new BuildException("Unable to write package file.", new Exception($e->getMessage()));
-		}
-
-	}
-
-	/**
-	 * Used by the PEAR_PackageFileManager_PhingFileSet lister.
-	 * @return     array FileSet[]
-	 */
-	public function getFileSets() {
-		return $this->filesets;
-	}
-
-	// -------------------------------
-	// Set properties from XML
-	// -------------------------------
-
-	/**
-	 * Nested creator, creates a FileSet for this task
-	 *
-	 * @return     FileSet The created fileset object
-	 */
-	function createFileSet() {
-		$num = array_push($this->filesets, new FileSet());
-		return $this->filesets[$num-1];
-	}
-
-	/**
-	 * Set the version we are building.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setVersion($v){
-		$this->version = $v;
-	}
-
-	/**
-	 * Set the state we are building.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setState($v) {
-		$this->state = $v;
-	}
-
-	/**
-	 * Sets release notes field.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setNotes($v) {
-		$this->notes = $v;
-	}
-	/**
-	 * Sets "dir" property from XML.
-	 * @param      PhingFile $f
-	 * @return     void
-	 */
-	public function setDir(PhingFile $f) {
-		$this->dir = $f;
-	}
-
-	/**
-	 * Sets the file to use for generated package.xml
-	 */
-	public function setDestFile(PhingFile $f) {
-		$this->packageFile = $f;
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/generator/pear/build-pear-package.xml b/debian/propel/usr/share/php/propel/generator/pear/build-pear-package.xml
deleted file mode 100644
index 691134a..0000000
--- a/debian/propel/usr/share/php/propel/generator/pear/build-pear-package.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-	This build file creates a minimal package of propel-generator files,
-	builds a package.xml for installation using PEAR and creates the necessary TGZ file.
-
-	It's pretty easy to build the PEAR package:
-
-	$> cd /path/to/propel-generator
-	$> phing -Dversion=1.0.0RC1 -f pear\build-pear-package.xml
-
--->
-
-<project name="propel_generator" default="main">
-
-	<property name="propelgen.home" value=".."/>
-	<property name="build.base.dir" value="build"/>
-	<property name="pkgname" value="${phing.project.name}-${version}"/>
-	<property name="build.src.dir" value="${build.base.dir}/${pkgname}"/>
-
-	<!-- some default properties -->
-	<property name="notes"><![CDATA[This is a release of the 1.4 branch of the Propel Generator.
-See: http://propel.phpdb.org/trac/query?status=closed&milestone=1.4&resolution=fixed&order=priority for CHANGELOG.
-	]]></property>
-	<property name="state" value="stable"/>
-
-	<taskdef
-    name="pear-package"
-    classname="BuildPropelGenPEARPackageTask" classpath="."/>
-
-	<fileset dir="${propelgen.home}/classes/propel" id="classes">
-		<include name="**"/>
-	</fileset>
-
-	<fileset dir="${propelgen.home}" id="data">
-		<!--<include name="build.xml"/>-->
-		<include name="build-propel.xml"/>
-		<include name="pear/pear-build.xml"/>
-		<include name="pear/pear-propel*"/>
-		<include name="pear/build.properties"/>
-		<include name="default.properties"/>
-		<include name="resources/**"/>
-	</fileset>
-
-	<!--
-		==============================================
-		Main entry point
-		==============================================
-	-->
-	<target name="main" if="version" depends="versioncheck">
-		<phingcall target="build"/>
-		<phingcall target="pear-package"/>
-		<phingcall target="tar"/>
-	</target>
-
-	<!--
-	 ===================================================================
-	 Target: checks if language was given, otherwise fail
-	 ===================================================================
-	-->
-	<target name="versioncheck" unless="version">
-		<echo message="====================================================="/>
-		<echo message="Version not specified. You must enter a version. In"/>
-		<echo message="the future you can add this to build.properties or"/>
-		<echo message="enter it on the command line: "/>
-		<echo message=" "/>
-		<echo message="-Dversion=1.0.0"/>
-		<echo message="====================================================="/>
-		<input propertyname="version" promptChar=":">Propel version for package</input>
-
-		<property name="pkgname" value="${phing.project.name}-${version}" override="true"/>
-		<property name="build.src.dir" value="${build.base.dir}/${pkgname}" override="true"/>
-
-	</target>
-
-	<!--
-		==============================================
-		Copy the desired files into the build/ dir
-		making sure to put them in the directory
-		structure that will be needed for PEAR install
-		==============================================
-	-->
-	<target name="build">
-		<echo>-----------------------------</echo>
-		<echo>| Creating directory layout |</echo>
-		<echo>-----------------------------</echo>
-
-		<delete dir="${build.base.dir}"/>
-		<mkdir dir="${build.base.dir}"/>
-
-		<copy todir="${build.src.dir}">
-			<fileset refid="classes"/>
-			<fileset refid="data"/>
-		</copy>
-
-		<!-- some files need to be manually moved here to save headache when
-		doing the pear package.xml creation -->
-		<move file="${build.src.dir}/pear/build.properties" todir="${build.src.dir}"/>
-		<move file="${build.src.dir}/pear/pear-build.xml" todir="${build.src.dir}"/>
-
-		<chmod file="${build.src.dir}/pear/pear-propel-gen" mode="755"/>
-
-	</target>
-
-	<!--
-		==============================================
-		Create a PEAR package.xml which will guide the
-		installation.
-		==============================================
-	-->
-	<target name="pear-package">
-
-		<echo>-----------------------------</echo>
-		<echo>| Creating PEAR package.xml |</echo>
-		<echo>-----------------------------</echo>
-		<echo></echo>
-
-		<pear-package dir="${build.src.dir}" destFile="${build.base.dir}/package.xml" version="${version}" state="${state}" notes="${notes}">
-
-			<fileset dir="${build.src.dir}">
-				<include name="**"/>
-			</fileset>
-
-		</pear-package>
-
-	</target>
-
-	<!--
-		==============================================
-		Create a tar.gz of the files, which will be
-		installed by pear package manager.
-		==============================================
-	-->
-	<target name="tar">
-		<echo>-----------------------------</echo>
-		<echo>| Creating tar.gz package   |</echo>
-		<echo>-----------------------------</echo>
-		<property name="tarfile" value="${build.base.dir}/${pkgname}.tgz"/>
-		<delete	file="${tarfile}"/>
-		<tar destFile="${tarfile}" basedir="${build.base.dir}" />
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/pear/build.properties b/debian/propel/usr/share/php/propel/generator/pear/build.properties
deleted file mode 100644
index fe317e4..0000000
--- a/debian/propel/usr/share/php/propel/generator/pear/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# In this file you can define any properties taht you want to affect
-# all projects built using the propel-gen script on this system
-#
-# See http://propel.phpdb.org/trac/wiki/Users/Documentation/BuildProperties for a
-# list of available properties.
diff --git a/debian/propel/usr/share/php/propel/generator/pear/pear-build.xml b/debian/propel/usr/share/php/propel/generator/pear/pear-build.xml
deleted file mode 100644
index 89be4fc..0000000
--- a/debian/propel/usr/share/php/propel/generator/pear/pear-build.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<!--
-    Use this file to faciliate easy per-project building using 
-	PEAR-installed Propel-generator.
-
-	This Phing script is invoked via the shell script propel-gen (.bat
-	for Windows).  Normally you should not need to edit this script or
-	be aware of it in any way.
-	
-    Normal use:
-    $> propel-gen /path/to/my/project
-    
-    Specific target: 
-    $> propel-gen insert-sql /path/to/my/project 
-
--->
-<project name="propel-project-builder" default="main">
-
-<!-- set a default target if none provided -->
-<property name="target" value="main"/>
-
-<resolvepath propertyName="propel.project.dir" file="${project.dir}" dir="${application.startdir}"/>
-
-<target name="projdircheckExists">
-  <condition property="projDirExists">
-  	<and>
-		<not>
-			<equals arg1="${propel.project.dir}" arg2="" trim="true"/>
-		</not>
-		<available file="${propel.project.dir}/build.properties"/>
-	</and>
-  </condition>
-</target>
-
-<target name="projdircheck" depends="projdircheckExists" unless="projDirExists">
-	<echo message="====================================================="/>
-	<echo message="Project directory not specified or invalid. You must "/>
-	<echo message="specify the path to your project directory and your "/>
-	<echo message="project directory must contain your build.properties "/>
-	<echo message="and schema.xml files.                                "/>
-	<echo message=" "/>
-	<echo message="Usage: "/>
-	<echo message=" "/>
-	<echo message="$&gt; propel-gen /path/to/projectdir [target]"/>
-	<echo message=" "/>
-	<echo message="====================================================="/>	
-	<fail message="No project directory specified."/>
-</target>
-
-<target name="configure" depends="projdircheck">
-	<if>
-		<isset property="additional.properties"/>
-		<then>
-			<echo>Processing additional properties file: ${additional.properties}</echo>
-			<resolvepath propertyName="additional.properties.resolved" file="${additional.properties}" dir="${application.startdir}"/>
-			<property file="${additional.properties.resolved}"/>
-		</then>
-	</if>
-	<echo msg="Loading project-specific props from ${project.dir}/build.properties"/>
-	<property file="${propel.project.dir}/build.properties"/>
-</target>
-
-<target name="main" depends="configure" 
-  description="The main target. Includes project-specific build.properties and calls the build-propel.xml script">	
-
- <!--<property file="${project.dir}/build.properties"/>-->
- <phing phingfile="build-propel.xml" target="${target}"/>
- 
-</target>
-
-
-<!-- 
- Convenience mappings to build-propel.xml main targets 
- 
- This makes it possible to use this buildfile w/o needing to specify
- target as a property, e.g.:
- 
- $> phing -Dproject=bookstore insert-sql
- 
- The main reason for this is just consistency w/ old build-propel.xml file
- (primarily for documentation & user confusion avoidance reasons).  There are relatively
- few & infrequently changing main targets of build-propel.xml, so it's a non-
- issue as far as maintenance is concerned.
--->
-
-<target name="convert-conf" depends="configure">
-	<phing phingfile="build-propel.xml" target="convert-conf"/>
-</target>
-
-<target name="create-db" depends="configure">
-	<phing phingfile="build-propel.xml" target="create-db"/>
-</target>
-
-<target name="creole" depends="configure">
-	<phing phingfile="build-propel.xml" target="creole"/>
-</target>
-
-<target name="reverse" depends="configure">
-	<phing phingfile="build-propel.xml" target="reverse"/>
-</target>
-
-<target name="datadtd" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadtd"/>
-</target>
-
-<target name="datadump" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadump"/>
-</target>
-
-<target name="datasql" depends="configure">
-	<phing phingfile="build-propel.xml" target="datasql"/>
-</target>
-
-<target name="insert-sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="insert-sql"/>
-</target>
-
-<target name="om" depends="configure">
-	<phing phingfile="build-propel.xml" target="om"/>
-</target>
-
-<target name="sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="sql"/>
-</target>
-
-</project>
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/pear/pear-propel-gen b/debian/propel/usr/share/php/propel/generator/pear/pear-propel-gen
deleted file mode 100644
index 588c107..0000000
--- a/debian/propel/usr/share/php/propel/generator/pear/pear-propel-gen
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# ------------------------------------------------------------------------
-# The phing build script for Unix based systems
-# $Id: pear-propel-gen,v 1.2 2004/10/17 13:24:09 hlellelid Exp $
-# ------------------------------------------------------------------------
-
-# -------------------------------------------------------------------------
-# Do not change anything below this line unless you know what you're doing.
-# -------------------------------------------------------------------------
-
-# (currently this is not reached)
-if (test -z "$PHING_COMMAND") ; then
-	echo "WARNING: PHP_COMMAND environment not set. (Assuming phing on PATH)"
-	export PHING_COMMAND="phing"
-fi
-
-$PHING_COMMAND -f @DATA-DIR@/propel_generator/pear-build.xml -Dproject.dir=$*
diff --git a/debian/propel/usr/share/php/propel/generator/pear/pear-propel-gen.bat b/debian/propel/usr/share/php/propel/generator/pear/pear-propel-gen.bat
deleted file mode 100644
index c6c4535..0000000
--- a/debian/propel/usr/share/php/propel/generator/pear/pear-propel-gen.bat
+++ /dev/null
@@ -1,24 +0,0 @@
- at ECHO OFF
-
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: The propel-gen build script for Windows based systems
-:: $Id: pear-propel-gen.bat,v 1.2 2004/10/17 13:24:09 hlellelid Exp $
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-::----------------------------------------------------------------------------------
-:: Please set following to the "phing" script.  By default this is expected to be
-:: on your path.  (You don't need to modify this file if that is the case.)
-  
-  SET phingScript=phing
-
-::---------------------------------------------------------------------------------
-::---------------------------------------------------------------------------------
-:: Do not modify below this line!! (Unless you know what your doing :)
-::---------------------------------------------------------------------------------
-::---------------------------------------------------------------------------------
-
-"%phingScript%" -f "@DATA-DIR@\propel_generator\pear-build.xml" -Dproject.dir=%*
-GOTO :EOF
-
-:PAUSE_END
-PAUSE
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/resources/dtd/database.dtd b/debian/propel/usr/share/php/propel/generator/resources/dtd/database.dtd
deleted file mode 100644
index a18514f..0000000
--- a/debian/propel/usr/share/php/propel/generator/resources/dtd/database.dtd
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-    Propel XML database schema DTD
-    $Id: database.dtd,v 1.7 2005/03/30 11:38:18 hlellelid Exp $
-
-    This is based very closely on the schema DTD for Torque, but
-    some differences do exist.
--->
-
-<!--
-
-defaultPhpNamingMethod determines how a table or column name,
-from the name attribute in the xml database file, is converted to a
-PHP class or method name.
-
-     nochange   - indicates not change is performed.
-     underscore - Underscores are removed, First letter is
-              capitalized, first letter after an underscore
-              is capitalized, the rest of the letters are
-              converted to lowercase.
-     phpname   - same as underscore, but no letters are converted
-              to lowercase.
--->
-
-<!ELEMENT database (external-schema*, table+, behavior+)>
-<!ATTLIST database
-  name CDATA #IMPLIED
-  defaultIdMethod (native|none) "none"
-  defaultTranslateMethode CDATA #IMPLIED
-  package CDATA #IMPLIED
-  baseClass CDATA #IMPLIED
-  basePeer CDATA #IMPLIED
-  defaultPhpNamingMethod (nochange|underscore|phpname) "underscore"
-  heavyIndexing (true|false) "false"
->
-
-<!ELEMENT external-schema EMPTY>
-<!ATTLIST external-schema
-  filename CDATA #REQUIRED
->
-
-<!--
-     note: the interface="true", requires that useManagers=true in the
-     properties file.
--->
-<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter|validator|behavior|vendor)*)>
-<!ATTLIST table
-  name CDATA #REQUIRED
-  phpName CDATA #IMPLIED
-  idMethod (native|autoincrement|sequence|none|null) "null"
-  skipSql (true|false) "false"
-  readOnly (true|false) "false"
-  abstract (true|false) "false"
-  treeMode (MaterializedPath|NestedSet|AdjacencyList) "AdjacencyList"
-  package CDATA #IMPLIED
-  baseClass CDATA #IMPLIED
-  basePeer CDATA #IMPLIED
-  alias CDATA #IMPLIED
-  interface CDATA #IMPLIED
-  phpNamingMethod (nochange|underscore|phpname) #IMPLIED
-  heavyIndexing (true|false) #IMPLIED
-  description CDATA #IMPLIED
->
-
-<!ELEMENT id-method-parameter EMPTY>
-<!ATTLIST id-method-parameter
-  name CDATA "default"
-  value CDATA #REQUIRED
->
-
-<!ELEMENT column ((inheritance|vendor)*)>
-<!ATTLIST column
-  name CDATA #REQUIRED
-  phpName CDATA #IMPLIED
-  peerName CDATA #IMPLIED
-  primaryKey (true|false) "false"
-  required (true|false) "false"
-  type
-    (
-          BIT  | TINYINT | SMALLINT    | INTEGER    | BIGINT    | FLOAT
-        | REAL | NUMERIC | DECIMAL     | CHAR       | VARCHAR   | LONGVARCHAR
-        | DATE | TIME    | TIMESTAMP   | BINARY     | VARBINARY | LONGVARBINARY
-        | NULL | OTHER   | PHP_OBJECT  | DISTINCT   | STRUCT    | ARRAY
-        | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
-        | DOUBLE | BOOLEAN
-    ) "VARCHAR"
-  phpType CDATA #IMPLIED
-  sqlType CDATA #IMPLIED
-  size CDATA #IMPLIED
-  scale CDATA #IMPLIED
-  default CDATA #IMPLIED
-  defaultValue CDATA #IMPLIED
-  defaultExpr CDATA #IMPLIED
-  autoIncrement (true|false) "false"
-  inheritance (single|false) "false"
-  inputValidator CDATA #IMPLIED
-  phpNamingMethod (nochange|underscore|phpname) #IMPLIED
-  description CDATA #IMPLIED
-  lazyLoad (true|false) "false"
-  primaryString (true|false) "false"
->
-
-<!ELEMENT inheritance EMPTY>
-<!ATTLIST inheritance
-  key CDATA #REQUIRED
-  class CDATA #REQUIRED
-  package CDATA #IMPLIED
-  extends CDATA #IMPLIED
->
-
-<!ELEMENT foreign-key (reference+, vendor*)>
-<!ATTLIST foreign-key
-  foreignTable CDATA #REQUIRED
-  name CDATA #IMPLIED
-  phpName CDATA #IMPLIED
-  refPhpName CDATA #IMPLIED
-  onUpdate (CASCADE|cascade|SETNULL|setnull|RESTRICT|restrict|NONE|none) "none"
-  onDelete (CASCADE|cascade|SETNULL|setnull|RESTRICT|restrict|NONE|none) "none"
->
-
-<!ELEMENT reference EMPTY>
-<!ATTLIST reference
-  local CDATA #REQUIRED
-  foreign CDATA #REQUIRED
->
-
-<!ELEMENT index (index-column+)>
-<!ATTLIST index
-  name CDATA #IMPLIED
->
-
-<!ELEMENT behavior (parameter+)>
-<!ATTLIST index
-  name CDATA #IMPLIED
->
-
-<!ELEMENT index-column (vendor*)>
-<!ATTLIST index-column
-  name CDATA #REQUIRED
-  size CDATA #IMPLIED
->
-
-<!ELEMENT unique (unique-column+)>
-<!ATTLIST unique
-  name CDATA #IMPLIED
->
-
-<!ELEMENT unique-column (vendor*)>
-<!ATTLIST unique-column
-  name CDATA #REQUIRED
->
-
-<!ELEMENT validator (rule+)>
-<!ATTLIST validator
-  column CDATA #REQUIRED
-  translate CDATA #IMPLIED
->
-
-<!ELEMENT rule EMPTY>
-<!ATTLIST rule
-  name (mask|maxLength|maxValue|minLength|minValue|required|unique|validValues|class) #REQUIRED
-  class CDATA #IMPLIED
-  value CDATA #IMPLIED
-  size ID #IMPLIED
-  message CDATA #IMPLIED
->
-
-<!ELEMENT vendor (parameter+)>
-<!ATTLIST vendor
-  type CDATA #REQUIRED
->
-
-<!ELEMENT parameter EMPTY>
-<!ATTLIST parameter
-  name CDATA #REQUIRED
-  value CDATA #REQUIRED
->
diff --git a/debian/propel/usr/share/php/propel/generator/resources/xsd/custom_datatypes.xsd b/debian/propel/usr/share/php/propel/generator/resources/xsd/custom_datatypes.xsd
deleted file mode 100755
index 12e8327..0000000
--- a/debian/propel/usr/share/php/propel/generator/resources/xsd/custom_datatypes.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:simpleType name='custom_datatypes'>
-		<xs:restriction base='xs:string'>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/generator/resources/xsd/database.xsd b/debian/propel/usr/share/php/propel/generator/resources/xsd/database.xsd
deleted file mode 100755
index 8a1d2ca..0000000
--- a/debian/propel/usr/share/php/propel/generator/resources/xsd/database.xsd
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<!-- XML Schema for the Propel schema file
-		  This is just the first draft derived from the existing DTD
-		  and some additional restrictions have been included
-
-		  Comments are a quite rare, I guess most things are pretty
-		  readable. An additional xml schema: custom_datatypes.xsd is
-		  also included. For now this file is unused, but that will
-		  change; don't worry.
-
-		  Ron -->
-
-	<xs:include schemaLocation="custom_datatypes.xsd"/>
-
-	<xs:element name="database" type="database"/>
-	<xs:element name="vendor" type="vendor"/>
-
-	<xs:simpleType name="file">
-		<xs:restriction base="xs:string">
-			<!-- Match any relative or absolute path and file containing letters, numbers and _ -->
-			<xs:pattern value="((\.{1,2}|[\w_]*)/)*([\w_]*\.?)+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="default_datatypes">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="BIT"/>
-			<xs:enumeration value="TINYINT"/>
-			<xs:enumeration value="SMALLINT"/>
-			<xs:enumeration value="INTEGER"/>
-			<xs:enumeration value="BIGINT"/>
-			<xs:enumeration value="FLOAT"/>
-			<xs:enumeration value="REAL"/>
-			<xs:enumeration value="NUMERIC"/>
-			<xs:enumeration value="DECIMAL"/>
-			<xs:enumeration value="CHAR"/>
-			<xs:enumeration value="VARCHAR"/>
-			<xs:enumeration value="LONGVARCHAR"/>
-			<xs:enumeration value="DATE"/>
-			<xs:enumeration value="TIME"/>
-			<xs:enumeration value="TIMESTAMP"/>
-			<xs:enumeration value="BINARY"/>
-			<xs:enumeration value="VARBINARY"/>
-			<xs:enumeration value="LONGVARBINARY"/>
-			<xs:enumeration value="NULL"/>
-			<xs:enumeration value="OTHER"/>
-			<xs:enumeration value="PHP_OBJECT"/>
-			<xs:enumeration value="DISTINCT"/>
-			<xs:enumeration value="STRUCT"/>
-			<xs:enumeration value="ARRAY"/>
-			<xs:enumeration value="BLOB"/>
-			<xs:enumeration value="CLOB"/>
-			<xs:enumeration value="REF"/>
-			<xs:enumeration value="BOOLEANINT"/>
-			<xs:enumeration value="BOOLEANCHAR"/>
-			<xs:enumeration value="DOUBLE"/>
-			<xs:enumeration value="BOOLEAN"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="datatype">
-		<xs:union memberTypes="default_datatypes custom_datatypes"/>
-	</xs:simpleType>
-
-	<xs:simpleType name="dbidmethod">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="native"/>
-			<xs:enumeration value="none"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="tbidmethod">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="autoincrement"/>
-			<xs:enumeration value="sequence"/>
-			<xs:enumeration value="null"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="idmethod">
-		<xs:union memberTypes="dbidmethod tbidmethod"/>
-	</xs:simpleType>
-
-	<xs:simpleType name="phpnamingmethod">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="nochange"/>
-			<xs:enumeration value="underscore"/>
-			<xs:enumeration value="phpname"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="delete">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cascade"/>
-			<xs:enumeration value="set null"/>
-			<xs:enumeration value="setnull"/>
-			<xs:enumeration value="restrict"/>
-			<xs:enumeration value="none"/>
-			<xs:enumeration value=""/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="update">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cascade"/>
-			<xs:enumeration value="setnull"/>
-			<xs:enumeration value="set null"/>
-			<xs:enumeration value="restrict"/>
-			<xs:enumeration value="none"/>
-			<xs:enumeration value=""/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="rulename">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="mask"/>
-			<xs:enumeration value="maxLength"/>
-			<xs:enumeration value="maxValue"/>
-			<xs:enumeration value="minLength"/>
-			<xs:enumeration value="minValue"/>
-			<xs:enumeration value="required"/>
-			<xs:enumeration value="unique"/>
-			<xs:enumeration value="validValues"/>
-			<xs:enumeration value="notMatch"/>
-			<xs:enumeration value="match"/>
-			<xs:enumeration value="class"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="inh_option">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="single"/>
-			<xs:enumeration value="false"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="sql_type">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w\s\[\]\(\),\.']+"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="php_type">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="treemode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AdjacencyList"/>
-			<xs:enumeration value="MaterializedPath"/>
-			<xs:enumeration value="NestedSet"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Visibility for column accessor and mutator methods -->
-	<xs:simpleType name="visibility">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="public"/>
-			<xs:enumeration value="protected"/>
-			<xs:enumeration value="private"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict column name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="column_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict php name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="php_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict php class name to letters (upper- and lowercase), numbers and the _. Dot seperated -->
-	<xs:simpleType name="php_class">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="([\w_]+.?)+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict table name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="table_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict index name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="index_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict foreign column name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="foreign_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="parameter">
-		<xs:attribute name="name" type="xs:string" use="required"/>
-		<xs:attribute name="value" type="xs:string" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="validator">
-		<xs:sequence>
-			<xs:element name="rule" type="rule" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="column" type="column_name" use="required"/>
-		<xs:attribute name="translate" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="vendor">
-		<xs:sequence>
-			<xs:element name="parameter" type="parameter" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="type" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="rule">
-		<xs:attribute name="name" type="rulename" use="required"/>
-		<xs:attribute name="value" type="xs:string" use="optional"/>
-		<xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
-		<xs:attribute name="message" type="xs:string" use="optional"/>
-		<xs:attribute name="class" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="id-method-parameter">
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="value" type="xs:string" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="index">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="index-column" type="index-column" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="index_name" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="unique">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="unique-column" type="unique-column" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="index_name" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="index-column">
-		<xs:sequence>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="name" type="column_name" use="required"/>
-		<xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="unique-column">
-		<xs:sequence>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="name" type="column_name" use="required"/>
-		<xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="inheritance">
-		<xs:attribute name="key" type="xs:string" use="required"/>
-		<xs:attribute name="class" type="xs:string" use="required"/>
-		<xs:attribute name="package" type="xs:string" use="optional"/>
-		<xs:attribute name="extends" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="reference">
-		<xs:attribute name="local" type="column_name" use="required"/>
-		<xs:attribute name="foreign" type="column_name" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="behavior">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="column">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="inheritance" type="inheritance" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="column_name" use="required"/>
-		<xs:attribute name="phpName" type="php_name" use="optional"/>
-		<xs:attribute name="peerName" type="php_class" use="optional"/>
-		<xs:attribute name="prefix" type="column_name" use="optional"/>
-		<xs:attribute name="accessorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="mutatorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="primaryKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="required" type="xs:boolean" default="false"/>
-		<xs:attribute name="type" type="datatype" default="VARCHAR"/>
-		<xs:attribute name="sqlType" type="sql_type" use="optional"/>
-		<xs:attribute name="phpType" type="php_type" use="optional"/>
-		<xs:attribute name="size" type="xs:nonNegativeInteger" use="optional"/>
-		<xs:attribute name="scale" type="xs:nonNegativeInteger" use="optional"/>
-		<xs:attribute name="default" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultExpr" type="xs:string" use="optional"/>
-		<xs:attribute name="autoIncrement" type="xs:boolean" default="false"/>
-		<xs:attribute name="inheritance" type="inh_option" default="false"/>
-		<xs:attribute name="inputValidator" type="xs:string" use="optional"/>
-		<xs:attribute name="phpNamingMethod" type="phpnamingmethod" use="optional"/>
-		<xs:attribute name="description" type="xs:string" use="optional"/>
-		<xs:attribute name="lazyLoad" type="xs:boolean" default="false"/>
-		<xs:attribute name="nodeKeySep" type="xs:string" use="optional"/>
-		<xs:attribute name="nodeKey" type="xs:string" use="optional"/>
-		<xs:attribute name="nestedSetLeftKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="nestedSetRightKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="treeScopeKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="require" type="xs:string" use="optional"/>
-		<xs:attribute name="primaryString" type="xs:boolean" default="false"/>
-	</xs:complexType>
-
-	<xs:complexType name="foreign-key">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="reference" type="reference" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="foreignTable" type="table_name" use="required"/>
-		<xs:attribute name="name" type="foreign_name" use="optional"/>
-		<xs:attribute name="phpName" type="php_name" use="optional"/>
-		<xs:attribute name="refPhpName" type="php_name" use="optional"/>
-		<xs:attribute name="onDelete" type="delete" default="none"/>
-		<xs:attribute name="onUpdate" type="update" default="none"/>
-	</xs:complexType>
-
-	<xs:complexType name="external-schema">
-		<xs:attribute name="filename" type="file" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="table">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="column" type="column" maxOccurs="unbounded"/>
-			<xs:element name="foreign-key" type="foreign-key" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="index" type="index" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="unique" type="unique" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="id-method-parameter" type="id-method-parameter" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="validator" type="validator" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="behavior" type="behavior" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="table_name" use="required"/>
-		<xs:attribute name="phpName" type="php_class" use="optional"/>
-		<xs:attribute name="columnPrefix" type="column_name" use="optional"/>
-		<xs:attribute name="defaultAccessorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="defaultMutatorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="idMethod" type="idmethod" use='optional'/>
-		<xs:attribute name="allowPkInsert" type="xs:boolean" default="false" use="optional"/>
-		<xs:attribute name="skipSql" type="xs:boolean" default="false"/>
-		<xs:attribute name="readOnly" type="xs:boolean" default="false"/>
-		<xs:attribute name="abstract" type="xs:boolean" default="false"/>
-		<xs:attribute name="baseClass" type="php_class" use="optional"/>
-		<xs:attribute name="basePeer" type="php_class" use="optional"/>
-		<xs:attribute name="alias" type="table_name" use="optional"/>
-		<xs:attribute name="package" type="xs:string" use="optional"/>
-		<xs:attribute name="interface" type="xs:string" use="optional"/>
-		<xs:attribute name="phpNamingMethod" type="phpnamingmethod" use='optional'/>
-		<xs:attribute name="heavyIndexing" type="xs:boolean" use="optional"/>
-		<xs:attribute name="description" type="xs:string"/>
-		<xs:attribute name="treeMode" type="treemode" use="optional"/>
-		<xs:attribute name="reloadOnInsert" type="xs:boolean" default="false"/>
-		<xs:attribute name="reloadOnUpdate" type="xs:boolean" default="false"/>
-	</xs:complexType>
-
-	<xs:complexType name="database">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="external-schema" type="external-schema" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="table" type="table" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element name="behavior" type="behavior" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultIdMethod" type="dbidmethod" default="none"/>
-		<xs:attribute name="defaultTranslateMethod" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultAccessorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="defaultMutatorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="package" type="php_class" use="optional"/>
-		<xs:attribute name="baseClass" type="php_class" use="optional"/>
-		<xs:attribute name="basePeer" type="php_class" use="optional"/>
-		<xs:attribute name="defaultPhpNamingMethod" type="phpnamingmethod" default="underscore"/>
-		<xs:attribute name="heavyIndexing" type="xs:boolean" default="false"/>
-	</xs:complexType>
-</xs:schema>
diff --git a/debian/propel/usr/share/php/propel/generator/resources/xsl/database.xsl b/debian/propel/usr/share/php/propel/generator/resources/xsl/database.xsl
deleted file mode 100755
index 81d8217..0000000
--- a/debian/propel/usr/share/php/propel/generator/resources/xsl/database.xsl
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<!--
-	XSL Stylesheet to normalize a database schema
-	-->
-
-	<!--
-	Output indented UTF 8 XML 
-	-->
-	<xsl:output method="xml" indent="yes" encoding="UTF-8" />
-
-	<!--
-	Matches root database node, the only allowed root node
-
-	Starts the normalization process
-	-->
-	<xsl:template match='/database'>
-		<database>
-			<xsl:if test='not(boolean(@defaultIdMethod))'>
-				<xsl:attribute name='defaultIdMethod'>native</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@defaultPhpNamingMethod))'>
-				<xsl:attribute name='defaultPhpNamingMethod'>underscore</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@heavyIndexing))'>
-				<xsl:attribute name='heavyIndexing'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='external-schema'/>
-			<xsl:apply-templates select='table'/>
-			<xsl:apply-templates select='behavior'/>
-		</database>
-	</xsl:template>
-
-	<!--
-	Normalizes any defaultPhpNamingMethod attribute by making it lowercase
-	-->	
-	<xsl:template match='@defaultPhPNamingMethod'>
-		<xsl:attribute name='defaultPhPNamingMethod'><xsl:value-of select='translate(., "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'/></xsl:attribute>
-	</xsl:template>
-
-	<!--
-	Normalizes any onDelete attribute by making it lowercase, or none if it is empty (makes onDelete='' act the same as onDelete='none')
-	-->	
-	<xsl:template match='@onDelete' name='onDelete'>
-		<xsl:choose>
-			<xsl:when test='.=""'>
-				<xsl:attribute name='onDelete'>none</xsl:attribute>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:attribute name='onDelete'><xsl:value-of select='translate(., "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'/></xsl:attribute>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!--
-	Handle OnDelete the same as onDelete
-	-->
-	<xsl:template match='@OnDelete'>
-		<xsl:call-template name='onDelete'/>
-	</xsl:template>
-
-	<!--
-	Normalizes any onUpdate attribute by making it lowercase, or none if it is empty (similar to onDelete)
-	-->	
-	<xsl:template match='@onUpdate' name='onUpdate'>
-		<xsl:choose>
-			<xsl:when test='.=""'>
-				<xsl:attribute name='onUpdate'>none</xsl:attribute>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:attribute name='onUpdate'><xsl:value-of select='translate(., "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'/></xsl:attribute>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!--
-	Handle OnUpdate the same as onUpdate
-	-->
-	<xsl:template match='@OnUpdate'>
-		<xsl:call-template name='onUpdate'/>
-	</xsl:template>
-
-	<!--
-	Tranlate IdMethod attribute to idMethod attribute
-	-->
-	<xsl:template match='@IdMethod'>
-		<xsl:attribute name='idMethod'><xsl:value-of select='.'/></xsl:attribute>
-	</xsl:template>
-
-	<!--
-	Just copy any attribute
-	-->
-	<xsl:template match='@*' priority='-1'>
-		<xsl:copy-of select='.'/>
-	</xsl:template>
-
-	<!--
-	Normalize a table, add some attribute with default values if ommitted and normalize all attribute and childnodes
-	-->
-	<xsl:template match='table'>
-		<table>
-			<xsl:if test='not(boolean(@skipSql))'>
-				<xsl:attribute name='skipSql'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@abstract))'>
-				<xsl:attribute name='abstract'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='column'/>
-			<xsl:apply-templates select='foreign-key'/>
-			<xsl:apply-templates select='index'/>
-			<xsl:apply-templates select='unique'/>
-			<xsl:apply-templates select='id-method-parameter'/>
-			<xsl:apply-templates select='validator'/>
-			<xsl:apply-templates select='vendor'/>
-			<xsl:apply-templates select='behavior'/>
-		</table>
-	</xsl:template>
-
-	<!--
-	Normalize a foreign-key, add some attribute with default values if ommitted and normalize all attribute and childnodes
-	-->
-	<xsl:template match='foreign-key'>
-		<foreign-key>
-			<xsl:if test='not(boolean(@onDelete)) and not(boolean(@OnDelete))'>
-				<xsl:attribute name='onDelete'>none</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@onUpdate)) and not(boolean(@OnUpdate))'>
-				<xsl:attribute name='onUpdate'>none</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='reference'/>
-			<xsl:apply-templates select='vendor'/>
-		</foreign-key>
-	</xsl:template>
-
-	<!--
-	Just copy the index node with attributes and add the index-column
-	-->
-	<xsl:template match='index'>
-		<index>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='index-column'/>
-		</index>
-	</xsl:template>
-
-	<!--
-	Just copy the unique node with attributes and add the unique-column
-	-->
-	<xsl:template match='unique'>
-		<unique>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='unique-column'/>
-		</unique>
-	</xsl:template>
-
-	<!--
-	Just copy the behavior node with attributes and add the param
-	-->
-	<xsl:template match='behavior'>
-		<behavior>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='parameter'/>
-		</behavior>
-	</xsl:template>
-
-
-	<!--
-	Just copy the unique-column node with attributes and add the vendor node
-	-->
-	<xsl:template match='unique-column'>
-		<unique-column>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='vendor'/>
-		</unique-column>
-	</xsl:template>
-
-	<!--
-	Just copy the index-column node with attributes and add the vendor node
-	-->
-	<xsl:template match='index-column'>
-		<index-column>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='vendor'/>
-		</index-column>
-	</xsl:template>
-
-	<!--
-	Add default name to id-method-parameter (if none) and copy its attributes
-	-->
-	<xsl:template match='id-method-parameter'>
-		<id-method-parameter>
-			<xsl:if test='not(boolean(@name))'>
-				<xsl:attribute name='name'>default</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-		</id-method-parameter>
-	</xsl:template>
-
-	<!--
-	Just copy the validator node with attributes and add the rule node
-	-->
-	<xsl:template match='validator'>
-		<validator>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='rule'/>
-		</validator>
-	</xsl:template>
-
-	<!--
-	Adds a default name to the rule (if none given) and copy the attributes
-	-->
-	<xsl:template match='rule'>
-		<rule>
-			<xsl:if test='not(boolean(@name))'>
-				<xsl:attribute name='name'>class</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-		</rule>
-	</xsl:template>
-
-	<!--
-	Strip all childnodes (if any) from a parameter node
-	-->
-	<xsl:template match='parameter'>
-		<parameter>
-			<xsl:apply-templates select='@*'/>
-		</parameter>
-	</xsl:template>
-
-	<!--
-	Just copy the vendor node with attributes and add the parameter node
-	-->
-	<xsl:template match='vendor'>
-		<vendor>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='parameter'/>
-		</vendor>
-	</xsl:template>
-
-	<!--
-	Strip all childnodes from an inheritance node
-	-->
-	<xsl:template match='inheritance'>
-		<inheritance>
-			<xsl:apply-templates select='@*'/>
-		</inheritance>
-	</xsl:template>
-
-	<!--
-	Normalize a column node, add default values for missing attributes and copy the content
-	-->
-	<xsl:template match='column'>
-		<column>
-			<xsl:if test='not(boolean(@primaryKey))'>
-				<xsl:attribute name='primaryKey'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@required))'>
-				<xsl:attribute name='required'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@type))'>
-				<xsl:attribute name='type'>VARCHAR</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@autoIncrement))'>
-				<xsl:attribute name='autoIncrement'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@lazyLoad))'>
-				<xsl:attribute name='lazyLoad'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='@type = "VARCHAR" and not(boolean(@sqlType)) and not(boolean(@size))'>
-				<xsl:attribute name='size'>255</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='inheritance'/>
-			<xsl:apply-templates select='vendor'/>
-		</column>
-	</xsl:template>
-
-	<!--
-	Strip all childnodes from an reference node
-	-->
-	<xsl:template match='reference'>
-		<reference>
-			<xsl:apply-templates select='@*'/>
-		</reference>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/Propel.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/Propel.php
deleted file mode 100644
index aca6596..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/Propel.php
+++ /dev/null
@@ -1,841 +0,0 @@
-<?php
-/*
- *  $Id: Propel.php 1452 2010-01-12 22:39:15Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require 'propel/PropelException.php';
-require 'propel/adapter/DBAdapter.php';
-require 'propel/util/PropelPDO.php';
-
-/**
- * Propel's main resource pool and initialization & configuration class.
- *
- * This static class is used to handle Propel initialization and to maintain all of the
- * open database connections and instantiated database maps.
- *
- * @author     Hans Lellelid <hans at xmpl.rg> (Propel)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @author     Magnús Þór Torfason <magnus at handtolvur.is> (Torque)
- * @author     Jason van Zyl <jvanzyl at apache.org> (Torque)
- * @author     Rafal Krzewski <Rafal.Krzewski at e-point.pl> (Torque)
- * @author     Martin Poeschl <mpoeschl at marmot.at> (Torque)
- * @author     Henning P. Schmiedehausen <hps at intermeta.de> (Torque)
- * @author     Kurt Schrader <kschrader at karmalab.org> (Torque)
- * @version    $Revision: 1452 $
- * @package    propel
- */
-class Propel
-{
-	/**
-	 * A constant for <code>default</code>.
-	 */
-	const DEFAULT_NAME = "default";
-
-	/**
-	 * A constant defining 'System is unusuable' logging level
-	 */
-	const LOG_EMERG = 0;
-
-	/**
-	 * A constant defining 'Immediate action required' logging level
-	 */
-	const LOG_ALERT = 1;
-
-	/**
-	 * A constant defining 'Critical conditions' logging level
-	 */
-	const LOG_CRIT = 2;
-
-	/**
-	 * A constant defining 'Error conditions' logging level
-	 */
-	const LOG_ERR = 3;
-
-	/**
-	 * A constant defining 'Warning conditions' logging level
-	 */
-	const LOG_WARNING = 4;
-
-	/**
-	 * A constant defining 'Normal but significant' logging level
-	 */
-	const LOG_NOTICE = 5;
-
-	/**
-	 * A constant defining 'Informational' logging level
-	 */
-	const LOG_INFO = 6;
-
-	/**
-	 * A constant defining 'Debug-level messages' logging level
-	 */
-	const LOG_DEBUG = 7;
-
-	/**
-	 * The Propel version.
-	 */
-	const VERSION = '1.4.1';
-
-	/**
-	 * The class name for a PDO object.
-	 */
-	const CLASS_PDO = 'PDO';
-
-	/**
-	 * The class name for a PropelPDO object.
-	 */
-	const CLASS_PROPEL_PDO = 'PropelPDO';
-
-	/**
-	 * The class name for a DebugPDO object.
-	 */
-	const CLASS_DEBUG_PDO = 'DebugPDO';
-
-	/**
-	 * Constant used to request a READ connection (applies to replication).
-	 */
-	const CONNECTION_READ = 'read';
-
-	/**
-	 * Constant used to request a WRITE connection (applies to replication).
-	 */
-	const CONNECTION_WRITE = 'write';
-
-	/**
-	 * @var        string The db name that is specified as the default in the property file
-	 */
-	private static $defaultDBName;
-
-	/**
-	 * @var        array The global cache of database maps
-	 */
-	private static $dbMaps = array();
-
-	/**
-	 * @var        array The cache of DB adapter keys
-	 */
-	private static $adapterMap = array();
-
-	/**
-	 * @var        array Cache of established connections (to eliminate overhead).
-	 */
-	private static $connectionMap = array();
-
-	/**
-	 * @var        PropelConfiguration Propel-specific configuration.
-	 */
-	private static $configuration;
-
-	/**
-	 * @var        bool flag to set to true once this class has been initialized
-	 */
-	private static $isInit = false;
-
-	/**
-	 * @var        Log optional logger
-	 */
-	private static $logger = null;
-
-	/**
-	 * @var        string The name of the database mapper class
-	 */
-	private static $databaseMapClass = 'DatabaseMap';
-
-	/**
-	 * @var        bool Whether the object instance pooling is enabled
-	 */
-	private static $instancePoolingEnabled = true;
-
-	/**
-	 * @var        bool For replication, whether to force the use of master connection.
-	 */
-	private static $forceMasterConnection = false;
-
-	/**
-	 * @var        array A map of class names and their file paths for autoloading
-	 */
-	private static $autoloadMap = array(
-		'PropelException' => 'propel/PropelException.php',
-
-		'DBAdapter'       => 'propel/adapter/DBAdapter.php',
-		'DBMSSQL'         => 'propel/adapter/DBMSSQL.php',
-		'MssqlPropelPDO'  => 'propel/adapter/MSSQL/MssqlPropelPDO.php',
-		'MssqlDebugPDO'   => 'propel/adapter/MSSQL/MssqlDebugPDO.php',	
-		'MssqlDateTime'   => 'propel/adapter/MSSQL/MssqlDateTime.class.php',
-		'DBMySQL'         => 'propel/adapter/DBMySQL.php',
-		'DBMySQLi'        => 'propel/adapter/DBMySQLi.php',
-		'DBNone'          => 'propel/adapter/DBNone.php',
-		'DBOracle'        => 'propel/adapter/DBOracle.php',
-		'DBPostgres'      => 'propel/adapter/DBPostgres.php',
-		'DBSQLite'        => 'propel/adapter/DBSQLite.php',
-		'DBSybase'        => 'propel/adapter/DBSybase.php',
-
-		'BasicLogger'       => 'propel/logger/BasicLogger.php',
-		'MojaviLogAdapter'  => 'propel/logger/MojaviLogAdapter.php',
-
-		'ColumnMap'    => 'propel/map/ColumnMap.php',
-		'DatabaseMap'  => 'propel/map/DatabaseMap.php',
-		'TableMap'     => 'propel/map/TableMap.php',
-		'RelationMap'  => 'propel/map/RelationMap.php',
-		'ValidatorMap' => 'propel/map/ValidatorMap.php',
-
-		'BaseObject'                    => 'propel/om/BaseObject.php',
-		'NodeObject'                    => 'propel/om/NodeObject.php',
-		'Persistent'                    => 'propel/om/Persistent.php',
-		'PreOrderNodeIterator'          => 'propel/om/PreOrderNodeIterator.php',
-		'NestedSetPreOrderNodeIterator' => 'propel/om/NestedSetPreOrderNodeIterator.php',
-		'NestedSetRecursiveIterator'    => 'propel/om/NestedSetRecursiveIterator.php',
-
-		'BasePeer'            => 'propel/util/BasePeer.php',
-		'NodePeer'            => 'propel/util/NodePeer.php',
-		'Criteria'            => 'propel/util/Criteria.php',
-		'Join'                => 'propel/util/Join.php',
-		'PeerInfo'            => 'propel/util/PeerInfo.php',
-		'PropelColumnTypes'   => 'propel/util/PropelColumnTypes.php',
-		'PropelConfiguration' => 'propel/util/PropelConfiguration.php',
-		'PropelConfigurationIterator' => 'propel/util/PropelConfigurationIterator.php',
-		'PropelPDO'           => 'propel/util/PropelPDO.php',
-		'PropelPager'         => 'propel/util/PropelPager.php',
-		'PropelDateTime'      => 'propel/util/PropelDateTime.php',
-		'DebugPDO'            => 'propel/util/DebugPDO.php',
-		'DebugPDOStatement'   => 'propel/util/DebugPDOStatement.php',
-
-
-		'BasicValidator'      => 'propel/validator/BasicValidator.php',
-		'MatchValidator'      => 'propel/validator/MatchValidator.php',
-		'MaxLengthValidator'  => 'propel/validator/MaxLengthValidator.php',
-		'MaxValueValidator'   => 'propel/validator/MaxValueValidator.php',
-		'MinLengthValidator'  => 'propel/validator/MinLengthValidator.php',
-		'MinValueValidator'   => 'propel/validator/MinValueValidator.php',
-		'NotMatchValidator'   => 'propel/validator/NotMatchValidator.php',
-		'RequiredValidator'   => 'propel/validator/RequiredValidator.php',
-		'UniqueValidator'     => 'propel/validator/UniqueValidator.php',
-		'ValidValuesValidator' => 'propel/validator/ValidValuesValidator.php',
-		'ValidationFailed'    => 'propel/validator/ValidationFailed.php',
-	);
-
-	/**
-	 * Initializes Propel
-	 *
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *                             rethrown wrapped into a PropelException.
-	 */
-	public static function initialize()
-	{
-		if (self::$configuration === null) {
-			throw new PropelException("Propel cannot be initialized without a valid configuration. Please check the log files for further details.");
-		}
-
-		self::configureLogging();
-
-		// reset the connection map (this should enable runtime changes of connection params)
-		self::$connectionMap = array();
-		
-		if (isset(self::$configuration['classmap']) && is_array(self::$configuration['classmap'])) {
-		  self::$autoloadMap = array_merge(self::$configuration['classmap'], self::$autoloadMap);
-	  }
-		
-		self::$isInit = true;
-	}
-
-	/**
-	 * Configure Propel using a PHP (array) config file.
-	 *
-	 * @param      string Path (absolute or relative to include_path) to config file.
-	 *
-	 * @throws     PropelException If configuration file cannot be opened.
-	 *                             (E_WARNING probably will also be raised by PHP)
-	 */
-	public static function configure($configFile)
-	{
-		$configuration = include($configFile);
-		if ($configuration === false) {
-			throw new PropelException("Unable to open configuration file: " . var_export($configFile, true));
-		}
-		self::setConfiguration($configuration);
-	}
-
-	/**
-	 * Configure the logging system, if config is specified in the runtime configuration.
-	 */
-	protected static function configureLogging()
-	{
-		if (self::$logger === null) {
-			if (isset(self::$configuration['log']) && is_array(self::$configuration['log']) && count(self::$configuration['log'])) {
-				include_once 'Log.php'; // PEAR Log class
-				$c = self::$configuration['log'];
-				$type = isset($c['type']) ? $c['type'] : 'file';
-				$name = isset($c['name']) ? $c['name'] : './propel.log';
-				$ident = isset($c['ident']) ? $c['ident'] : 'propel';
-				$conf = isset($c['conf']) ? $c['conf'] : array();
-				$level = isset($c['level']) ? $c['level'] : PEAR_LOG_DEBUG;
-				self::$logger = Log::singleton($type, $name, $ident, $conf, $level);
-			} // if isset()
-		}
-	}
-
-	/**
-	 * Initialization of Propel with a PHP (array) configuration file.
-	 *
-	 * @param      string $c The Propel configuration file path.
-	 *
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *                             rethrown wrapped into a PropelException.
-	 */
-	public static function init($c)
-	{
-		self::configure($c);
-		self::initialize();
-	}
-
-	/**
-	 * Determine whether Propel has already been initialized.
-	 *
-	 * @return     bool True if Propel is already initialized.
-	 */
-	public static function isInit()
-	{
-		return self::$isInit;
-	}
-
-	/**
-	 * Sets the configuration for Propel and all dependencies.
-	 *
-	 * @param      mixed The Configuration (array or PropelConfiguration)
-	 */
-	public static function setConfiguration($c)
-	{
-		if (is_array($c)) {
-			if (isset($c['propel']) && is_array($c['propel'])) {
-			  $c = $c['propel'];
-		  }
-			$c = new PropelConfiguration($c);
-		}
-		self::$configuration = $c;
-	}
-
-	/**
-	 * Get the configuration for this component.
-	 *
-	 * @param      int - PropelConfiguration::TYPE_ARRAY: return the configuration as an array
-	 *                   (for backward compatibility this is the default)
-	 *                 - PropelConfiguration::TYPE_ARRAY_FLAT: return the configuration as a flat array
-	 *                   ($config['name.space.item'])
-	 *                 - PropelConfiguration::TYPE_OBJECT: return the configuration as a PropelConfiguration instance
-	 * @return     mixed The Configuration (array or PropelConfiguration)
-	 */
-	public static function getConfiguration($type = PropelConfiguration::TYPE_ARRAY)
-	{
-		return self::$configuration->getParameters($type);
-	}
-
-	/**
-	 * Override the configured logger.
-	 *
-	 * This is primarily for things like unit tests / debugging where
-	 * you want to change the logger without altering the configuration file.
-	 *
-	 * You can use any logger class that implements the propel.logger.BasicLogger
-	 * interface.  This interface is based on PEAR::Log, so you can also simply pass
-	 * a PEAR::Log object to this method.
-	 *
-	 * @param      object The new logger to use. ([PEAR] Log or BasicLogger)
-	 */
-	public static function setLogger($logger)
-	{
-		self::$logger = $logger;
-	}
-
-	/**
-	 * Returns true if a logger, for example PEAR::Log, has been configured,
-	 * otherwise false.
-	 *
-	 * @return     bool True if Propel uses logging
-	 */
-	public static function hasLogger()
-	{
-		return (self::$logger !== null);
-	}
-
-	/**
-	 * Get the configured logger.
-	 *
-	 * @return     object Configured log class ([PEAR] Log or BasicLogger).
-	 */
-	public static function logger()
-	{
-		return self::$logger;
-	}
-
-	/**
-	 * Logs a message
-	 * If a logger has been configured, the logger will be used, otherwrise the
-	 * logging message will be discarded without any further action
-	 *
-	 * @param      string The message that will be logged.
-	 * @param      string The logging level.
-	 *
-	 * @return     bool True if the message was logged successfully or no logger was used.
-	 */
-	public static function log($message, $level = self::LOG_DEBUG)
-	{
-		if (self::hasLogger()) {
-			$logger = self::logger();
-			switch ($level) {
-				case self::LOG_EMERG:
-					return $logger->log($message, $level);
-				case self::LOG_ALERT:
-					return $logger->alert($message);
-				case self::LOG_CRIT:
-					return $logger->crit($message);
-				case self::LOG_ERR:
-					return $logger->err($message);
-				case self::LOG_WARNING:
-					return $logger->warning($message);
-				case self::LOG_NOTICE:
-					return $logger->notice($message);
-				case self::LOG_INFO:
-					return $logger->info($message);
-				default:
-					return $logger->debug($message);
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the database map information. Name relates to the name
-	 * of the connection pool to associate with the map.
-	 *
-	 * The database maps are "registered" by the generated map builder classes.
-	 *
-	 * @param      string The name of the database corresponding to the DatabaseMap to retrieve.
-	 *
-	 * @return     DatabaseMap The named <code>DatabaseMap</code>.
-	 *
-	 * @throws     PropelException - if database map is null or propel was not initialized properly.
-	 */
-	public static function getDatabaseMap($name = null)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-			if ($name === null) {
-				throw new PropelException("DatabaseMap name is null!");
-			}
-		}
-
-		if (!isset(self::$dbMaps[$name])) {
-			$clazz = self::$databaseMapClass;
-			self::$dbMaps[$name] = new $clazz($name);
-		}
-
-		return self::$dbMaps[$name];
-	}
-
-	/**
-	 * Sets the database map object to use for specified datasource.
-	 *
-	 * @param      string $name The datasource name.
-	 * @param      DatabaseMap $map The database map object to use for specified datasource.
-	 */
-	public static function setDatabaseMap($name, DatabaseMap $map)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		self::$dbMaps[$name] = $map;
-	}
-
-	/**
-	 * For replication, set whether to always force the use of a master connection.
-	 *
-	 * @param      boolean $bit True or False
-	 */
-	public static function setForceMasterConnection($bit)
-	{
-		self::$forceMasterConnection = (bool) $bit;
-	}
-
-	/**
-	 * For replication, whether to always force the use of a master connection.
-	 *
-	 * @return     boolean
-	 */
-	public static function getForceMasterConnection()
-	{
-		return self::$forceMasterConnection;
-	}
-
-	/**
-	 * Sets a Connection for specified datasource name.
-	 *
-	 * @param      string $name The datasource name for the connection being set.
-	 * @param      PropelPDO $con The PDO connection.
-	 * @param      string $mode Whether this is a READ or WRITE connection (Propel::CONNECTION_READ, Propel::CONNECTION_WRITE)
-	 */
-	public static function setConnection($name, PropelPDO $con, $mode = Propel::CONNECTION_WRITE)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		if ($mode == Propel::CONNECTION_READ) {
-			self::$connectionMap[$name]['slave'] = $con;
-		} else {
-			self::$connectionMap[$name]['master'] = $con;
-		}
-	}
-
-	/**
-	 * Gets an already-opened PDO connection or opens a new one for passed-in db name.
-	 *
-	 * @param      string $name The datasource name that is used to look up the DSN from the runtime configuation file.
-	 * @param      string $mode The connection mode (this applies to replication systems).
-	 *
-	 * @return     PDO A database connection
-	 *
-	 * @throws     PropelException - if connection cannot be configured or initialized.
-	 */
-	public static function getConnection($name = null, $mode = Propel::CONNECTION_WRITE)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-
-		// IF a WRITE-mode connection was requested
-		// or Propel is configured to always use the master connection
-		// or the slave for this connection has already been set to FALSE (indicating no slave)
-		// THEN return the master connection.
-		if ($mode != Propel::CONNECTION_READ || self::$forceMasterConnection || (isset(self::$connectionMap[$name]['slave']) && self::$connectionMap[$name]['slave'] === false)) {
-			if (!isset(self::$connectionMap[$name]['master'])) {
-				// load connection parameter for master connection
-				$conparams = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
-				if (empty($conparams)) {
-					throw new PropelException('No connection information in your runtime configuration file for datasource ['.$name.']');
-				}
-				// initialize master connection
-				$con = Propel::initConnection($conparams, $name);
-				self::$connectionMap[$name]['master'] = $con;
-			}
-
-			return self::$connectionMap[$name]['master'];
-
-		} else {
-
-			if (!isset(self::$connectionMap[$name]['slave'])) {
-
-				// we've already ensured that the configuration exists, in previous if-statement
-				$slaveconfigs = isset(self::$configuration['datasources'][$name]['slaves']) ? self::$configuration['datasources'][$name]['slaves'] : null;
-
-				if (empty($slaveconfigs)) { // no slaves configured for this datasource
-					self::$connectionMap[$name]['slave'] = false;
-					return self::getConnection($name, Propel::CONNECTION_WRITE); // Recurse to get the WRITE connection
-				} else { // Initialize a new slave
-					if (isset($slaveconfigs['connection']['dsn'])) { // only one slave connection configured
-						$conparams = $slaveconfigs['connection'];
-					} else {
-						$randkey = array_rand($slaveconfigs['connection']);
-						$conparams = $slaveconfigs['connection'][$randkey];
-						if (empty($conparams)) {
-							throw new PropelException('No connection information in your runtime configuration file for SLAVE ['.$randkey.'] to datasource ['.$name.']');
-						}
-					}
-
-					// initialize master connection
-					$con = Propel::initConnection($conparams, $name);
-					self::$connectionMap[$name]['slave'] = $con;
-				}
-
-			} // if datasource slave not set
-
-			return self::$connectionMap[$name]['slave'];
-
-		} // if mode == CONNECTION_WRITE
-
-	} // getConnection()
-
-	/**
-	 * Opens a new PDO connection for passed-in db name.
-	 *
-	 * @param      array $conparams Connection paramters.
-	 * @param      string $name Datasource name.
-	 * @param      string $defaultClass The PDO subclass to instantiate if there is no explicit classname
-	 * 									specified in the connection params (default is Propel::CLASS_PROPEL_PDO)
-	 *
-	 * @return     PDO A database connection of the given class (PDO, PropelPDO, SlavePDO or user-defined)
-	 *
-	 * @throws     PropelException - if lower-level exception caught when trying to connect.
-	 */
-	public static function initConnection($conparams, $name, $defaultClass = Propel::CLASS_PROPEL_PDO)
-	{
-
-		$dsn = $conparams['dsn'];
-		if ($dsn === null) {
-			throw new PropelException('No dsn specified in your connection parameters for datasource ['.$name.']');
-		}
-
-		if (isset($conparams['classname']) && !empty($conparams['classname'])) {
-			$classname = $conparams['classname'];
-			if (!class_exists($classname)) {
-				throw new PropelException('Unable to load specified PDO subclass: ' . $classname);
-			}
-		} else {
-			$classname = $defaultClass;
-		}
-
-		$user = isset($conparams['user']) ? $conparams['user'] : null;
-		$password = isset($conparams['password']) ? $conparams['password'] : null;
-
-		// load any driver options from the config file
-		// driver options are those PDO settings that have to be passed during the connection construction
-		$driver_options = array();
-		if ( isset($conparams['options']) && is_array($conparams['options']) ) {
-			try {
-				self::processDriverOptions( $conparams['options'], $driver_options );
-			} catch (PropelException $e) {
-				throw new PropelException('Error processing driver options for datasource ['.$name.']', $e);
-			}
-		}
-
-		try {
-			$con = new $classname($dsn, $user, $password, $driver_options);
-			$con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-		} catch (PDOException $e) {
-			throw new PropelException("Unable to open PDO connection", $e);
-		}
-
-		// load any connection options from the config file
-		// connection attributes are those PDO flags that have to be set on the initialized connection
-		if (isset($conparams['attributes']) && is_array($conparams['attributes'])) {
-			$attributes = array();
-			try {
-				self::processDriverOptions( $conparams['attributes'], $attributes );
-			} catch (PropelException $e) {
-				throw new PropelException('Error processing connection attributes for datasource ['.$name.']', $e);
-			}
-			foreach ($attributes as $key => $value) {
-				$con->setAttribute($key, $value);
-			}
-		}
-
-		// initialize the connection using the settings provided in the config file. this could be a "SET NAMES <charset>" query for MySQL, for instance
-		$adapter = self::getDB($name);
-		$adapter->initConnection($con, isset($conparams['settings']) && is_array($conparams['settings']) ? $conparams['settings'] : array());
-
-		return $con;
-	}
-
-	/**
-	 * Internal function to handle driver options or conneciton attributes in PDO.
-	 *
-	 * Process the INI file flags to be passed to each connection.
-	 *
-	 * @param      array Where to find the list of constant flags and their new setting.
-	 * @param      array Put the data into here
-	 *
-	 * @throws     PropelException If invalid options were specified.
-	 */
-	private static function processDriverOptions($source, &$write_to)
-	{
-		foreach ($source as $option => $optiondata) {
-			if (is_string($option) && strpos($option, '::') !== false) {
-				$key = $option;
-			} elseif (is_string($option)) {
-				$key = 'PropelPDO::' . $option;
-			}
-			if (!defined($key)) {
-				throw new PropelException("Invalid PDO option/attribute name specified: ".$key);
-			}
-			$key = constant($key);
-
-			$value = $optiondata['value'];
-			if (is_string($value) && strpos($value, '::') !== false) {
-				if (!defined($value)) {
-					throw new PropelException("Invalid PDO option/attribute value specified: ".$value);
-				}
-				$value = constant($value);
-			}
-
-			$write_to[$key] = $value;
-		}
-	}
-
-	/**
-	 * Returns database adapter for a specific datasource.
-	 *
-	 * @param      string The datasource name.
-	 *
-	 * @return     DBAdapter The corresponding database adapter.
-	 *
-	 * @throws     PropelException If unable to find DBdapter for specified db.
-	 */
-	public static function getDB($name = null)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-
-		if (!isset(self::$adapterMap[$name])) {
-			if (!isset(self::$configuration['datasources'][$name]['adapter'])) {
-				throw new PropelException("Unable to find adapter for datasource [" . $name . "].");
-			}
-			$db = DBAdapter::factory(self::$configuration['datasources'][$name]['adapter']);
-			// register the adapter for this name
-			self::$adapterMap[$name] = $db;
-		}
-
-		return self::$adapterMap[$name];
-	}
-
-	/**
-	 * Sets a database adapter for specified datasource.
-	 *
-	 * @param      string $name The datasource name.
-	 * @param      DBAdapter $adapter The DBAdapter implementation to use.
-	 */
-	public static function setDB($name, DBAdapter $adapter)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		self::$adapterMap[$name] = $adapter;
-	}
-
-	/**
-	 * Returns the name of the default database.
-	 *
-	 * @return     string Name of the default DB
-	 */
-	public static function getDefaultDB()
-	{
-		if (self::$defaultDBName === null) {
-			// Determine default database name.
-			self::$defaultDBName = isset(self::$configuration['datasources']['default']) ? self::$configuration['datasources']['default'] : self::DEFAULT_NAME;
-		}
-		return self::$defaultDBName;
-	}
-
-	/**
-	 * Closes any associated resource handles.
-	 *
-	 * This method frees any database connection handles that have been
-	 * opened by the getConnection() method.
-	 */
-	public static function close()
-	{
-		foreach (self::$connectionMap as $idx => $cons) {
-			// Propel::log("Closing connections for " . $idx, Propel::LOG_DEBUG);
-			unset(self::$connectionMap[$idx]);
-		}
-	}
-
-	/**
-	 * Autoload function for loading propel dependencies.
-	 *
-	 * @param      string The class name needing loading.
-	 *
-	 * @return     boolean TRUE if the class was loaded, false otherwise.
-	 */
-	public static function autoload($className)
-	{
-		if (isset(self::$autoloadMap[$className])) {
-			require(self::$autoloadMap[$className]);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Include once a file specified in DOT notation and reutrn unqualified clasname.
-	 *
-	 * Typically, Propel uses autoload is used to load classes and expects that all classes
-	 * referenced within Propel are included in Propel's autoload map.  This method is only
-	 * called when a specific non-Propel classname was specified -- for example, the
-	 * classname of a validator in the schema.xml.  This method will attempt to include that
-	 * class via autoload and then relative to a location on the include_path.
-	 *
-	 * @param      string $class dot-path to clas (e.g. path.to.my.ClassName).
-	 * @return     string unqualified classname
-	 */
-	public static function importClass($path) {
-
-		// extract classname
-		if (($pos = strrpos($path, '.')) === false) {
-			$class = $path;
-		} else {
-			$class = substr($path, $pos + 1);
-		}
-
-		// check if class exists, using autoloader to attempt to load it.
-		if (class_exists($class, $useAutoload=true)) {
-			return $class;
-		}
-
-		// turn to filesystem path
-		$path = strtr($path, '.', DIRECTORY_SEPARATOR) . '.php';
-
-		// include class
-		$ret = include_once($path);
-		if ($ret === false) {
-			throw new PropelException("Unable to import class: " . $class . " from " . $path);
-		}
-
-		// return qualified name
-		return $class;
-	}
-
-	/**
-	 * Set your own class-name for Database-Mapping. Then
-	 * you can change the whole TableMap-Model, but keep its
-	 * functionality for Criteria.
-	 *
-	 * @param      string The name of the class.
-	 */
-	public static function setDatabaseMapClass($name)
-	{
-		self::$databaseMapClass = $name;
-	}
-
-	/**
-	 * Disable instance pooling.
-	 */
-	public static function disableInstancePooling()
-	{
-		self::$instancePoolingEnabled = false;
-	}
-
-	/**
-	 * Enable instance pooling (enabled by default).
-	 */
-	public static function enableInstancePooling()
-	{
-		self::$instancePoolingEnabled = true;
-	}
-
-	/**
-	 *  the instance pooling behaviour. True by default.
-	 *
-	 * @return     boolean Whether the pooling is enabled or not.
-	 */
-	public static function isInstancePoolingEnabled()
-	{
-		return self::$instancePoolingEnabled;
-	}
-}
-
-spl_autoload_register(array('Propel', 'autoload'));
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/PropelException.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/PropelException.php
deleted file mode 100644
index f9c9583..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/PropelException.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- *  $Id: PropelException.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * The base class of all exceptions thrown by Propel.
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel
- */
-class PropelException extends Exception {
-
-	/** The nested "cause" exception. */
-	protected $cause;
-
-	function __construct($p1, $p2 = null) {
-
-		$cause = null;
-
-		if ($p2 !== null) {
-			$msg = $p1;
-			$cause = $p2;
-		} else {
-			if ($p1 instanceof Exception) {
-				$msg = "";
-				$cause = $p1;
-			} else {
-				$msg = $p1;
-			}
-		}
-
-		parent::__construct($msg);
-
-		if ($cause !== null) {
-			$this->cause = $cause;
-			$this->message .= " [wrapped: " . $cause->getMessage() ."]";
-		}
-	}
-
-	function getCause() {
-		return $this->cause;
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBAdapter.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBAdapter.php
deleted file mode 100644
index a01a85d..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBAdapter.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/*
- *  $Id: DBAdapter.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * DBAdapter</code> defines the interface for a Propel database adapter.
- *
- * <p>Support for new databases is added by subclassing
- * <code>DBAdapter</code> and implementing its abstract interface, and by
- * registering the new database adapter and corresponding Creole
- * driver in the private adapters map (array) in this class.</p>
- *
- * <p>The Propel database adapters exist to present a uniform
- * interface to database access across all available databases.  Once
- * the necessary adapters have been written and configured,
- * transparent swapping of databases is theoretically supported with
- * <i>zero code change</i> and minimal configuration file
- * modifications.</p>
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon at latchkey.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-abstract class DBAdapter {
-
-	const ID_METHOD_NONE = 0;
-	const ID_METHOD_AUTOINCREMENT = 1;
-	const ID_METHOD_SEQUENCE = 2;
-
-	/**
-	 * Creole driver to Propel adapter map.
-	 * @var        array
-	 */
-	private static $adapters = array(
-		'mysql' => 'DBMySQL',
-		'mysqli' => 'DBMySQLi',
-		'mssql' => 'DBMSSQL',
-    'dblib' => 'DBMSSQL',
-		'sybase' => 'DBSybase',
-		'oracle' => 'DBOracle',
-		'pgsql' => 'DBPostgres',
-		'sqlite' => 'DBSQLite',
-		'' => 'DBNone',
-	);
-
-	/**
-	 * Creates a new instance of the database adapter associated
-	 * with the specified Creole driver.
-	 *
-	 * @param      string $driver The name of the Propel/Creole driver to
-	 * create a new adapter instance for or a shorter form adapter key.
-	 * @return     DBAdapter An instance of a Propel database adapter.
-	 * @throws     PropelException if the adapter could not be instantiated.
-	 */
-	public static function factory($driver) {
-		$adapterClass = isset(self::$adapters[$driver]) ? self::$adapters[$driver] : null;
-		if ($adapterClass !== null) {
-			$a = new $adapterClass();
-			return $a;
-		} else {
-			throw new PropelException("Unsupported Propel driver: " . $driver . ": Check your configuration file");
-		}
-	}
-
-	/**
-	 * This method is called after a connection was created to run necessary
-	 * post-initialization queries or code.
-	 *
-	 * If a charset was specified, this will be set before any other queries
-	 * are executed.
-	 *
-	 * This base method runs queries specified using the "query" setting.
-	 *
-	 * @param      PDO   A PDO connection instance.
-	 * @param      array An array of settings.
-	 * @see        setCharset()
-	 */
-	public function initConnection(PDO $con, array $settings)
-	{
-		if (isset($settings['charset']['value'])) {
-			$this->setCharset($con, $settings['charset']['value']);
-		}
-		if (isset($settings['queries']) && is_array($settings['queries'])) {
-			foreach ($settings['queries'] as $queries) {
-				foreach ((array)$queries as $query) {
-					$con->exec($query);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Sets the character encoding using SQL standard SET NAMES statement.
-	 *
-	 * This method is invoked from the default initConnection() method and must
-	 * be overridden for an RDMBS which does _not_ support this SQL standard.
-	 *
-	 * @param      PDO   A PDO connection instance.
-	 * @param      string The charset encoding.
-	 * @see        initConnection()
-	 */
-	public function setCharset(PDO $con, $charset)
-	{
-		$con->exec("SET NAMES '" . $charset . "'");
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string The string to transform to upper case.
-	 * @return     string The upper case string.
-	 */
-	public abstract function toUpperCase($in);
-
-	/**
-	 * Returns the character used to indicate the beginning and end of
-	 * a piece of text used in a SQL statement (generally a single
-	 * quote).
-	 *
-	 * @return     string The text delimeter.
-	 */
-	public function getStringDelimiter()
-	{
-		return '\'';
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string whose case to ignore.
-	 * @return     string The string in a case that can be ignored.
-	 */
-	public abstract function ignoreCase($in);
-
-	/**
-	 * This method is used to ignore case in an ORDER BY clause.
-	 * Usually it is the same as ignoreCase, but some databases
-	 * (Interbase for example) does not use the same SQL in ORDER BY
-	 * and other clauses.
-	 *
-	 * @param      string $in The string whose case to ignore.
-	 * @return     string The string in a case that can be ignored.
-	 */
-	public function ignoreCaseInOrderBy($in)
-	{
-		return $this->ignoreCase($in);
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public abstract function concatString($s1, $s2);
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public abstract function subString($s, $pos, $len);
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public abstract function strLength($s);
-
-
-	/**
-	 * Quotes database objec identifiers (table names, col names, sequences, etc.).
-	 * @param      string $text The identifier to quote.
-	 * @return     string The quoted identifier.
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '"' . $text . '"';
-	}
-
-	/**
-	 * Quotes a database table which could have space seperating it from an alias, both should be identified seperately
-	 * @param      string $table The table name to quo
-	 * @return     string The quoted table name
-	 **/
-	public function quoteIdentifierTable($table) {
-		return implode(" ", array_map(array($this, "quoteIdentifier"), explode(" ", $table) ) );
-	}
-
-	/**
-	 * Returns the native ID method for this RDBMS.
-	 * @return     int one of DBAdapter:ID_METHOD_SEQUENCE, DBAdapter::ID_METHOD_AUTOINCREMENT.
-	 */
-	protected function getIdMethod()
-	{
-		return DBAdapter::ID_METHOD_AUTOINCREMENT;
-	}
-
-	/**
-	 * Whether this adapter uses an ID generation system that requires getting ID _before_ performing INSERT.
-	 * @return     boolean
-	 */
-	public function isGetIdBeforeInsert()
-	{
-		return ($this->getIdMethod() === DBAdapter::ID_METHOD_SEQUENCE);
-	}
-
-	/**
-	 * Whether this adapter uses an ID generation system that requires getting ID _before_ performing INSERT.
-	 * @return     boolean
-	 */
-	public function isGetIdAfterInsert()
-	{
-		return ($this->getIdMethod() === DBAdapter::ID_METHOD_AUTOINCREMENT);
-	}
-
-	/**
-	 * Gets the generated ID (either last ID for autoincrement or next sequence ID).
-	 * @return     mixed
-	 */
-	public function getId(PDO $con, $name = null)
-	{
-		return $con->lastInsertId($name);
-	}
-
-	/**
-	 * Returns timestamp formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return "Y-m-d H:i:s";
-	}
-
-	/**
-	 * Returns date formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getDateFormatter()
-	{
-		return "Y-m-d";
-	}
-
-	/**
-	 * Returns time formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimeFormatter()
-	{
-		return "H:i:s";
-	}
-
-	/**
-	 * Should Column-Names get identifiers for inserts or updates.
-	 * By default false is returned -> backwards compability.
-	 *
-	 * it`s a workaround...!!!
-	 *
-	 * @todo       should be abstract
-	 * @return     boolean
-	 * @deprecated
-	 */
-	public function useQuoteIdentifier()
-	{
-		return false;
-	}
-
-	/**
-	 * Modifies the passed-in SQL to add LIMIT and/or OFFSET.
-	 */
-	public abstract function applyLimit(&$sql, $offset, $limit);
-
-	/**
-	 * Gets the SQL string that this adapter uses for getting a random number.
-	 *
-	 * @param      mixed $seed (optional) seed value for databases that support this
-	 */
-	public abstract function random($seed = null);
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBMSSQL.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBMSSQL.php
deleted file mode 100644
index 963a667..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBMSSQL.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/*
-*  $Id: DBMSSQL.php 1262 2009-10-26 20:54:39Z francois $
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* This software consists of voluntary contributions made by many individuals
-* and is licensed under the LGPL. For more information please see
-* <http://propel.phpdb.org>.
-*/
-
-/**
- * This is used to connect to a MSSQL database.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBMSSQL extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "($s1 + $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "SUBSTRING($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "LEN($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-
-	/**
-	 * @see        DBAdapter::random()
-	 */
-	public function random($seed = null)
-	{
-		return 'rand('.((int) $seed).')';
-	}
-
-  /**
-   * Simulated Limit/Offset
-   * This rewrites the $sql query to apply the offset and limit.
-   * @see        DBAdapter::applyLimit()
-   * @author     Justin Carlson <justin.carlson at gmail.com>
-   * @author     Benjamin Runnels <kraven at kraven.org>
-   */
-  public function applyLimit(&$sql, $offset, $limit)
-  {
-    // make sure offset and limit are numeric
-    if (!is_numeric($offset) || !is_numeric($limit))
-    {
-      throw new Exception("DBMSSQL::applyLimit() expects a number for argument 2 and 3");
-    }
-
-    //split the select and from clauses out of the original query
-    $selectSegment = array();
-    preg_match('/\Aselect(.*)from(.*)/si',$sql,$selectSegment);
-    if (count($selectSegment)==3)
-    {      
-      $selectStatement = trim($selectSegment[1]);
-      $fromStatement = trim($selectSegment[2]);      
-    }
-    else
-    {
-      throw new Exception("DBMSSQL::applyLimit() could not locate the select statement at the start of the query. ");
-    }
-
-    //handle the ORDER BY clause if present
-    $orderSegment = array();
-    preg_match('/order by(.*)\Z/si',$fromStatement,$orderSegment);
-    if (count($orderSegment)==2)
-    {
-      //remove the ORDER BY from $sql
-      $fromStatement = trim(str_replace($orderSegment[0], '', $fromStatement));
-      //the ORDER BY clause is used in our inner select ROW_NUMBER() clause
-      $countColumn = trim($orderSegment[1]);
-    }
-
-    //setup inner and outer select selects
-    $innerSelect = '';
-    $outerSelect = '';
-    foreach(explode(', ',$selectStatement) as $selCol) {
-      @list($column,,$alias) = explode(' ', $selCol);
-      //make sure the current column isn't * or an aggregate
-      if ($column!='*' && !strstr($column,'(')) {
-        //we can use the first non-aggregate column for ROW_NUMBER() if it wasn't already set from an order by clause
-        if(!isset($countColumn)) {
-          $countColumn = $column;
-        }
-
-        //add an alias to the inner select so all columns will be unique
-        $innerSelect .= $column." AS [$column],";
-        
-        //use the alias in the outer select if one was present on the original select column
-        if(isset($alias)) {
-          $outerSelect .= "[$column] AS $alias,";
-        } else {
-          $outerSelect .= "[$column],";
-        }        
-      } else {
-        //agregate columns must always have an alias clause
-        if(!isset($alias)) {
-          throw new Exception("DBMSSQL::applyLimit() requires aggregate columns to have an Alias clause");
-        }
-        //use the whole aggregate column in the inner select
-        $innerSelect .= "$selCol,";
-        //only add the alias for the aggregate to the outer select
-        $outerSelect .= "$alias,";
-      }
-    }
-
-    //check if we got this far and still don't have a viable column to user with ROW_NUMBER()
-    if(!isset($countColumn)) {
-      throw new Exception("DBMSSQL::applyLimit() requires an ORDER BY clause or at least one non-aggregate column in the select statement");
-    }
-
-    //ROW_NUMBER() starts at 1 not 0
-    $from = ($offset+1);
-    $to = ($limit+$offset);
-       
-    //substring our select strings to get rid of the last comma and add our FROM and SELECT clauses
-    $innerSelect = "SELECT ROW_NUMBER() OVER(ORDER BY $countColumn) AS RowNumber, ".substr($innerSelect,0,-1).' FROM';
-    $outerSelect = 'SELECT '.substr($outerSelect,0,-1).' FROM';
-
-    // build the query
-    $sql = "$outerSelect ($innerSelect $fromStatement) AS derivedb WHERE RowNumber BETWEEN $from AND $to";
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBMySQL.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBMySQL.php
deleted file mode 100644
index caad4ee..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBMySQL.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/*
- *  $Id: DBMySQL.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is used in order to connect to a MySQL database.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon at clearink.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBMySQL extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "CONCAT($s1, $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "SUBSTRING($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "CHAR_LENGTH($s)";
-	}
-
-
-	/**
-	 * Locks the specified table.
-	 *
-	 * @param      Connection $con The Creole connection to use.
-	 * @param      string $table The name of the table to lock.
-	 * @throws     PDOException No Statement could be created or
-	 * executed.
-	 */
-	public function lockTable(PDO $con, $table)
-	{
-		$con->exec("LOCK TABLE " . $table . " WRITE");
-	}
-
-	/**
-	 * Unlocks the specified table.
-	 *
-	 * @param      PDO $con The PDO connection to use.
-	 * @param      string $table The name of the table to unlock.
-	 * @throws     PDOException No Statement could be created or
-	 * executed.
-	 */
-	public function unlockTable(PDO $con, $table)
-	{
-		$statement = $con->exec("UNLOCK TABLES");
-	}
-
-	/**
-	 * @see        DBAdapter::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '`' . $text . '`';
-	}
-
-	/**
-	 * @see        DBAdapter::useQuoteIdentifier()
-	 */
-	public function useQuoteIdentifier()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		if ( $limit > 0 ) {
-			$sql .= " LIMIT " . ($offset > 0 ? $offset . ", " : "") . $limit;
-		} else if ( $offset > 0 ) {
-			$sql .= " LIMIT " . $offset . ", 18446744073709551615";
-		}
-	}
-
-	/**
-	 * @see        DBAdapter::random()
-	 */
-	public function random($seed = null)
-	{
-		return 'rand('.((int) $seed).')';
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBNone.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBNone.php
deleted file mode 100644
index 8e50853..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBNone.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- *  $Id: DBNone.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This adapter  is used when you do not have a database installed.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon at clearink.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBNone extends DBAdapter {
-
-	/**
-	 * @see        DBAdapter::initConnection()
-	 */
-	public function initConnection(PDO $con, array $settings)
-	{
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return $in;
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return $in;
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return ($s1 . $s2);
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return substr($s, $pos, $len);
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return strlen($s);
-	}
-	
-	/**
-	 * Modifies the passed-in SQL to add LIMIT and/or OFFSET.
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{		
-	}
-
-	/**
-	 * Gets the SQL string that this adapter uses for getting a random number.
-	 *
-	 * @param      mixed $seed (optional) seed value for databases that support this
-	 */
-	public function random($seed = null)
-	{
-	}
-	
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBOracle.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBOracle.php
deleted file mode 100644
index 759c0d6..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBOracle.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- *  $Id: DBOracle.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Oracle adapter.
- *
- * @author     David Giffin <david at giffin.org> (Propel)
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon at clearink.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @author     Bill Schneider <bschneider at vecna.com> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBOracle extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string to transform to upper case.
-	 * @return     string The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string whose case to ignore.
-	 * @return     string The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "CONCAT($s1, $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "SUBSTR($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "LENGTH($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		 $sql =
-			'SELECT B.* FROM (  '
-			.  'SELECT A.*, rownum AS PROPEL$ROWNUM FROM (  '
-			. $sql
-			. '  ) A '
-			.  ' ) B WHERE ';
-
-		if ( $offset > 0 ) {
-			$sql				.= ' B.PROPEL$ROWNUM > ' . $offset;
-
-			if ( $limit > 0 )
-			{
-				$sql			.= ' AND B.PROPEL$ROWNUM <= '
-									. ( $offset + $limit );
-			}
-		} else {
-			$sql				.= ' B.PROPEL$ROWNUM <= ' . $limit;
-		}
-	}
-
-	protected function getIdMethod()
-	{
-		return DBAdapter::ID_METHOD_SEQUENCE;
-	}
-
-	public function getId(PDO $con, $name = null)
-	{
-		if ($name === null) {
-			throw new PropelException("Unable to fetch next sequence ID without sequence name.");
-		}
-
-		$stmt = $con->query("SELECT " . $name . ".nextval FROM dual");
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-
-		return $row[0];
-	}
-
-	public function random($seed=NULL)
-	{
-		return 'dbms_random.value';
-	}
-
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBPostgres.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBPostgres.php
deleted file mode 100644
index 3dc32cd..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBPostgres.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/*
- *  $Id: DBPostgres.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is used to connect to PostgresQL databases.
- *
- * <a href="http://www.pgsql.org">http://www.pgsql.org</a>
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Hakan Tandogan <hakan42 at gmx.de> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBPostgres extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string to transform to upper case.
-	 * @return     string The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "($s1 || $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "substring($s from $pos" . ($len > -1 ? "for $len" : "") . ")";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "char_length($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::getIdMethod()
-	 */
-	protected function getIdMethod()
-	{
-		return DBAdapter::ID_METHOD_SEQUENCE;
-	}
-
-	/**
-	 * Gets ID for specified sequence name.
-	 */
-	public function getId(PDO $con, $name = null)
-	{
-		if ($name === null) {
-			throw new PropelException("Unable to fetch next sequence ID without sequence name.");
-		}
-		$stmt = $con->query("SELECT nextval(".$con->quote($name).")");
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-		return $row[0];
-	}
-
-	/**
-	 * Returns timestamp formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return "Y-m-d H:i:s O";
-	}
-
-	/**
-	 * Returns timestamp formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimeFormatter()
-	{
-		return "H:i:s O";
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		if ( $limit > 0 ) {
-			$sql .= " LIMIT ".$limit;
-		}
-		if ( $offset > 0 ) {
-			$sql .= " OFFSET ".$offset;
-		}
-	}
-	
-	/**
-	 * @see        DBAdapter::random()
-	 */
-	public function random($seed=NULL)
-	{
-		return 'random()';
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBSQLite.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBSQLite.php
deleted file mode 100644
index f7bdf66..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/DBSQLite.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- *  $Id: DBSQLite.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is used in order to connect to a SQLite database.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBSQLite extends DBAdapter {
-
-	/**
-	 * For SQLite this method has no effect, since SQLite doesn't support specifying a character
-	 * set (or, another way to look at it, it doesn't require a single character set per DB).
-	 *
-	 * @param      PDO   A PDO connection instance.
-	 * @param      string The charset encoding.
-	 * @throws     PropelException If the specified charset doesn't match sqlite_libencoding()
-	 */
-	public function setCharset(PDO $con, $charset)
-	{
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return 'UPPER(' . $in . ')';
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return 'UPPER(' . $in . ')';
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "($s1 || $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "substr($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "length($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		if ( $limit > 0 ) {
-			$sql .= " LIMIT " . $limit . ($offset > 0 ? " OFFSET " . $offset : "");
-		} elseif ( $offset > 0 ) {
-			$sql .= " LIMIT -1 OFFSET " . $offset;
-		}
-	}
-
-	public function random($seed=NULL)
-	{
-		return 'random()';
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDateTime.class.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDateTime.class.php
deleted file mode 100644
index 4df0f8c..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDateTime.class.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * MSSQL Server returns datetimes in a format that strtotime doesn't handle so we need to extend DateTime
- *
- * @package    propel.adapter.MSSQL
- */
-class MssqlDateTime extends DateTime
-{
-  public function __construct($datetime='now', DateTimeZone $tz = null)
-  {
-    //if the date is bad account for Mssql datetime format
-    if ($datetime != 'now' && strtotime($datetime) === false)
-    {
-      $datetime = substr($datetime,0, -6).substr($datetime,-2);
-    }
-
-    if($tz instanceof DateTimeZone)
-    {
-      parent::__construct($datetime,$tz);
-    }
-    else
-    {
-      parent::__construct($datetime);
-    }
-  }
-}
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDebugPDO.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDebugPDO.php
deleted file mode 100644
index ac66f42..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlDebugPDO.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * dblib doesn't support transactions so we need to add a workaround for transactions, last insert ID, and quoting
- *
- * @package    propel.adapter.MSSQL
- */
-class MssqlDebugPDO extends DebugPDO
-{
-	/**
-	 * Begin a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function beginTransaction()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ( $opcount === 0 ) {
-			$return = self::exec('BEGIN TRANSACTION');
-			$this->isUncommitable = false;
-		}
-		$this->incrementNestedTransactionCount();
-		return $return;
-	}
-	
-	/**
-	 * Commit a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-  public function commit()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) {
-				if ($this->isUncommitable) {
-					throw new PropelException('Cannot commit because a nested transaction was rolled back');
-				} else {
-					$return = self::exec('COMMIT TRANSACTION');
-				}
-			}
-			$this->decrementNestedTransactionCount();
-		}
-		return $return;
-	}
-
-	/**
-	 * Roll-back a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function rollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) { 
-				$return = self::exec('ROLLBACK TRANSACTION'); 
-			} else {
-				$this->isUncommitable = true;
-			}
-			$this->decrementNestedTransactionCount(); 
-		}
-		return $return;
-	}
-
-	/**
-	 * Rollback the whole transaction, even if this is a nested rollback
-	 * and reset the nested transaction count to 0.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function forceRollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			// If we're in a transaction, always roll it back
-			// regardless of nesting level.
-			$return = self::exec('ROLLBACK TRANSACTION');
-			
-			// reset nested transaction count to 0 so that we don't
-			// try to commit (or rollback) the transaction outside this scope.
-			$this->nestedTransactionCount = 0;
-		}
-		return $return;
-	}
-
-	public function lastInsertId($seqname = null)
-	{
-		$result = self::query('SELECT SCOPE_IDENTITY()');
-		return (int)$result->fetchColumn();
-	}
-	
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-	
-	public function useQuoteIdentifier()
-	{
-		return true;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlPropelPDO.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlPropelPDO.php
deleted file mode 100644
index 10753a3..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/adapter/MSSQL/MssqlPropelPDO.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * dblib doesn't support transactions so we need to add a workaround for transactions, last insert ID, and quoting
- *
- * @package    propel.adapter.MSSQL
- */
-class MssqlPropelPDO extends PropelPDO
-{
-	/**
-	 * Begin a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function beginTransaction()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ( $opcount === 0 ) {
-			$return = self::exec('BEGIN TRANSACTION');
-			$this->isUncommitable = false;
-		}
-		$this->incrementNestedTransactionCount();
-		return $return;
-	}
-	
-	/**
-	 * Commit a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-  public function commit()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) {
-				if ($this->isUncommitable) {
-					throw new PropelException('Cannot commit because a nested transaction was rolled back');
-				} else {
-					$return = self::exec('COMMIT TRANSACTION');
-				}
-			}
-			$this->decrementNestedTransactionCount();
-		}
-		return $return;
-	}
-
-	/**
-	 * Roll-back a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function rollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) { 
-				$return = self::exec('ROLLBACK TRANSACTION'); 
-			} else {
-				$this->isUncommitable = true;
-			}
-			$this->decrementNestedTransactionCount(); 
-		}
-		return $return;
-	}
-
-	/**
-	 * Rollback the whole transaction, even if this is a nested rollback
-	 * and reset the nested transaction count to 0.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function forceRollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			// If we're in a transaction, always roll it back
-			// regardless of nesting level.
-			$return = self::exec('ROLLBACK TRANSACTION');
-			
-			// reset nested transaction count to 0 so that we don't
-			// try to commit (or rollback) the transaction outside this scope.
-			$this->nestedTransactionCount = 0;
-		}
-		return $return;
-	}
-
-	public function lastInsertId($seqname = null)
-	{
-		$result = self::query('SELECT SCOPE_IDENTITY()');
-		return (int)$result->fetchColumn();
-	}
-	
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-	
-	public function useQuoteIdentifier()
-	{
-		return true;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/logger/BasicLogger.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/logger/BasicLogger.php
deleted file mode 100644
index 556424a..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/logger/BasicLogger.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/*
- *  $Id: BasicLogger.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * This is a minimalistic interface that any logging class must implement for Propel.
- *
- * The API for this interface is based on the PEAR::Log interface.  It provides a simple
- * API that can be used by Propel independently of Log backend.
- *
- * PEAR::Log and perhaps the Log API was developed by Chuck Hagenbuch <chuck at horde.org>
- * and Jon Parise <jon at php.net>.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.logger
- */
-interface BasicLogger {
-
-	/**
-	 * A convenience function for logging an alert event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function alert($message);
-
-	/**
-	 * A convenience function for logging a critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function crit($message);
-
-	/**
-	 * A convenience function for logging an error event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function err($message);
-
-	/**
-	 * A convenience function for logging a warning event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function warning($message);
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function notice($message);
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function info($message);
-
-	/**
-	 * A convenience function for logging a debug event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function debug($message);
-
-	/**
-	 * Primary method to handle logging.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 * @param      int     $severity   The numeric severity.  Defaults to null so that no
-	 *                              assumptions are made about the logging backend.
-	 */
-	public function log($message, $severity = null);
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/logger/MojaviLogAdapter.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/logger/MojaviLogAdapter.php
deleted file mode 100644
index f609082..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/logger/MojaviLogAdapter.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/*
- *  $Id: MojaviLogAdapter.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Mojavi logging adapter for propel
- *
- * @author     Brandon Keepers <brandon at opensoul.org>
- * @version    $Revision: 1262 $
- * @package    propel.logger
- */
-class MojaviLogAdapter implements BasicLogger {
-
-	/**
-	 * Instance of mojavi logger
-	 */
-	private $logger = null;
-
-	/**
-	 * constructor for setting up Mojavi log adapter
-	 *
-	 * @param      ErrorLog   $logger   instance of Mojavi error log obtained by
-	 *                               calling LogManager::getLogger();
-	 */
-	public function __construct($logger = null)
-	{
-		$this->logger = $logger;
-	}
-
-	/**
-	 * A convenience function for logging an alert event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function alert($message)
-	{
-		$this->log($message, 'alert');
-	}
-
-	/**
-	 * A convenience function for logging a critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function crit($message)
-	{
-		$this->log($message, 'crit');
-	}
-
-	/**
-	 * A convenience function for logging an error event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function err($message)
-	{
-		$this->log($message, 'err');
-	}
-
-	/**
-	 * A convenience function for logging a warning event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function warning($message)
-	{
-		$this->log($message, 'warning');
-	}
-
-
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function notice($message)
-	{
-		$this->log($message, 'notice');
-	}
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function info($message)
-	{
-		$this->log($message, 'info');
-	}
-
-	/**
-	 * A convenience function for logging a debug event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function debug($message)
-	{
-		$this->log($message, 'debug');
-	}
-
-	/**
-	 * Primary method to handle logging.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 * @param      int     $severity   The numeric severity.  Defaults to null so that no
-	 *                              assumptions are made about the logging backend.
-	 */
-	public function log($message, $severity = null)
-	{
-		if (is_null($this->logger))
-			$this->logger = LogManager::getLogger('propel');
-
-		switch($severity)
-		{
-			case 'crit':
-				$method = 'fatal';
-				break;
-			case 'err':
-				$method = 'error';
-				break;
-			case 'alert':
-			case 'warning':
-				$method = 'warning';
-				break;
-			case 'notice':
-			case 'info':
-				$method = 'info';
-				break;
-			case 'debug':
-			default:
-				$method = 'debug';
-		}
-
-		// get a backtrace to pass class, function, file, & line to Mojavi logger
-		$trace = debug_backtrace();
-
-		// call the appropriate Mojavi logger method
-		$this->logger->{$method} (
-			$message,
-			$trace[2]['class'],
-			$trace[2]['function'],
-			$trace[1]['file'],
-			$trace[1]['line']
-			);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/ColumnMap.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/map/ColumnMap.php
deleted file mode 100644
index 25aed6e..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/ColumnMap.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-
-/*
- *  $Id: ColumnMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * ColumnMap is used to model a column of a table in a database.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class ColumnMap {
-
-  // Propel type of the column
-  protected $type;
-
-  // Size of the column
-  protected $size = 0;
-
-  // Is it a primary key?
-  protected $pk = false;
-
-  // Is null value allowed?
-  protected $notNull = false;
-
-  // The default value for this column
-  protected $defaultValue;
-
-  // Name of the table that this column is related to
-  protected $relatedTableName = "";
-
-  // Name of the column that this column is related to
-  protected $relatedColumnName = "";
-
-  // The TableMap for this column
-  protected $table;
-
-  // The name of the column
-  protected $columnName;
-
-  // The php name of the column
-  protected $phpName;
-
-  // The validators for this column
-  protected $validators = array();
-
-  /**
-   * Constructor.
-   *
-   * @param      string $name The name of the column.
-   * @param      TableMap containingTable TableMap of the table this column is in.
-   */
-  public function __construct($name, TableMap $containingTable)
-  {
-    $this->columnName = $name;
-    $this->table = $containingTable;
-  }
-
-  /**
-   * Get the name of a column.
-   *
-   * @return     string A String with the column name.
-   */
-  public function getName()
-  {
-    return $this->columnName;
-  }
-
-  /**
-   * Get the table map this column belongs to.
-   * @return     TableMap
-   */
-  public function getTable()
-  {
-    return $this->table;
-  }
-
-  /**
-   * Get the name of the table this column is in.
-   *
-   * @return     string A String with the table name.
-   */
-  public function getTableName()
-  {
-    return $this->table->getName();
-  }
-  
-  /**
-   * Get the table name + column name.
-   *
-   * @return     string A String with the full column name.
-   */
-  public function getFullyQualifiedName()
-  {
-    return $this->getTableName() . "." . $this->columnName;
-  }
-
-  /**
-   * Set the php anme of this column.
-   *
-   * @param      string $phpName A string representing the PHP name.
-   * @return     void
-   */
-  public function setPhpName($phpName)
-  {
-    $this->phpName = $phpName;
-  }
-  
-  /**
-   * Get the name of a column.
-   *
-   * @return     string A String with the column name.
-   */
-  public function getPhpName()
-  {
-    return $this->phpName;
-  }
-  
-  /**
-   * Set the Propel type of this column.
-   *
-   * @param      string $type A string representing the Propel type (e.g. PropelColumnTypes::DATE).
-   * @return     void
-   */
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  
-  /**
-   * Get the Propel type of this column.
-   *
-   * @return     string A string representing the Propel type (e.g. PropelColumnTypes::DATE).
-   */
-  public function getType()
-  {
-    return $this->type;
-  }
-
-  /**
-   * Get the PDO type of this column.
-   *
-   * @return     int The PDO::PARMA_* value
-   */
-  public function getPdoType()
-  {
-    return PropelColumnTypes::getPdoType($this->type);
-  }
-
-  /**
-   * Whether this is a BLOB, LONGVARBINARY, or VARBINARY.
-   * @return     boolean
-   */
-  public function isLob()
-  {
-    return ($this->type == PropelColumnTypes::BLOB || $this->type == PropelColumnTypes::VARBINARY || $this->type == PropelColumnTypes::LONGVARBINARY);
-  }
-
-  /**
-   * Whether this is a DATE/TIME/TIMESTAMP column.
-   *
-   * @return     boolean
-   * @since      1.3
-   */
-  public function isTemporal()
-  {
-    return ($this->type == PropelColumnTypes::TIMESTAMP || $this->type == PropelColumnTypes::DATE || $this->type == PropelColumnTypes::TIME || $this->type == PropelColumnTypes::BU_DATE  || $this->type == PropelColumnTypes::BU_TIMESTAMP);
-  }
-  
-  /**
-   * Whether this is a DATE/TIME/TIMESTAMP column that is post-epoch (1970).
-   *
-   * PHP cannot handle pre-epoch timestamps well -- hence the need to differentiate
-   * between epoch and pre-epoch timestamps.
-   *
-   * @return     boolean
-   * @deprecated Propel supports non-epoch dates
-   */
-  public function isEpochTemporal()
-  {
-    return ($this->type == PropelColumnTypes::TIMESTAMP || $this->type == PropelColumnTypes::DATE || $this->type == PropelColumnTypes::TIME);
-  }
-
-  /**
-   * Whether this column is numeric (int, decimal, bigint etc).
-   * @return     boolean
-   */
-  public function isNumeric()
-  {
-    return ($this->type == PropelColumnTypes::NUMERIC || $this->type == PropelColumnTypes::DECIMAL || $this->type == PropelColumnTypes::TINYINT || $this->type == PropelColumnTypes::SMALLINT || $this->type == PropelColumnTypes::INTEGER || $this->type == PropelColumnTypes::BIGINT || $this->type == PropelColumnTypes::REAL || $this->type == PropelColumnTypes::FLOAT || $this->type == PropelColumnTypes::DOUBLE);
-  }
-
-  /**
-   * Whether this column is a text column (varchar, char, longvarchar).
-   * @return     boolean
-   */
-  public function isText()
-  {
-    return ($this->type == PropelColumnTypes::VARCHAR || $this->type == PropelColumnTypes::LONGVARCHAR || $this->type == PropelColumnTypes::CHAR);
-  }
-
-  /**
-   * Set the size of this column.
-   *
-   * @param      int $size An int specifying the size.
-   * @return     void
-   */
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  
-  /**
-   * Get the size of this column.
-   *
-   * @return     int An int specifying the size.
-   */
-  public function getSize()
-  {
-    return $this->size;
-  }
-
-  /**
-   * Set if this column is a primary key or not.
-   *
-   * @param      boolean $pk True if column is a primary key.
-   * @return     void
-   */
-  public function setPrimaryKey($pk)
-  {
-    $this->pk = $pk;
-  }
-  
-  /**
-   * Is this column a primary key?
-   *
-   * @return     boolean True if column is a primary key.
-   */
-  public function isPrimaryKey()
-  {
-    return $this->pk;
-  }
-
-  /**
-   * Set if this column may be null.
-   *
-   * @param      boolean nn True if column may be null.
-   * @return     void
-   */
-  public function setNotNull($nn)
-  {
-    $this->notNull = $nn;
-  }
-  
-  /**
-   * Is null value allowed ?
-   *
-   * @return     boolean True if column may not be null.
-   */
-  public function isNotNull()
-  {
-    return ($this->notNull || $this->isPrimaryKey());
-  }
-
-  /**
-   * Sets the default value for this column.
-   * @param      mixed $defaultValue the default value for the column
-   * @return     void
-   */
-  public function setDefaultValue($defaultValue)
-  {
-    $this->defaultValue = $defaultValue;
-  }
-  
-  /**
-   * Gets the default value for this column.
-   * @return     mixed String or NULL
-   */
-  public function getDefaultValue()
-  {
-    return $this->defaultValue;
-  }
-
-  /**
-   * Set the foreign key for this column.
-   *
-   * @param      string tableName The name of the table that is foreign.
-   * @param      string columnName The name of the column that is foreign.
-   * @return     void
-   */
-  public function setForeignKey($tableName, $columnName)
-  {
-    if ($tableName && $columnName) {
-      $this->relatedTableName = $tableName;
-      $this->relatedColumnName = $columnName;
-    } else {
-      $this->relatedTableName = "";
-      $this->relatedColumnName = "";
-    }
-  }
-
-  /**
-   * Is this column a foreign key?
-   *
-   * @return     boolean True if column is a foreign key.
-   */
-  public function isForeignKey()
-  {
-    if ($this->relatedTableName) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-  
-  /**
-   * Get the RelationMap object for this foreign key
-   */
-  public function getRelation()
-  {
-    if(!$this->relatedTableName) return null;
-    foreach ($this->getTable()->getRelations() as $name => $relation)
-    {
-      if($relation->getType() == RelationMap::MANY_TO_ONE)
-      {
-        if ($relation->getForeignTable()->getName() == $this->getRelatedTableName()
-         && array_key_exists($this->getFullyQualifiedName(), $relation->getColumnMappings()))
-        {
-          return $relation;
-        }
-      }
-    }
-  }
-  
-  /**
-   * Get the table.column that this column is related to.
-   *
-   * @return     string A String with the full name for the related column.
-   */
-  public function getRelatedName()
-  {
-    return $this->relatedTableName . "." . $this->relatedColumnName;
-  }
-
-  /**
-   * Get the table name that this column is related to.
-   *
-   * @return     string A String with the name for the related table.
-   */
-  public function getRelatedTableName()
-  {
-    return $this->relatedTableName;
-  }
-
-  /**
-   * Get the column name that this column is related to.
-   *
-   * @return     string A String with the name for the related column.
-   */
-  public function getRelatedColumnName()
-  {
-    return $this->relatedColumnName;
-  }
-  
-  /**
-   * Get the TableMap object that this column is related to.
-   *
-   * @return     TableMap The related TableMap object
-   * @throws     PropelException when called on a column with no foreign key
-   */
-  public function getRelatedTable()
-  {
-    if ($this->relatedTableName) {
-      return $this->table->getDatabaseMap()->getTable($this->relatedTableName);
-    } else {
-      throw new PropelException("Cannot fetch RelatedTable for column with no foreign key: " . $this->columnName);
-    }
-  }
-  
-  /**
-   * Get the TableMap object that this column is related to.
-   *
-   * @return     ColumnMap The related ColumnMap object
-   * @throws     PropelException when called on a column with no foreign key
-   */
-  public function getRelatedColumn()
-  {
-    return $this->getRelatedTable()->getColumn($this->relatedColumnName);
-  }
-
-  public function addValidator($validator)
-  {
-    $this->validators[] = $validator;
-  }
-
-  public function hasValidators()
-  {
-    return count($this->validators) > 0;
-  }
-
-  public function getValidators()
-  {
-    return $this->validators;
-  }
-  
-  /**
-   * Performs DB-specific ignore case, but only if the column type necessitates it.
-   * @param      string $str The expression we want to apply the ignore case formatting to (e.g. the column name).
-   * @param      DBAdapter $db
-   */
-  public function ignoreCase($str, DBAdapter $db)
-  {
-    if ($this->isText()) {
-      return $db->ignoreCase($str);
-    } else {
-      return $str;
-    }
-  }
-  
-  /**
-   * Normalizes the column name, removing table prefix and uppercasing.
-   *
-   * article.first_name becomes FIRST_NAME
-   *
-   * @param      string $name
-   * @return     string Normalized column name.
-   */
-  public static function normalizeName($name)
-  {
-    if (false !== ($pos = strpos($name, '.'))) {
-      $name = substr($name, $pos + 1);
-    }
-    $name = strtoupper($name);
-    return $name;
-  }
-  
-  // deprecated methods
-  
-  /**
-   * Gets column name
-   * @deprecated Use getName() instead
-   * @return     string
-   * @deprecated Use getName() instead.
-   */
-  public function getColumnName()
-  {
-    return $this->getName();
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/DatabaseMap.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/map/DatabaseMap.php
deleted file mode 100644
index 8e6de6c..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/DatabaseMap.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
- *  $Id: DatabaseMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * DatabaseMap is used to model a database.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @author     Daniel Rall <dlr at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class DatabaseMap
-{
-
-  /** @var string Name of the database. */
-  protected $name;
-
-  /** @var array TableMap[] Tables in the database, using table name as key */ 
-  protected $tables = array();
-  
-  /** @var array TableMap[] Tables in the database, using table phpName as key */
-  protected $tablesByPhpName = array();
-
-  /**
-   * Constructor.
-   *
-   * @param      string $name Name of the database.
-   */
-  public function __construct($name)
-  {
-    $this->name = $name;
-  }
-  
-  /**
-   * Get the name of this database.
-   *
-   * @return     string The name of the database.
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-  
-  /**
-   * Add a new table to the database by name.
-   *
-   * @param      string $tableName The name of the table.
-   * @return     TableMap The newly created TableMap.
-   */
-  public function addTable($tableName)
-  {
-    $this->tables[$tableName] = new TableMap($tableName, $this);
-    return $this->tables[$tableName];
-  }
-  
-  /**
-   * Add a new table object to the database.
-   *
-   * @param      TableMap $table The table to add
-   */
-  public function addTableObject(TableMap $table)
-  {
-    $table->setDatabaseMap($this);
-    $this->tables[$table->getName()] = $table;
-    $this->tablesByPhpName[$table->getPhpName()] = $table;
-  }
-  
-  /**
-   * Add a new table to the database, using the tablemap class name.
-   *
-   * @param      string $tableMapClass The name of the table map to add
-   * @return     TableMap The TableMap object
-   */
-  public function addTableFromMapClass($tableMapClass)
-  {
-    $table = new $tableMapClass();
-    if(!$this->hasTable($table->getName())) {
-      $this->addTableObject($table);
-      return $table;
-    } else {
-      return $this->getTable($table->getName());
-    }
-  }
-  
-  /**
-   * Does this database contain this specific table?
-   *
-   * @param      string $name The String representation of the table.
-   * @return     boolean True if the database contains the table.
-   */
-  public function hasTable($name)
-  {
-    if ( strpos($name, '.') > 0) {
-      $name = substr($name, 0, strpos($name, '.'));
-    }
-    return isset($this->tables[$name]);
-  }
-
-  /**
-   * Get a TableMap for the table by name.
-   *
-   * @param      string $name Name of the table.
-   * @return     TableMap A TableMap
-   * @throws     PropelException if the table is undefined
-   */
-  public function getTable($name)
-  {
-    if (!isset($this->tables[$name])) {
-      throw new PropelException("Cannot fetch TableMap for undefined table: " . $name );
-    }
-    return $this->tables[$name];
-  }
-
-  /**
-   * Get a TableMap[] of all of the tables in the database.
-   *
-   * @return     array A TableMap[].
-   */
-  public function getTables()
-  {
-    return $this->tables;
-  }
-
-  /**
-   * Get a ColumnMap for the column by name.
-   * Name must be fully qualified, e.g. book.AUTHOR_ID
-   *
-   * @param      $qualifiedColumnName Name of the column.
-   * @return     ColumnMap A TableMap
-   * @throws     PropelException if the table is undefined, or if the table is undefined
-   */  
-  public function getColumn($qualifiedColumnName)
-  {
-    list($tableName, $columnName) = explode('.', $qualifiedColumnName);
-    return $this->getTable($tableName)->getColumn($columnName, false);
-  }
-  
-  // deprecated methods
-  
-  /**
-   * Does this database contain this specific table?
-   *
-   * @deprecated Use hasTable() instead
-   * @param      string $name The String representation of the table.
-   * @return     boolean True if the database contains the table.
-   */
-  public function containsTable($name)
-  {
-    return $this->hasTable($name);
-  }
-  
-  public function getTableByPhpName($phpName)
-  {
-    if (array_key_exists($phpName, $this->tablesByPhpName)) {
-      return $this->tablesByPhpName[$phpName];
-    } else if (class_exists($tmClass = $phpName . 'TableMap')) {
-      $this->addTableFromMapClass($tmClass);
-      return $this->tablesByPhpName[$phpName];
-    } else {
-      throw new PropelException("Cannot fetch TableMap for undefined table phpName: " . $phpName);
-    }
-  }
-  
-  /** 
-   * Convenience method to get the DBAdapter registered with Propel for this database. 
-   * @return  DBAdapter
-   * @see     Propel::getDB(string) 
-   */ 
-  public function getDBAdapter() 
-  { 
-    return Propel::getDB($this->name); 
-  }  
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/RelationMap.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/map/RelationMap.php
deleted file mode 100644
index d24c576..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/RelationMap.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-/*
- *  $Id: RelationMap.php 1153 2009-09-20 18:08:53Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * RelationMap is used to model a database relationship.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Francois Zaninotto
- * @version    $Revision: 1153 $
- * @package    propel.map
- */
-class RelationMap {
-
-  const
-    MANY_TO_ONE = 1,
-    ONE_TO_MANY = 2,
-    ONE_TO_ONE = 3;
-    
-  protected 
-    $name,
-    $type,
-    $localTable,
-    $foreignTable,
-    $localColumns = array(),
-    $foreignColumns = array(),
-    $onUpdate, $onDelete;
-
-  /**
-   * Constructor.
-   *
-   * @param      string $name Name of the database.
-   */
-  public function __construct($name)
-  {
-    $this->name = $name;
-  }
-  
-  /**
-   * Get the name of this database.
-   *
-   * @return     string The name of the database.
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set the type
-   *
-   * @param      integer $type The relation type (either self::HAS_ONE, or self::HAS_MANY)
-   */
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-
-  /**
-   * Get the type
-   *
-   * @return      integer the relation type
-   */
-  public function getType()
-  {
-    return $this->type;
-  }
-
-  /**
-   * Set the local table
-   *
-   * @param      TableMap $table The local table for this relationship
-   */
-  public function setLocalTable($table)
-  {
-    $this->localTable = $table;
-  }
-
-  /**
-   * Get the local table
-   *
-   * @return      TableMap The local table for this relationship
-   */
-  public function getLocalTable()
-  {
-    return $this->localTable;
-  }
-
-  /**
-   * Set the foreign table
-   *
-   * @param      TableMap $table The foreign table for this relationship
-   */
-  public function setForeignTable($table)
-  {
-    $this->foreignTable = $table;
-  }
-
-  /**
-   * Get the foreign table
-   *
-   * @return      TableMap The foreign table for this relationship
-   */
-  public function getForeignTable()
-  {
-    return $this->foreignTable;
-  }
-  
-  /**
-   * Add a column mapping
-   *
-   * @param   ColumnMap $local The local column
-   * @param   ColumnMap $foreign The foreign column
-   */
-  public function addColumnMapping(ColumnMap $local, ColumnMap $foreign)
-  {
-    $this->localColumns[] = $local;
-    $this->foreignColumns[] = $foreign;
-  }
-  
-  /**
-   * Get an associative array mapping local column names to foreign column names
-   *
-   * @return Array Associative array (local => foreign) of fully qualified column names
-   */
-  public function getColumnMappings()
-  {
-    $h = array();
-    for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-      $h[$this->localColumns[$i]->getFullyQualifiedName()] = $this->foreignColumns[$i]->getFullyQualifiedName();
-    }
-    return $h;
-  }
-  
-  /**
-   * Get the local columns
-   *
-   * @return      Array list of ColumnMap objects
-   */
-  public function getLocalColumns()
-  {
-    return $this->localColumns;
-  }
-  
-  /**
-   * Get the foreign columns
-   *
-   * @return      Array list of ColumnMap objects
-   */
-  public function getForeignColumns()
-  {
-    return $this->foreignColumns;
-  }
-  
-  /**
-   * Set the onUpdate behavior
-   *
-   * @param      string $onUpdate
-   */
-  public function setOnUpdate($onUpdate)
-  {
-    $this->onUpdate = $onUpdate;
-  }
-
-  /**
-   * Get the onUpdate behavior
-   *
-   * @return      integer the relation type
-   */
-  public function getOnUpdate()
-  {
-    return $this->onUpdate;
-  }
-  
-  /**
-   * Set the onDelete behavior
-   *
-   * @param      string $onDelete
-   */
-  public function setOnDelete($onDelete)
-  {
-    $this->onDelete = $onDelete;
-  }
-
-  /**
-   * Get the onDelete behavior
-   *
-   * @return      integer the relation type
-   */
-  public function getOnDelete()
-  {
-    return $this->onDelete;
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/TableMap.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/map/TableMap.php
deleted file mode 100644
index 2306b6f..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/TableMap.php
+++ /dev/null
@@ -1,654 +0,0 @@
-<?php
-/*
- *  $Id: TableMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * TableMap is used to model a table in a database.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @author     Daniel Rall <dlr at finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class TableMap {
-
-  // The columns in the table
-  protected $columns = array();
-
-  // The database this table belongs to
-  protected $dbMap;
-
-  // The name of the table
-  protected $tableName;
-
-  // The PHP name of the table
-  protected $phpName;
-
-  // The Classname for this table
-  protected $classname;
-
-  // The Package for this table
-  protected $package;
-  
-  // Whether to use an id generator for pkey
-  protected $useIdGenerator;
-  
-  // The primary key columns in the table
-  protected $primaryKeys = array();
-  
-  // The foreign key columns in the table
-  protected $foreignKeys = array();
-
-  // The relationships in the table
-  protected $relations = array();
-
-  // Relations are lazy loaded. This property tells if the relations are loaded or not
-  protected $relationsBuilt = false;
-  
-  // Object to store information that is needed if the for generating primary keys
-  protected $pkInfo;
-  
-  /**
-   * Construct a new TableMap.
-   *
-   */
-  public function __construct($name = null, $dbMap = null)
-  {
-    if(!is_null($name)) $this->setName($name);
-    if(!is_null($dbMap)) $this->setDatabaseMap($dbMap);
-    $this->initialize();
-  }
-  
-  /**
-   * Initialize the TableMap to build columns, relations, etc
-   * This method should be overridden by descendents
-   */
-  public function initialize()
-  {
-  }
-
-  /**
-   * Set the DatabaseMap containing this TableMap.
-   *
-   * @param     DatabaseMap $dbMap A DatabaseMap.
-   */
-  public function setDatabaseMap(DatabaseMap $dbMap)
-  {
-    $this->dbMap = $dbMap;
-  }
-  
-  /**
-   * Get the DatabaseMap containing this TableMap.
-   *
-   * @return     DatabaseMap A DatabaseMap.
-   */
-  public function getDatabaseMap()
-  {
-    return $this->dbMap;
-  }
-
-  /**
-   * Set the name of the Table.
-   *
-   * @param      string $name The name of the table.
-   */
-  public function setName($name)
-  {
-    $this->tableName = $name;
-  }
-  
-  /**
-   * Get the name of the Table.
-   *
-   * @return     string A String with the name of the table.
-   */
-  public function getName()
-  {
-    return $this->tableName;
-  }
-
-  /**
-   * Set the PHP name of the Table.
-   *
-   * @param      string $phpName The PHP Name for this table
-   */
-  public function setPhpName($phpName)
-  {
-    $this->phpName = $phpName;
-  }
-  
-  /**
-   * Get the PHP name of the Table.
-   *
-   * @return     string A String with the name of the table.
-   */
-  public function getPhpName()
-  {
-    return $this->phpName;
-  }
-
-  /**
-   * Set the Classname of the Table. Could be useful for calling
-   * Peer and Object methods dynamically.
-   * @param      string $classname The Classname
-   */
-  public function setClassname($classname)
-  {
-    $this->classname = $classname;
-  }
-
-  /**
-   * Get the Classname of the Propel-Classes belonging to this table.
-   * @return     string
-   */
-  public function getClassname()
-  {
-    return $this->classname;
-  }
-  
-  /**
-   * Set the Package of the Table
-   *
-   * @param      string $package The Package
-   */
-  public function setPackage($package)
-  {
-    $this->package = $package;
-  }
-
-  /**
-   * Get the Package of the table.
-   * @return     string
-   */
-  public function getPackage()
-  {
-    return $this->package;
-  }
-    
-  /**
-   * Set whether or not to use Id generator for primary key.
-   * @param      boolean $bit
-   */
-  public function setUseIdGenerator($bit)
-  {
-    $this->useIdGenerator = $bit;
-  }
-
-  /**
-   * Whether to use Id generator for primary key.
-   * @return     boolean
-   */
-  public function isUseIdGenerator()
-  {
-    return $this->useIdGenerator;
-  }
-
-  /**
-   * Sets the pk information needed to generate a key
-   *
-   * @param      $pkInfo information needed to generate a key
-   */
-  public function setPrimaryKeyMethodInfo($pkInfo)
-  {
-    $this->pkInfo = $pkInfo;
-  }
-  
-  /**
-   * Get the information used to generate a primary key
-   *
-   * @return     An Object.
-   */
-  public function getPrimaryKeyMethodInfo()
-  {
-    return $this->pkInfo;
-  }
-
-  /**
-   * Add a column to the table.
-   *
-   * @param      string name A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      int $size An int specifying the size.
-   * @param      boolean $pk True if column is a primary key.
-   * @param      string $fkTable A String with the foreign key table name.
-   * @param      $fkColumn A String with the foreign key column name.
-   * @param      string $defaultValue The default value for this column.
-   * @return     ColumnMap The newly created column.
-   */
-  public function addColumn($name, $phpName, $type, $isNotNull = false, $size = null, $defaultValue = null, $pk = false, $fkTable = null, $fkColumn = null)
-  {
-
-    $col = new ColumnMap($name, $this);
-
-    if ($fkTable && $fkColumn) {
-      if (strpos($fkColumn, '.') > 0 && strpos($fkColumn, $fkTable) !== false) {
-        $fkColumn = substr($fkColumn, strlen($fkTable) + 1);
-      }
-      $col->setForeignKey($fkTable, $fkColumn);
-      $this->foreignKeys[$name] = $col;
-    }
-
-    $col->setType($type);
-    $col->setSize($size);
-    $col->setPhpName($phpName);
-    $col->setNotNull($isNotNull);
-    $col->setDefaultValue($defaultValue);
-    if ($pk) {
-      $col->setPrimaryKey(true);
-      $this->primaryKeys[$name] = $col;
-    }
-    $this->columns[$name] = $col;
-
-    return $this->columns[$name];
-  }
-  
-  /**
-   * Add a pre-created column to this table. It will replace any
-   * existing column.
-   *
-   * @param      ColumnMap $cmap A ColumnMap.
-   * @return     ColumnMap The added column map.
-   */
-  public function addConfiguredColumn($cmap)
-  {
-    $this->columns[ $cmap->getColumnName() ] = $cmap;
-    return $cmap;
-  }
-  
-  /**
-   * Does this table contain the specified column?
-   *
-   * @param      mixed   $name name of the column or ColumnMap instance
-   * @param      boolean $normalize Normalize the column name (if column name not like FIRST_NAME)
-   * @return     boolean True if the table contains the column.
-   */
-  public function hasColumn($name, $normalize = true)
-  {
-    if ($name instanceof ColumnMap) {
-      $name = $name->getColumnName();
-    } else if($normalize) {
-      $name = ColumnMap::normalizeName($name);
-    }
-    return isset($this->columns[$name]);
-  }
-  
-  /**
-   * Get a ColumnMap for the named table.
-   *
-   * @param      string    $name A String with the name of the table.
-   * @param      boolean   $normalize Normalize the column name (if column name not like FIRST_NAME)
-   * @return     ColumnMap A ColumnMap.
-   * @throws     PropelException if the column is undefined
-   */
-  public function getColumn($name, $normalize = true)
-  {
-    if ($normalize) {
-      $name = ColumnMap::normalizeName($name);
-    }
-    if (!$this->containsColumn($name, false)) {
-      throw new PropelException("Cannot fetch ColumnMap for undefined column: " . $name);
-    }
-    return $this->columns[$name];
-  }
-  
-  /**
-   * Get a ColumnMap[] of the columns in this table.
-   *
-   * @return     array A ColumnMap[].
-   */
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-
-  /**
-   * Add a primary key column to this Table.
-   *
-   * @param      string $columnName A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      $size An int specifying the size.
-   * @return     ColumnMap Newly added PrimaryKey column.
-   */
-  public function addPrimaryKey($columnName, $phpName, $type, $isNotNull = false, $size = null, $defaultValue = null)
-  {
-    return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, true, null, null);
-  }
-
-  /**
-   * Add a foreign key column to the table.
-   *
-   * @param      string $columnName A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      string $fkTable A String with the foreign key table name.
-   * @param      string $fkColumn A String with the foreign key column name.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      int $size An int specifying the size.
-   * @param      string $defaultValue The default value for this column.
-   * @return     ColumnMap Newly added ForeignKey column.
-   */
-  public function addForeignKey($columnName, $phpName, $type, $fkTable, $fkColumn, $isNotNull = false, $size = 0, $defaultValue = null)
-  {
-    return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, false, $fkTable, $fkColumn);
-  }
-
-  /**
-   * Add a foreign primary key column to the table.
-   *
-   * @param      string $columnName A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      string $fkTable A String with the foreign key table name.
-   * @param      string $fkColumn A String with the foreign key column name.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      int $size An int specifying the size.
-   * @param      string $defaultValue The default value for this column.
-   * @return     ColumnMap Newly created foreign pkey column.
-   */
-  public function addForeignPrimaryKey($columnName, $phpName, $type, $fkTable, $fkColumn, $isNotNull = false, $size = 0, $defaultValue = null)
-  {
-    return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, true, $fkTable, $fkColumn);
-  }
-  
-  /**
-   * Returns array of ColumnMap objects that make up the primary key for this table
-   *
-   * @return     array ColumnMap[]
-   */
-  public function getPrimaryKeys()
-  {
-    return $this->primaryKeys;
-  }
-  
-  /**
-   * Returns array of ColumnMap objects that are foreign keys for this table
-   *
-   * @return     array ColumnMap[]
-   */
-  public function getForeignKeys()
-  {
-    return $this->foreignKeys;
-  }
-
-  /**
-  * Add a validator to a table's column
-  *
-  * @param      string $columnName The name of the validator's column
-  * @param      string $name The rule name of this validator
-  * @param      string $classname The dot-path name of class to use (e.g. myapp.propel.MyValidator)
-  * @param      string $value
-  * @param      string $message The error message which is returned on invalid values
-  * @return     void
-  */
-  public function addValidator($columnName, $name, $classname, $value, $message)
-  {
-    if (false !== ($pos = strpos($columnName, '.'))) {
-      $columnName = substr($columnName, $pos + 1);
-    }
-
-    $col = $this->getColumn($columnName);
-    if ($col !== null) {
-      $validator = new ValidatorMap($col);
-      $validator->setName($name);
-      $validator->setClass($classname);
-      $validator->setValue($value);
-      $validator->setMessage($message);
-      $col->addValidator($validator);
-    }
-  }
-  
-  /**
-   * Build relations
-   * Relations are lazy loaded for performance reasons
-   * This method should be overridden by descendents
-   */
-  public function buildRelations()
-  {
-  }  
-  
-  /**
-   * Adds a RelationMap to the table
-   * 
-   * @param      string $name The relation name
-   * @param      string $tablePhpName The related table name
-   * @param      integer $type The relation type (either RelationMap::MANY_TO_ONE, RelationMap::ONE_TO_MANY, or RelationMAp::ONE_TO_ONE) 
-   * @param      array $columnMapping An associative array mapping column names (local => foreign)
-   * @return     RelationMap the built RelationMap object
-   */
-  public function addRelation($name, $tablePhpName, $type, $columnMapping = array(), $onDelete = null, $onUpdate = null)
-  {
-    // note: using phpName for the second table allows the use of DatabaseMap::getTableByPhpName()
-    // and this method autoloads the TableMap if the table isn't loaded yet
-    $relation = new RelationMap($name);
-    $relation->setType($type);
-    $relation->setOnUpdate($onUpdate);
-    $relation->setOnDelete($onDelete);
-    // set tables
-    if ($type == RelationMap::MANY_TO_ONE) {
-      $relation->setLocalTable($this);
-      $relation->setForeignTable($this->dbMap->getTableByPhpName($tablePhpName));
-    } else {
-      $relation->setLocalTable($this->dbMap->getTableByPhpName($tablePhpName));
-      $relation->setForeignTable($this);
-      $columnMapping  = array_flip($columnMapping);
-    }
-    // set columns
-    foreach ($columnMapping as $key => $value)
-    {
-      $relation->addColumnMapping(
-        $relation->getLocalTable()->getColumn($key),
-        $relation->getForeignTable()->getColumn($value)
-      );
-    }
-    $this->relations[$name] = $relation;
-    return $relation;
-  }
-
-  /**
-   * Gets a RelationMap of the table by relation name
-   *
-   * @param       String $name The relation name 
-   * @return      boolean true if the relation exists
-   */
-  public function hasRelation($name)
-  {
-    return array_key_exists($name, $this->getRelations());
-  }
-  
-  /**
-   * Gets a RelationMap of the table by relation name
-   *
-   * @param       String $name The relation name 
-   * @return      RelationMap The relation object
-   * @throws      PropelException When called on an inexistent relation
-   */
-  public function getRelation($name)
-  {
-    if (!array_key_exists($name, $this->getRelations()))
-    {
-      throw new PropelException('Calling getRelation() on an unknown relation, ' . $name);
-    }
-    return $this->relations[$name];
-  }
-
-  /**
-   * Gets the RelationMap objects of the table
-   * This method will build the relations if they are not built yet
-   * 
-   * @return      Array list of RelationMap objects
-   */
-  public function getRelations()
-  {
-    if(!$this->relationsBuilt)
-    {
-      $this->buildRelations();
-      $this->relationsBuilt = true;
-    }
-    return $this->relations;
-  }
-
-  /**
-   * 
-   * Gets the list of behaviors registered for this table
-   *
-   * @return array
-   */
-  public function getBehaviors()
-  {
-    return array();
-  }
-
-  // Deprecated methods and attributres, to be removed
-  
-  /**
-   * Does this table contain the specified column?
-   *
-   * @deprecated Use hasColumn instead
-   * @param      mixed   $name name of the column or ColumnMap instance
-   * @param      boolean $normalize Normalize the column name (if column name not like FIRST_NAME)
-   * @return     boolean True if the table contains the column.
-   */
-  public function containsColumn($name, $normalize = true)
-  {
-    return $this->hasColumn($name, $normalize);
-  }
-  
-  /**
-   * Normalizes the column name, removing table prefix and uppercasing.
-   * article.first_name becomes FIRST_NAME
-   *
-   * @deprecated Use ColumnMap::normalizeColumName() instead
-   * @param      string $name
-   * @return     string Normalized column name.
-   */
-  protected function normalizeColName($name)
-  {
-    return ColumnMap::normalizeName($name);
-  }
-  
-  /**
-   * Returns array of ColumnMap objects that make up the primary key for this table.
-   *
-   * @deprecated Use getPrimaryKeys instead
-   * @return     array ColumnMap[]
-   */
-  public function getPrimaryKeyColumns()
-  {
-    return array_values($this->primaryKeys);
-  }
-    
-  //---Utility methods for doing intelligent lookup of table names
-
-  /** 
-   * The prefix on the table name. 
-   * @deprecated Not used anywhere in Propel
-   */
-  private $prefix;
-
-  /**
-   * Get table prefix name.
-   *
-   * @deprecated Not used anywhere in Propel
-   * @return     string A String with the prefix.
-   */
-  public function getPrefix()
-  {
-    return $this->prefix;
-  }
-
-  /**
-   * Set table prefix name.
-   *
-   * @deprecated Not used anywhere in Propel
-   * @param      string $prefix The prefix for the table name (ie: SCARAB for
-   * SCARAB_PROJECT).
-   * @return     void
-   */
-  public function setPrefix($prefix)
-  {
-    $this->prefix = $prefix;
-  }
-  
-  /**
-   * Tell me if i have PREFIX in my string.
-   *
-   * @deprecated Not used anywhere in Propel
-   * @param      data A String.
-   * @return     boolean True if prefix is contained in data.
-   */
-  protected function hasPrefix($data)
-  {
-    return (strpos($data, $this->prefix) === 0);
-  }
-
-  /**
-   * Removes the PREFIX if found
-   *
-   * @deprecated Not used anywhere in Propel
-   * @param      string $data A String.
-   * @return     string A String with data, but with prefix removed.
-   */
-  protected function removePrefix($data)
-  {
-    return $this->hasPrefix($data) ? substr($data, strlen($this->prefix)) : $data;
-  }
-
-  /**
-   * Removes the PREFIX, removes the underscores and makes
-   * first letter caps.
-   *
-   * SCARAB_FOO_BAR becomes FooBar.
-   *
-   * @deprecated Not used anywhere in Propel. At buildtime, use Column::generatePhpName() for that purpose
-   * @param      data A String.
-   * @return     string A String with data processed.
-   */
-  public final function removeUnderScores($data)
-  {
-    $out = '';
-    $tmp = $this->removePrefix($data);
-    $tok = strtok($tmp, '_');
-    while ($tok) {
-      $out .= ucfirst($tok);
-      $tok = strtok('_');
-    }
-    return $out;
-  }
-
-  /**
-   * Makes the first letter caps and the rest lowercase.
-   *
-   * @deprecated Not used anywhere in Propel.
-   * @param      string $data A String.
-   * @return     string A String with data processed.
-   */
-  private function firstLetterCaps($data)
-  {
-    return(ucfirst(strtolower($data)));
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/ValidatorMap.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/map/ValidatorMap.php
deleted file mode 100644
index 84da6be..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/map/ValidatorMap.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*
- *  $Id: ValidatorMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * ValidatorMap is used to model a column validator.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class ValidatorMap
-{
-	/** rule name of this validator */
-	private $name;
-	/** the dot-path to class to use for validator */
-	private $classname;
-	/** value to check against */
-	private $value;
-	/** execption message thrown on invalid input */
-	private $message;
-	/** related column */
-	private $column;
-
-	public function __construct($containingColumn)
-	{
-		$this->column = $containingColumn;
-	}
-
-	public function getColumn()
-	{
-		return $this->column;
-	}
-
-	public function getColumnName()
-	{
-		return $this->column->getColumnName();
-	}
-
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	public function setClass($classname)
-	{
-		$this->classname = $classname;
-	}
-
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-	public function setMessage($message)
-	{
-		$this->message = $message;
-	}
-
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	public function getClass()
-	{
-		return $this->classname;
-	}
-
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	public function getMessage()
-	{
-		return $this->message;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/BaseObject.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/om/BaseObject.php
deleted file mode 100644
index 6bde977..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/BaseObject.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-/*
- *  $Id: BaseObject.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This class contains attributes and methods that are used by all
- * business objects within the system.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Frank Y. Kim <frank.kim at clearink.com> (Torque)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-abstract class BaseObject {
-
-	/**
-	 * attribute to determine if this object has previously been saved.
-	 * @var        boolean
-	 */
-	private $_new = true;
-
-	/**
-	 * attribute to determine whether this object has been deleted.
-	 * @var        boolean
-	 */
-	private $_deleted = false;
-
-	/**
-	 * The columns that have been modified in current object.
-	 * Tracking modified columns allows us to only update modified columns.
-	 * @var        array
-	 */
-	protected $modifiedColumns = array();
-
-	/**
-	 * Empty constructor (this allows people with their own BaseObject implementation to use its constructor)
-	 */
-	public function __construct() {
-
-	}
-
-	/**
-	 * Returns whether the object has been modified.
-	 *
-	 * @return     boolean True if the object has been modified.
-	 */
-	public function isModified()
-	{
-		return !empty($this->modifiedColumns);
-	}
-
-	/**
-	 * Has specified column been modified?
-	 *
-	 * @param      string $col
-	 * @return     boolean True if $col has been modified.
-	 */
-	public function isColumnModified($col)
-	{
-		return in_array($col, $this->modifiedColumns);
-	}
-
-	/**
-	 * Get the columns that have been modified in this object.
-	 * @return     array A unique list of the modified column names for this object.
-	 */
-	public function getModifiedColumns()
-	{
-		return array_unique($this->modifiedColumns);
-	}
-
-	/**
-	 * Returns whether the object has ever been saved.  This will
-	 * be false, if the object was retrieved from storage or was created
-	 * and then saved.
-	 *
-	 * @return     true, if the object has never been persisted.
-	 */
-	public function isNew()
-	{
-		return $this->_new;
-	}
-
-	/**
-	 * Setter for the isNew attribute.  This method will be called
-	 * by Propel-generated children and Peers.
-	 *
-	 * @param      boolean $b the state of the object.
-	 */
-	public function setNew($b)
-	{
-		$this->_new = (boolean) $b;
-	}
-
-	/**
-	 * Whether this object has been deleted.
-	 * @return     boolean The deleted state of this object.
-	 */
-	public function isDeleted()
-	{
-		return $this->_deleted;
-	}
-
-	/**
-	 * Specify whether this object has been deleted.
-	 * @param      boolean $b The deleted state of this object.
-	 * @return     void
-	 */
-	public function setDeleted($b)
-	{
-		$this->_deleted = (boolean) $b;
-	}
-
-	/**
-	 * Code to be run before persisting the object
-	 * @param PropelPDO $con
-	 * @return bloolean
-	 */
-	public function preSave(PropelPDO $con = null)
-	{
-		return true;
-	}
-
-	/**
-	 * Code to be run after persisting the object
-	 * @param PropelPDO $con
-	 */
-	public function postSave(PropelPDO $con = null) { }
-
-	/**
-	 * Code to be run before inserting to database
-	 * @param PropelPDO $con
-	 * @return boolean
-	 */
-	public function preInsert(PropelPDO $con = null)
-	{
-		return true;
-	}
-	
-	/**
-	 * Code to be run after inserting to database
-	 * @param PropelPDO $con 
-	 */
-	public function postInsert(PropelPDO $con = null) { }
-
-	/**
-	 * Code to be run before updating the object in database
-	 * @param PropelPDO $con
-	 * @return boolean
-	 */
-	public function preUpdate(PropelPDO $con = null)
-	{
-		return true;
-	}
-
-	/**
-	 * Code to be run after updating the object in database
-	 * @param PropelPDO $con
-	 */
-	public function postUpdate(PropelPDO $con = null) { }
-
-	/**
-	 * Code to be run before deleting the object in database
-	 * @param PropelPDO $con
-	 * @return boolean
-	 */
-	public function preDelete(PropelPDO $con = null)
-	{
-		return true;
-	}
-
-	/**
-	 * Code to be run after deleting the object in database
-	 * @param PropelPDO $con
-	 */
-	public function postDelete(PropelPDO $con = null) { }
-	
-	/**
-	 * Sets the modified state for the object to be false.
-	 * @param      string $col If supplied, only the specified column is reset.
-	 * @return     void
-	 */
-	public function resetModified($col = null)
-	{
-		if ($col !== null)
-		{
-			while (($offset = array_search($col, $this->modifiedColumns)) !== false)
-				array_splice($this->modifiedColumns, $offset, 1);
-		}
-		else
-		{
-			$this->modifiedColumns = array();
-		}
-	}
-
-	/**
-	 * Compares this with another <code>BaseObject</code> instance.  If
-	 * <code>obj</code> is an instance of <code>BaseObject</code>, delegates to
-	 * <code>equals(BaseObject)</code>.  Otherwise, returns <code>false</code>.
-	 *
-	 * @param      obj The object to compare to.
-	 * @return     Whether equal to the object specified.
-	 */
-	public function equals($obj)
-	{
-		$thisclazz = get_class($this);
-		if (is_object($obj) && $obj instanceof $thisclazz) {
-			if ($this === $obj) {
-				return true;
-			} elseif ($this->getPrimaryKey() === null || $obj->getPrimaryKey() === null)  {
-				return false;
-			} else {
-				return ($this->getPrimaryKey() === $obj->getPrimaryKey());
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * If the primary key is not <code>null</code>, return the hashcode of the
-	 * primary key.  Otherwise calls <code>Object.hashCode()</code>.
-	 *
-	 * @return     int Hashcode
-	 */
-	public function hashCode()
-	{
-		$ok = $this->getPrimaryKey();
-		if ($ok === null) {
-			return crc32(serialize($this));
-		}
-		return crc32(serialize($ok)); // serialize because it could be an array ("ComboKey")
-	}
-
-	/**
-	 * Logs a message using Propel::log().
-	 *
-	 * @param      string $msg
-	 * @param      int $priority One of the Propel::LOG_* logging levels
-	 * @return     boolean
-	 */
-	protected function log($msg, $priority = Propel::LOG_INFO)
-	{
-		return Propel::log(get_class($this) . ': ' . $msg, $priority);
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/NestedSetRecursiveIterator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/om/NestedSetRecursiveIterator.php
deleted file mode 100644
index 5e6f632..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/NestedSetRecursiveIterator.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- *  $Id: NestedSetRecursiveIterator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Pre-order node iterator for Node objects.
- *
- * @author     Heltem <heltem at o2php.com>
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-class NestedSetRecursiveIterator implements RecursiveIterator
-{
-	protected $topNode = null;
-
-	protected $curNode = null;
-
-	public function __construct($node) {
-		$this->topNode = $node;
-		$this->curNode = $node;
-	}
-
-	public function rewind() {
-		$this->curNode = $this->topNode;
-	}
-
-	public function valid() {
-		return ($this->curNode !== null);
-	}
-
-	public function current() {
-		return $this->curNode;
-	}
-
-	public function key() {
-		$key = array();
-		foreach ($this->curNode->getPath() as $node) {
-			$key[] = $node->getPrimaryKey();
-		}
-		return implode('.', $key);
-	}
-
-	public function next() {
-		$nextNode = null;
-
-		if ($this->valid()) {
-			while (null === $nextNode) {
-				if (null === $this->curNode) {
-					break;
-				}
-
-				if ($this->curNode->hasNextSibling()) {
-					$nextNode = $this->curNode->retrieveNextSibling();
-				} else {
-					break;
-				}
-			}
-			$this->curNode = $nextNode;
-		}
-		return $this->curNode;
-	}
-
-	public function hasChildren() {
-		return $this->curNode->hasChildren();
-	}
-
-	public function getChildren() {
-		return new NestedSetRecursiveIterator($this->curNode->retrieveFirstChild());
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/NodeObject.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/om/NodeObject.php
deleted file mode 100644
index 4b5a61a..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/NodeObject.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/*
- *  $Id: NodeObject.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This interface defines methods that must be implemented by all
- * business objects within the system to handle Node object.
- *
- * @author     Heltem <heltem at o2php.com> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-interface NodeObject extends IteratorAggregate {
-	/**
-	 * If object is saved without left/right values, set them as undefined (0)
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function save(PropelPDO $con = null);
-
-	/**
-	 * Delete node and descendants
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function delete(PropelPDO $con = null);
-
-	/**
-	 * Sets node properties to make it a root node.
-	 *
-	 * @return     object The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function makeRoot();
-
-	/**
-	 * Gets the level if set, otherwise calculates this and returns it
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int
-	 */
-	public function getLevel(PropelPDO $con = null);
-
-	/**
-	 * Get the path to the node in the tree
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     array
-	 */
-	public function getPath(PropelPDO $con = null);
-
-	/**
-	 * Gets the number of children for the node (direct descendants)
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfChildren(PropelPDO $con = null);
-
-	/**
-	 * Gets the total number of desceandants for the node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfDescendants(PropelPDO $con = null);
-
-	/**
-	 * Gets the children for the node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     array
-	 */
-	public function getChildren(PropelPDO $con = null);
-
-	/**
-	 * Gets the descendants for the node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
- 	 * @return     array
-	 */
-	public function getDescendants(PropelPDO $con = null);
-
-	/**
-	 * Sets the level of the node in the tree
-	 *
-	 * @param      int $v new value
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setLevel($level);
-
-	/**
-	 * Sets the children array of the node in the tree
-	 *
-	 * @param      array of Node $children	array of Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setChildren(array $children);
-
-	/**
-	 * Sets the parentNode of the node in the tree
-	 *
-	 * @param      Node $parent Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setParentNode(NodeObject $parent = null);
-
-	/**
-	 * Sets the previous sibling of the node in the tree
-	 *
-	 * @param      Node $node Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setPrevSibling(NodeObject $node = null);
-
-	/**
-	 * Sets the next sibling of the node in the tree
-	 *
-	 * @param      Node $node Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setNextSibling(NodeObject $node = null);
-
-	/**
-	 * Determines if the node is the root node
-	 *
-	 * @return     bool
-	 */
-	public function isRoot();
-
-	/**
-	 * Determines if the node is a leaf node
-	 *
-	 * @return     bool
-	 */
-	public function isLeaf();
-
-	/**
-	 * Tests if object is equal to $node
-	 *
-	 * @param      object $node	Propel object for node to compare to
-	 * @return     bool
-	 */
-	public function isEqualTo(NodeObject $node);
-
-	/**
-	 * Tests if object has an ancestor
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public function hasParent(PropelPDO $con = null);
-
-	/**
-	 * Determines if the node has children / descendants
-	 *
-	 * @return     bool
-	 */
-	public function hasChildren();
-
-	/**
-	 * Determines if the node has previous sibling
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public function hasPrevSibling(PropelPDO $con = null);
-
-	/**
-	 * Determines if the node has next sibling
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public function hasNextSibling(PropelPDO $con = null);
-
-	/**
-	 * Gets ancestor for the given node if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveParent(PropelPDO $con = null);
-
-	/**
-	 * Gets first child if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveFirstChild(PropelPDO $con = null);
-
-	/**
-	 * Gets last child if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveLastChild(PropelPDO $con = null);
-
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrievePrevSibling(PropelPDO $con = null);
-
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveNextSibling(PropelPDO $con = null);
-
-	/**
-	 * Inserts as first child of destination node $parent
-	 *
-	 * @param      object $parent	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsFirstChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts as last child of destination node $parent
-	 *
-	 * @param      object $parent	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsLastChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts node as previous sibling to destination node $dest
-	 *
-	 * @param      object $dest	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsPrevSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Inserts node as next sibling to destination node $dest
-	 *
-	 * @param      object $dest	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsNextSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be first child of $parent
-	 *
-	 * @param      object $parent	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToFirstChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be last child of $parent
-	 *
-	 * @param      object $parent	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToLastChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be prev sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToPrevSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be next sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToNextSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Inserts node as parent of given node.
-	 *
-	 * @param      object $node  Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     Exception      When trying to insert node as parent of a root node
-	 */
-	public function insertAsParentOf(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Wraps the getter for the scope value
-	 *
-	 * @return     int
-	 */
-	public function getScopeIdValue();
-
-	/**
-	 * Set the value of scope column
-	 *
-	 * @param      int $v new value
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setScopeIdValue($v);
-} // NodeObject
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/Persistent.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/om/Persistent.php
deleted file mode 100644
index 506e87a..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/Persistent.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- *  $Id: Persistent.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This interface defines methods related to saving an object
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @author     Fedor K. <fedor at apache.org> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-interface Persistent {
-
-	/**
-	 * getter for the object primaryKey.
-	 *
-	 * @return     ObjectKey the object primaryKey as an Object
-	 */
-	public function getPrimaryKey();
-
-	/**
-	 * Sets the PrimaryKey for the object.
-	 *
-	 * @param      mixed $primaryKey The new PrimaryKey object or string (result of PrimaryKey.toString()).
-	 * @return     void
-	 * @throws     Exception, This method might throw an exceptions
-	 */
-	public function setPrimaryKey($primaryKey);
-
-
-	/**
-	 * Returns whether the object has been modified, since it was
-	 * last retrieved from storage.
-	 *
-	 * @return     boolean True if the object has been modified.
-	 */
-	public function isModified();
-
-	/**
-	 * Has specified column been modified?
-	 *
-	 * @param      string $col
-	 * @return     boolean True if $col has been modified.
-	 */
-	public function isColumnModified($col);
-
-	/**
-	 * Returns whether the object has ever been saved.  This will
-	 * be false, if the object was retrieved from storage or was created
-	 * and then saved.
-	 *
-	 * @return     boolean True, if the object has never been persisted.
-	 */
-	public function isNew();
-
-	/**
-	 * Setter for the isNew attribute.  This method will be called
-	 * by Propel-generated children and Peers.
-	 *
-	 * @param      boolean $b the state of the object.
-	 */
-	public function setNew($b);
-
-	/**
-	 * Resets (to false) the "modified" state for this object.
-	 *
-	 * @return     void
-	 */
-	public function resetModified();
-
-	/**
-	 * Whether this object has been deleted.
-	 * @return     boolean The deleted state of this object.
-	 */
-	public function isDeleted();
-
-	/**
-	 * Specify whether this object has been deleted.
-	 * @param      boolean $b The deleted state of this object.
-	 * @return     void
-	 */
-	public function setDeleted($b);
-
-	/**
-	 * Deletes the object.
-	 * @param      PropelPDO $con
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function delete(PropelPDO $con = null);
-
-	/**
-	 * Saves the object.
-	 * @param      PropelPDO $con
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function save(PropelPDO $con = null);
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/PreOrderNodeIterator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/om/PreOrderNodeIterator.php
deleted file mode 100644
index 6986d36..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/om/PreOrderNodeIterator.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- *  $Id: PreOrderNodeIterator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Pre-order node iterator for Node objects.
- *
- * @author     Dave Lawson <dlawson at masterytech.com>
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-class PreOrderNodeIterator implements Iterator
-{
-	private $topNode = null;
-
-	private $curNode = null;
-
-	private $querydb = false;
-
-	private $con = null;
-
-	public function __construct($node, $opts) {
-		$this->topNode = $node;
-		$this->curNode = $node;
-
-		if (isset($opts['con']))
-			$this->con = $opts['con'];
-
-		if (isset($opts['querydb']))
-			$this->querydb = $opts['querydb'];
-	}
-
-	public function rewind() {
-		$this->curNode = $this->topNode;
-	}
-
-	public function valid() {
-		return ($this->curNode !== null);
-	}
-
-	public function current() {
-		return $this->curNode;
-	}
-
-	public function key() {
-		return $this->curNode->getNodePath();
-	}
-
-	public function next() {
-
-		if ($this->valid())
-		{
-			$nextNode = $this->curNode->getFirstChildNode($this->querydb, $this->con);
-
-			while ($nextNode === null)
-			{
-				if ($this->curNode === null || $this->curNode->equals($this->topNode))
-					break;
-
-				$nextNode = $this->curNode->getSiblingNode(false, $this->querydb, $this->con);
-
-				if ($nextNode === null)
-					$this->curNode = $this->curNode->getParentNode($this->querydb, $this->con);
-			}
-
-			$this->curNode = $nextNode;
-		}
-
-		return $this->curNode;
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/BasePeer.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/BasePeer.php
deleted file mode 100644
index 28bf222..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/BasePeer.php
+++ /dev/null
@@ -1,1064 +0,0 @@
-<?php
-/*
- *  $Id: BasePeer.php 1608 2010-03-15 23:09:22Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is a utility class for all generated Peer classes in the system.
- *
- * Peer classes are responsible for isolating all of the database access
- * for a specific business object.  They execute all of the SQL
- * against the database.  Over time this class has grown to include
- * utility methods which ease execution of cross-database queries and
- * the implementation of concrete Peers.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Kaspars Jaudzems <kaspars.jaudzems at inbox.lv> (Propel)
- * @author     Heltem <heltem at o2php.com> (Propel)
- * @author     Frank Y. Kim <frank.kim at clearink.com> (Torque)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @author     Stephen Haberman <stephenh at chase3000.com> (Torque)
- * @version    $Revision: 1608 $
- * @package    propel.util
- */
-class BasePeer
-{
-
-	/** Array (hash) that contains the cached mapBuilders. */
-	private static $mapBuilders = array();
-
-	/** Array (hash) that contains cached validators */
-	private static $validatorMap = array();
-
-	/**
-	 * phpname type
-	 * e.g. 'AuthorId'
-	 */
-	const TYPE_PHPNAME = 'phpName';
-
-	/**
-	 * studlyphpname type
-	 * e.g. 'authorId'
-	 */
-	const TYPE_STUDLYPHPNAME = 'studlyPhpName';
-
-	/**
-	 * column (peer) name type
-	 * e.g. 'book.AUTHOR_ID'
-	 */
-	const TYPE_COLNAME = 'colName';
-
-	/**
-	 * column fieldname type
-	 * e.g. 'author_id'
-	 */
-	const TYPE_FIELDNAME = 'fieldName';
-
-	/**
-	 * num type
-	 * simply the numerical array index, e.g. 4
-	 */
-	const TYPE_NUM = 'num';
-
-	static public function getFieldnames ($classname, $type = self::TYPE_PHPNAME) {
-
-		// TODO we should take care of including the peer class here
-
-		$peerclass = 'Base' . $classname . 'Peer'; // TODO is this always true?
-		$callable = array($peerclass, 'getFieldnames');
-		$args = array($type);
-
-		return call_user_func_array($callable, $args);
-	}
-
-	static public function translateFieldname($classname, $fieldname, $fromType, $toType) {
-
-		// TODO we should take care of including the peer class here
-
-		$peerclass = 'Base' . $classname . 'Peer'; // TODO is this always true?
-		$callable = array($peerclass, 'translateFieldname');
-		$args = array($fieldname, $fromType, $toType);
-
-		return call_user_func_array($callable, $args);
-	}
-
-	/**
-	 * Method to perform deletes based on values and keys in a
-	 * Criteria.
-	 *
-	 * @param      Criteria $criteria The criteria to use.
-	 * @param      PropelPDO $con A PropelPDO connection object.
-	 * @return     int	The number of rows affected by last statement execution.  For most
-	 * 				uses there is only one delete statement executed, so this number
-	 * 				will correspond to the number of rows affected by the call to this
-	 * 				method.  Note that the return value does require that this information
-	 * 				is returned (supported) by the PDO driver.
-	 * @throws     PropelException
-	 */
-	public static function doDelete(Criteria $criteria, PropelPDO $con)
-	{
-		$db = Propel::getDB($criteria->getDbName());
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-
-		// Set up a list of required tables (one DELETE statement will
-		// be executed per table)
-
-		$tables_keys = array();
-		foreach ($criteria as $c) {
-			foreach ($c->getAllTables() as $tableName) {
-				$tableName2 = $criteria->getTableForAlias($tableName);
-				if ($tableName2 !== null) {
-					$tables_keys[$tableName2 . ' ' . $tableName] = true;
-				} else {
-					$tables_keys[$tableName] = true;
-				}
-			}
-		} // foreach criteria->keys()
-
-		$affectedRows = 0; // initialize this in case the next loop has no iterations.
-
-		$tables = array_keys($tables_keys);
-
-		foreach ($tables as $tableName) {
-
-			$whereClause = array();
-			$selectParams = array();
-			foreach ($dbMap->getTable($tableName)->getColumns() as $colMap) {
-				$key = $tableName . '.' . $colMap->getColumnName();
-				if ($criteria->containsKey($key)) {
-					$sb = "";
-					$criteria->getCriterion($key)->appendPsTo($sb, $selectParams);
-					$whereClause[] = $sb;
-				}
-			}
-
-			if (empty($whereClause)) {
-				throw new PropelException("Cowardly refusing to delete from table $tableName with empty WHERE clause.");
-			}
-
-			// Execute the statement.
-			try {
-				$sql = "DELETE FROM " . $tableName . " WHERE " .  implode(" AND ", $whereClause);
-				$stmt = $con->prepare($sql);
-				self::populateStmtValues($stmt, $selectParams, $dbMap, $db);
-				$stmt->execute();
-				$affectedRows = $stmt->rowCount();
-			} catch (Exception $e) {
-				Propel::log($e->getMessage(), Propel::LOG_ERR);
-				throw new PropelException("Unable to execute DELETE statement.",$e);
-			}
-
-		} // for each table
-
-		return $affectedRows;
-	}
-
-	/**
-	 * Method to deletes all contents of specified table.
-	 *
-	 * This method is invoked from generated Peer classes like this:
-	 * <code>
-	 * public static function doDeleteAll($con = null)
-	 * {
-	 *   if ($con === null) $con = Propel::getConnection(self::DATABASE_NAME);
-	 *   BasePeer::doDeleteAll(self::TABLE_NAME, $con);
-	 * }
-	 * </code>
-	 *
-	 * @param      string $tableName The name of the table to empty.
-	 * @param      PropelPDO $con A PropelPDO connection object.
-	 * @return     int	The number of rows affected by the statement.  Note
-	 * 				that the return value does require that this information
-	 * 				is returned (supported) by the Creole db driver.
-	 * @throws     PropelException - wrapping SQLException caught from statement execution.
-	 */
-	public static function doDeleteAll($tableName, PropelPDO $con)
-	{
-		try {
-			$sql = "DELETE FROM " . $tableName;
-			$stmt = $con->prepare($sql);
-			$stmt->execute();
-			return $stmt->rowCount();
-		} catch (Exception $e) {
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException("Unable to perform DELETE ALL operation.", $e);
-		}
-	}
-
-	/**
-	 * Method to perform inserts based on values and keys in a
-	 * Criteria.
-	 * <p>
-	 * If the primary key is auto incremented the data in Criteria
-	 * will be inserted and the auto increment value will be returned.
-	 * <p>
-	 * If the primary key is included in Criteria then that value will
-	 * be used to insert the row.
-	 * <p>
-	 * If no primary key is included in Criteria then we will try to
-	 * figure out the primary key from the database map and insert the
-	 * row with the next available id using util.db.IDBroker.
-	 * <p>
-	 * If no primary key is defined for the table the values will be
-	 * inserted as specified in Criteria and null will be returned.
-	 *
-	 * @param      Criteria $criteria Object containing values to insert.
-	 * @param      PropelPDO $con A PropelPDO connection.
-	 * @return     mixed The primary key for the new row if (and only if!) the primary key
-	 *				is auto-generated.  Otherwise will return <code>null</code>.
-	 * @throws     PropelException
-	 */
-	public static function doInsert(Criteria $criteria, PropelPDO $con) {
-
-		// the primary key
-		$id = null;
-
-		$db = Propel::getDB($criteria->getDbName());
-
-		// Get the table name and method for determining the primary
-		// key value.
-		$keys = $criteria->keys();
-		if (!empty($keys)) {
-			$tableName = $criteria->getTableName( $keys[0] );
-		} else {
-			throw new PropelException("Database insert attempted without anything specified to insert");
-		}
-
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-		$tableMap = $dbMap->getTable($tableName);
-		$keyInfo = $tableMap->getPrimaryKeyMethodInfo();
-		$useIdGen = $tableMap->isUseIdGenerator();
-		//$keyGen = $con->getIdGenerator();
-
-		$pk = self::getPrimaryKey($criteria);
-
-		// only get a new key value if you need to
-		// the reason is that a primary key might be defined
-		// but you are still going to set its value. for example:
-		// a join table where both keys are primary and you are
-		// setting both columns with your own values
-
-		// pk will be null if there is no primary key defined for the table
-		// we're inserting into.
-		if ($pk !== null && $useIdGen && !$criteria->keyContainsValue($pk->getFullyQualifiedName()) && $db->isGetIdBeforeInsert()) {
-			try {
-				$id = $db->getId($con, $keyInfo);
-			} catch (Exception $e) {
-				throw new PropelException("Unable to get sequence id.", $e);
-			}
-			$criteria->add($pk->getFullyQualifiedName(), $id);
-		}
-
-		try {
-			$adapter = Propel::getDB($criteria->getDBName());
-
-			$qualifiedCols = $criteria->keys(); // we need table.column cols when populating values
-			$columns = array(); // but just 'column' cols for the SQL
-			foreach ($qualifiedCols as $qualifiedCol) {
-				$columns[] = substr($qualifiedCol, strrpos($qualifiedCol, '.') + 1);
-			}
-
-			// add identifiers
-			if ($adapter->useQuoteIdentifier()) {
-				$columns = array_map(array($adapter, 'quoteIdentifier'), $columns);
-			}
-
-			$sql = 'INSERT INTO ' . $tableName
-			. ' (' . implode(',', $columns) . ')'
-			. ' VALUES (';
-			// . substr(str_repeat("?,", count($columns)), 0, -1) . 
-			for($p=1, $cnt=count($columns); $p <= $cnt; $p++) {
-				$sql .= ':p'.$p;
-				if ($p !== $cnt) $sql .= ',';
-			}
-			$sql .= ')';
-
-			$stmt = $con->prepare($sql);
-			self::populateStmtValues($stmt, self::buildParams($qualifiedCols, $criteria), $dbMap, $db);
-			$stmt->execute();
-
-		} catch (Exception $e) {
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException("Unable to execute INSERT statement.", $e);
-		}
-
-		// If the primary key column is auto-incremented, get the id now.
-		if ($pk !== null && $useIdGen && $db->isGetIdAfterInsert()) {
-			try {
-				$id = $db->getId($con, $keyInfo);
-			} catch (Exception $e) {
-				throw new PropelException("Unable to get autoincrement id.", $e);
-			}
-		}
-
-		return $id;
-	}
-
-	/**
-	 * Method used to update rows in the DB.  Rows are selected based
-	 * on selectCriteria and updated using values in updateValues.
-	 * <p>
-	 * Use this method for performing an update of the kind:
-	 * <p>
-	 * WHERE some_column = some value AND could_have_another_column =
-	 * another value AND so on.
-	 *
-	 * @param      $selectCriteria A Criteria object containing values used in where
-	 *		clause.
-	 * @param      $updateValues A Criteria object containing values used in set
-	 *		clause.
-	 * @param      PropelPDO $con The PropelPDO connection object to use.
-	 * @return     int	The number of rows affected by last update statement.  For most
-	 * 				uses there is only one update statement executed, so this number
-	 * 				will correspond to the number of rows affected by the call to this
-	 * 				method.  Note that the return value does require that this information
-	 * 				is returned (supported) by the Creole db driver.
-	 * @throws     PropelException
-	 */
-	public static function doUpdate(Criteria $selectCriteria, Criteria $updateValues, PropelPDO $con) {
-
-		$db = Propel::getDB($selectCriteria->getDbName());
-		$dbMap = Propel::getDatabaseMap($selectCriteria->getDbName());
-
-		// Get list of required tables, containing all columns
-		$tablesColumns = $selectCriteria->getTablesColumns();
-
-		// we also need the columns for the update SQL
-		$updateTablesColumns = $updateValues->getTablesColumns();
-
-		$affectedRows = 0; // initialize this in case the next loop has no iterations.
-
-		foreach ($tablesColumns as $tableName => $columns) {
-
-			$whereClause = array();
-			
-			$params = array();
-
-			$stmt = null;
-			try {
-
-				$sql = "UPDATE " . $tableName . " SET ";
-				$p = 1;
-				foreach ($updateTablesColumns[$tableName] as $col) {
-					$updateColumnName = substr($col, strrpos($col, '.') + 1);
-					// add identifiers for the actual database?
-					if ($db->useQuoteIdentifier()) {
-						$updateColumnName = $db->quoteIdentifier($updateColumnName);
-					}
-					if ($updateValues->getComparison($col) != Criteria::CUSTOM_EQUAL) {
-						$sql .= $updateColumnName . '=:p'.$p++.', ';
-					} else {
-						$param = $updateValues->get($col);
-						$sql .= $updateColumnName . ' = ';
-						if (is_array($param)) {
-							if (isset($param['raw'])) {
-								$raw = $param['raw'];
-								$rawcvt = '';
-								// parse the $params['raw'] for ? chars
-								for($r=0,$len=strlen($raw); $r < $len; $r++) {
-									if ($raw{$r} == '?') {
-										$rawcvt .= ':p'.$p++;
-									} else {
-										$rawcvt .= $raw{$r};
-									}
-								}
-								$sql .= $rawcvt . ', ';
-							} else {
-								$sql .= ':p'.$p++.', ';
-							}
-							if (isset($param['value'])) {
-								$updateValues->put($col, $param['value']);
-							}
-						} else {
-							$updateValues->remove($col);
-							$sql .= $param . ', ';
-						}
-					}
-				}
-				
-				$params = self::buildParams($updateTablesColumns[$tableName], $updateValues);
-				
-				foreach ($columns as $colName) {
-					$sb = "";
-					$selectCriteria->getCriterion($colName)->appendPsTo($sb, $params);
-					$whereClause[] = $sb;
-				}
-			
-				$sql = substr($sql, 0, -2) . " WHERE " .  implode(" AND ", $whereClause);
-
-				$stmt = $con->prepare($sql);
-
-				// Replace ':p?' with the actual values
-				self::populateStmtValues($stmt, $params, $dbMap, $db);
-
-				$stmt->execute();
-
-				$affectedRows = $stmt->rowCount();
-
-				$stmt = null; // close
-
-			} catch (Exception $e) {
-				if ($stmt) $stmt = null; // close
-				Propel::log($e->getMessage(), Propel::LOG_ERR);
-				throw new PropelException("Unable to execute UPDATE statement.", $e);
-			}
-
-		} // foreach table in the criteria
-
-		return $affectedRows;
-	}
-
-	/**
-	 * Executes query build by createSelectSql() and returns the resultset statement.
-	 *
-	 * @param      Criteria $criteria A Criteria.
-	 * @param      PropelPDO $con A PropelPDO connection to use.
-	 * @return     PDOStatement The resultset.
-	 * @throws     PropelException
-	 * @see        createSelectSql()
-	 */
-	public static function doSelect(Criteria $criteria, PropelPDO $con = null)
-	{
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-		$db = Propel::getDB($criteria->getDbName());
-
-		if ($con === null) {
-			$con = Propel::getConnection($criteria->getDbName(), Propel::CONNECTION_READ);
-		}
-
-		$stmt = null;
-
-		if ($criteria->isUseTransaction()) $con->beginTransaction();
-
-		try {
-
-			$params = array();
-			$sql = self::createSelectSql($criteria, $params);
-
-			$stmt = $con->prepare($sql);
-
-			self::populateStmtValues($stmt, $params, $dbMap, $db);
-
-			$stmt->execute();
-
-			if ($criteria->isUseTransaction()) $con->commit();
-
-		} catch (Exception $e) {
-			if ($stmt) $stmt = null; // close
-			if ($criteria->isUseTransaction()) $con->rollBack();
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException($e);
-		}
-
-		return $stmt;
-	}
-
-	/**
-	 * Executes a COUNT query using either a simple SQL rewrite or, for more complex queries, a
-	 * sub-select of the SQL created by createSelectSql() and returns the statement.
-	 *
-	 * @param      Criteria $criteria A Criteria.
-	 * @param      PropelPDO $con A PropelPDO connection to use.
-	 * @return     PDOStatement The resultset statement.
-	 * @throws     PropelException
-	 * @see        createSelectSql()
-	 */
-	public static function doCount(Criteria $criteria, PropelPDO $con = null)
-	{
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-		$db = Propel::getDB($criteria->getDbName());
-
-		if ($con === null) {
-			$con = Propel::getConnection($criteria->getDbName(), Propel::CONNECTION_READ);
-		}
-
-		$stmt = null;
-
-		if ($criteria->isUseTransaction()) $con->beginTransaction();
-
-		$needsComplexCount = ($criteria->getGroupByColumns() || $criteria->getOffset()
-								|| $criteria->getLimit() || $criteria->getHaving() || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers()));
-
-		try {
-
-			$params = array();
-
-			if ($needsComplexCount) {
-				if (self::needsSelectAliases($criteria)) {
-					self::turnSelectColumnsToAliases($criteria);
-				}
-				$selectSql = self::createSelectSql($criteria, $params);
-				$sql = 'SELECT COUNT(*) FROM (' . $selectSql . ') AS propelmatch4cnt';
-			} else {
-				// Replace SELECT columns with COUNT(*)
-				$criteria->clearSelectColumns()->addSelectColumn('COUNT(*)');
-				$sql = self::createSelectSql($criteria, $params);
-			}
-
-			$stmt = $con->prepare($sql);
-			self::populateStmtValues($stmt, $params, $dbMap, $db);
-			$stmt->execute();
-
-			if ($criteria->isUseTransaction()) $con->commit();
-
-		} catch (Exception $e) {
-			if ($stmt) $stmt = null; // close
-			if ($criteria->isUseTransaction()) $con->rollBack();
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException($e);
-		}
-
-		return $stmt;
-	}
-
-	/**
-	 * Populates values in a prepared statement.
-	 *
-	 * This method is designed to work with the createSelectSql() method, which creates
-	 * both the SELECT SQL statement and populates a passed-in array of parameter
-	 * values that should be substituted.
-	 *
-	 * <code>
-	 * $params = array();
-	 * $sql = BasePeer::createSelectSql($criteria, $params);
-	 * BasePeer::populateStmtValues($stmt, $params, Propel::getDatabaseMap($critera->getDbName()), Propel::getDB($criteria->getDbName()));
-	 * </code>
-	 *
-	 * @param      PDOStatement $stmt
-	 * @param      array $params array('column' => ..., 'table' => ..., 'value' => ...)
-	 * @param      DatabaseMap $dbMap
-	 * @return     int The number of params replaced.
-	 * @see        createSelectSql()
-	 * @see        doSelect()
-	 */
-	public static function populateStmtValues(PDOStatement $stmt, array $params, DatabaseMap $dbMap, DBAdapter $db)
-	{
-		$i = 1;
-		foreach ($params as $param) {
-			$tableName = $param['table'];
-			$columnName = $param['column'];
-			$value = $param['value'];
-
-			if ($value === null) {
-
-				$stmt->bindValue(':p'.$i++, null, PDO::PARAM_NULL);
-
-			} elseif (isset($tableName) ) {
-
-				$cMap = $dbMap->getTable($tableName)->getColumn($columnName);
-				$type = $cMap->getType();
-				$pdoType = $cMap->getPdoType();
-
-				// FIXME - This is a temporary hack to get around apparent bugs w/ PDO+MYSQL
-				// See http://pecl.php.net/bugs/bug.php?id=9919
-				if ($pdoType == PDO::PARAM_BOOL && $db instanceof DBMySQL) {
-					$value = (int) $value;
-					$pdoType = PDO::PARAM_INT;
-				} elseif (is_numeric($value) && $cMap->isEpochTemporal()) { // it's a timestamp that needs to be formatted
-					if ($type == PropelColumnTypes::TIMESTAMP) {
-						$value = date($db->getTimestampFormatter(), $value);
-					} else if ($type == PropelColumnTypes::DATE) {
-						$value = date($db->getDateFormatter(), $value);
-					} else if ($type == PropelColumnTypes::TIME) {
-						$value = date($db->getTimeFormatter(), $value);
-					}
-				} elseif ($value instanceof DateTime && $cMap->isTemporal()) { // it's a timestamp that needs to be formatted
-					if ($type == PropelColumnTypes::TIMESTAMP || $type == PropelColumnTypes::BU_TIMESTAMP) {
-						$value = $value->format($db->getTimestampFormatter());
-					} else if ($type == PropelColumnTypes::DATE || $type == PropelColumnTypes::BU_DATE) {
-						$value = $value->format($db->getDateFormatter());
-					} else if ($type == PropelColumnTypes::TIME) {
-						$value = $value->format($db->getTimeFormatter());
-					}
-				} elseif (is_resource($value) && $cMap->isLob()) {
-					// we always need to make sure that the stream is rewound, otherwise nothing will
-					// get written to database.
-					rewind($value);
-				}
-
-				$stmt->bindValue(':p'.$i++, $value, $pdoType);
-			} else {
-				$stmt->bindValue(':p'.$i++, $value);
-			}
-		} // foreach
-	}
-
-	/**
-	 * Applies any validators that were defined in the schema to the specified columns.
-	 *
-	 * @param      string $dbName The name of the database
-	 * @param      string $tableName The name of the table
-	 * @param      array $columns Array of column names as key and column values as value.
-	 */
-	public static function doValidate($dbName, $tableName, $columns)
-	{
-		$dbMap = Propel::getDatabaseMap($dbName);
-		$tableMap = $dbMap->getTable($tableName);
-		$failureMap = array(); // map of ValidationFailed objects
-		foreach ($columns as $colName => $colValue) {
-			if ($tableMap->containsColumn($colName)) {
-				$col = $tableMap->getColumn($colName);
-				foreach ($col->getValidators() as $validatorMap) {
-					$validator = BasePeer::getValidator($validatorMap->getClass());
-					if ($validator && ($col->isNotNull() || $colValue !== null) && $validator->isValid($validatorMap, $colValue) === false) {
-						if (!isset($failureMap[$colName])) { // for now we do one ValidationFailed per column, not per rule
-							$failureMap[$colName] = new ValidationFailed($colName, $validatorMap->getMessage(), $validator);
-						}
-					}
-				}
-			}
-		}
-		return (!empty($failureMap) ? $failureMap : true);
-	}
-
-	/**
-	 * Helper method which returns the primary key contained
-	 * in the given Criteria object.
-	 *
-	 * @param      Criteria $criteria A Criteria.
-	 * @return     ColumnMap If the Criteria object contains a primary
-	 *		  key, or null if it doesn't.
-	 * @throws     PropelException
-	 */
-	private static function getPrimaryKey(Criteria $criteria)
-	{
-		// Assume all the keys are for the same table.
-		$keys = $criteria->keys();
-		$key = $keys[0];
-		$table = $criteria->getTableName($key);
-
-		$pk = null;
-
-		if (!empty($table)) {
-
-			$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-
-			if ($dbMap === null) {
-				throw new PropelException("\$dbMap is null");
-			}
-
-			if ($dbMap->getTable($table) === null) {
-				throw new PropelException("\$dbMap->getTable() is null");
-			}
-
-			$columns = $dbMap->getTable($table)->getColumns();
-			foreach (array_keys($columns) as $key) {
-				if ($columns[$key]->isPrimaryKey()) {
-					$pk = $columns[$key];
-					break;
-				}
-			}
-		}
-		return $pk;
-	}
-
-	/**
-	 * Checks whether the Criteria needs to use column aliasing
-	 * This is implemented in a service class rather than in Criteria itself
-	 * in order to avoid doing the tests when it's not necessary (e.g. for SELECTs)
-	 */
-	public static function needsSelectAliases(Criteria $criteria)
-	{
-		$columnNames = array();
-		foreach ($criteria->getSelectColumns() as $fullyQualifiedColumnName) {
-			if ($pos = strrpos($fullyQualifiedColumnName, '.')) {
-				$columnName = substr($fullyQualifiedColumnName, $pos);
-				if (isset($columnNames[$columnName])) {
-					// more than one column with the same name, so aliasing is required
-					return true;
-				}
-				$columnNames[$columnName] = true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Ensures uniqueness of select column names by turning them all into aliases
-	 * This is necessary for queries on more than one table when the tables share a column name
-	 * @see http://propel.phpdb.org/trac/ticket/795
-	 *
-	 * @param Criteria $criteria
-	 * 
-	 * @return Criteria The input, with Select columns replaced by aliases
-	 */
-	public static function turnSelectColumnsToAliases(Criteria $criteria)
-	{
-		$selectColumns = $criteria->getSelectColumns();
-		// clearSelectColumns also clears the aliases, so get them too
-		$asColumns = $criteria->getAsColumns();
-		$criteria->clearSelectColumns();
-		$columnAliases = $asColumns;
-		// add the select columns back
-		foreach ($selectColumns as $clause) {
-			// Generate a unique alias
-			$baseAlias = preg_replace('/\W/', '_', $clause);
-			$alias = $baseAlias;
-			// If it already exists, add a unique suffix
-			$i = 0;
-			while (isset($columnAliases[$alias])) {
-				$i++;
-				$alias = $baseAlias . '_' . $i;
-			}
-			// Add it as an alias
-			$criteria->addAsColumn($alias, $clause);
-			$columnAliases[$alias] = $clause;
-		}
-		// Add the aliases back, don't modify them
-		foreach ($asColumns as $name => $clause) {
-			$criteria->addAsColumn($name, $clause);
-		}
-		
-		return $criteria;
-	}
-	
-	/**
-	 * Method to create an SQL query based on values in a Criteria.
-	 *
-	 * This method creates only prepared statement SQL (using ? where values
-	 * will go).  The second parameter ($params) stores the values that need
-	 * to be set before the statement is executed.  The reason we do it this way
-	 * is to let the PDO layer handle all escaping & value formatting.
-	 *
-	 * @param      Criteria $criteria Criteria for the SELECT query.
-	 * @param      array &$params Parameters that are to be replaced in prepared statement.
-	 * @return     string
-	 * @throws     PropelException Trouble creating the query string.
-	 */
-	public static function createSelectSql(Criteria $criteria, &$params)
-	{
-		$db = Propel::getDB($criteria->getDbName());
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-
-		// redundant definition $selectModifiers = array();
-		$selectClause = array();
-		$fromClause = array();
-		$joinClause = array();
-		$joinTables = array();
-		$whereClause = array();
-		$orderByClause = array();
-		// redundant definition $groupByClause = array();
-
-		$orderBy = $criteria->getOrderByColumns();
-		$groupBy = $criteria->getGroupByColumns();
-		$ignoreCase = $criteria->isIgnoreCase();
-		$select = $criteria->getSelectColumns();
-		$aliases = $criteria->getAsColumns();
-
-		// simple copy
-		$selectModifiers = $criteria->getSelectModifiers();
-
-		// get selected columns
-		foreach ($select as $columnName) {
-
-			// expect every column to be of "table.column" formation
-			// it could be a function:  e.g. MAX(books.price)
-
-			$tableName = null;
-
-			$selectClause[] = $columnName; // the full column name: e.g. MAX(books.price)
-
-			$parenPos = strrpos($columnName, '(');
-			$dotPos = strrpos($columnName, '.', ($parenPos !== false ? $parenPos : 0));
-
-			// [HL] I think we really only want to worry about adding stuff to
-			// the fromClause if this function has a TABLE.COLUMN in it at all.
-			// e.g. COUNT(*) should not need this treatment -- or there needs to
-			// be special treatment for '*'
-			if ($dotPos !== false) {
-
-				if ($parenPos === false) { // table.column
-					$tableName = substr($columnName, 0, $dotPos);
-				} else { // FUNC(table.column)
-					$tableName = substr($columnName, $parenPos + 1, $dotPos - ($parenPos + 1));
-					// functions may contain qualifiers so only take the last
-					// word as the table name.
-					// COUNT(DISTINCT books.price)
-					$lastSpace = strpos($tableName, ' ');
-					if ($lastSpace !== false) { // COUNT(DISTINCT books.price)
-						$tableName = substr($tableName, $lastSpace + 1);
-					}
-				}
-				$tableName2 = $criteria->getTableForAlias($tableName);
-				if ($tableName2 !== null) {
-					$fromClause[] = $tableName2 . ' ' . $tableName;
-				} else {
-					$fromClause[] = $tableName;
-				}
-
-			} // if $dotPost !== null
-		}
-
-		// set the aliases
-		foreach ($aliases as $alias => $col) {
-			$selectClause[] = $col . " AS " . $alias;
-		}
-
-		// add the criteria to WHERE clause
-		// this will also add the table names to the FROM clause if they are not already
-		// invluded via a LEFT JOIN
-		foreach ($criteria->keys() as $key) {
-
-			$criterion = $criteria->getCriterion($key);
-			$someCriteria = $criterion->getAttachedCriterion();
-			$someCriteriaLength = count($someCriteria);
-			$table = null;
-			for ($i=0; $i < $someCriteriaLength; $i++) {
-				$tableName = $someCriteria[$i]->getTable();
-
-				$table = $criteria->getTableForAlias($tableName);
-				if ($table !== null) {
-					$fromClause[] = $table . ' ' . $tableName;
-				} else {
-					$fromClause[] = $tableName;
-					$table = $tableName;
-				}
-
-				$ignoreCase =
-				(($criteria->isIgnoreCase()
-				|| $someCriteria[$i]->isIgnoreCase())
-				&& (strpos($dbMap->getTable($table)->getColumn($someCriteria[$i]->getColumn())->getType(), "VARCHAR") !== false)
-				);
-
-				$someCriteria[$i]->setIgnoreCase($ignoreCase);
-			}
-
-			$criterion->setDB($db);
-
-			$sb = "";
-			$criterion->appendPsTo($sb, $params);
-			$whereClause[] = $sb;
-		}
-
-		// Handle joins
-		// joins with a null join type will be added to the FROM clause and the condition added to the WHERE clause.
-		// joins of a specified type: the LEFT side will be added to the fromClause and the RIGHT to the joinClause
-		foreach ((array) $criteria->getJoins() as $join) { 
-			// The join might have been established using an alias name
-			$leftTable = $join->getLeftTableName();
-			$leftTableAlias = '';
-			if ($realTable = $criteria->getTableForAlias($leftTable)) {
-				$leftTableAlias = " $leftTable";
-				$leftTable = $realTable;
-			}
-
-			$rightTable = $join->getRightTableName();
-			$rightTableAlias = '';
-			if ($realTable = $criteria->getTableForAlias($rightTable)) {
-				$rightTableAlias = " $rightTable";
-				$rightTable = $realTable;
-			}
-
-			// determine if casing is relevant.
-			if ($ignoreCase = $criteria->isIgnoreCase()) {
-				$leftColType = $dbMap->getTable($leftTable)->getColumn($join->getLeftColumnName())->getType();
-				$rightColType = $dbMap->getTable($rightTable)->getColumn($join->getRightColumnName())->getType();
-				$ignoreCase = ($leftColType == 'string' || $rightColType == 'string');
-			}
-
-			// build the condition
-			$condition = '';
-			foreach ($join->getConditions() as $index => $conditionDesc)
-			{
-				if ($ignoreCase) {
-					$condition .= $db->ignoreCase($conditionDesc['left']) . $conditionDesc['operator'] . $db->ignoreCase($conditionDesc['right']);
-				} else {
-					$condition .= implode($conditionDesc);
-				}
-				if ($index + 1 < $join->countConditions()) {
-					$condition .= ' AND ';
-				}
-			}
-
-			// add 'em to the queues..
-			if ($joinType = $join->getJoinType()) {
-			  // real join
-				if (!$fromClause) {
-					$fromClause[] = $leftTable . $leftTableAlias;
-				}
-				$joinTables[] = $rightTable . $rightTableAlias;
-				$joinClause[] = $join->getJoinType() . ' ' . $rightTable . $rightTableAlias . " ON ($condition)";
-			} else {
-			  // implicit join, translates to a where
-				$fromClause[] = $leftTable . $leftTableAlias;
-				$fromClause[] = $rightTable . $rightTableAlias;
-				$whereClause[] = $condition;
-			}
-		}
-
-		// Unique from clause elements
-		$fromClause = array_unique($fromClause);
-		$fromClause = array_diff($fromClause, array(''));
-		
-		// tables should not exist in both the from and join clauses
-		if ($joinTables && $fromClause) {
-			foreach ($fromClause as $fi => $ftable) {
-				if (in_array($ftable, $joinTables)) {
-					unset($fromClause[$fi]);
-				}
-			}
-		}
-
-		// Add the GROUP BY columns
-		$groupByClause = $groupBy;
-
-		$having = $criteria->getHaving();
-		$havingString = null;
-		if ($having !== null) {
-			$sb = "";
-			$having->appendPsTo($sb, $params);
-			$havingString = $sb;
-		}
-
-		if (!empty($orderBy)) {
-
-			foreach ($orderBy as $orderByColumn) {
-
-				// Add function expression as-is.
-
-				if (strpos($orderByColumn, '(') !== false) {
-					$orderByClause[] = $orderByColumn;
-					continue;
-				}
-
-				// Split orderByColumn (i.e. "table.column DESC")
-
-				$dotPos = strrpos($orderByColumn, '.');
-
-				if ($dotPos !== false) {
-					$tableName = substr($orderByColumn, 0, $dotPos);
-					$columnName = substr($orderByColumn, $dotPos+1);
-				}
-				else {
-					$tableName = '';
-					$columnName = $orderByColumn;
-				}
-
-				$spacePos = strpos($columnName, ' ');
-
-				if ($spacePos !== false) {
-					$direction = substr($columnName, $spacePos);
-					$columnName = substr($columnName, 0, $spacePos);
-				}
-				else {
-					$direction = '';
-				}
-
-				$tableAlias = $tableName;
-				if ($aliasTableName = $criteria->getTableForAlias($tableName)) {
-					$tableName = $aliasTableName;
-				}
-
-				$columnAlias = $columnName;
-				if ($asColumnName = $criteria->getColumnForAs($columnName)) {
-					$columnName = $asColumnName;
-				}
-
-				$column = $tableName ? $dbMap->getTable($tableName)->getColumn($columnName) : null;
-
-				if ($criteria->isIgnoreCase() && $column && $column->isText()) {
-					$orderByClause[] = $db->ignoreCaseInOrderBy("$tableAlias.$columnAlias") . $direction;
-					$selectClause[] = $db->ignoreCaseInOrderBy("$tableAlias.$columnAlias");
-				} else {
-					$orderByClause[] = $orderByColumn;
-				}
-			}
-		}
-
-		if (empty($fromClause) && $criteria->getPrimaryTableName()) {
-			$fromClause[] = $criteria->getPrimaryTableName();
-		}
-
-		// from / join tables quoten if it is necessary
-		if ($db->useQuoteIdentifier()) {
-			$fromClause = array_map(array($db, 'quoteIdentifierTable'), $fromClause);
-			$joinClause = $joinClause ? $joinClause : array_map(array($db, 'quoteIdentifierTable'), $joinClause);
-		}
-
-		// build from-clause
-		$from = '';
-		if (!empty($joinClause) && count($fromClause) > 1) {
-			$from .= implode(" CROSS JOIN ", $fromClause);
-		} else {
-			$from .= implode(", ", $fromClause);
-		}
-		
-		$from .= $joinClause ? ' ' . implode(' ', $joinClause) : '';
-
-		// Build the SQL from the arrays we compiled
-		$sql =  "SELECT "
-		.($selectModifiers ? implode(" ", $selectModifiers) . " " : "")
-		.implode(", ", $selectClause)
-		." FROM "  . $from
-		.($whereClause ? " WHERE ".implode(" AND ", $whereClause) : "")
-		.($groupByClause ? " GROUP BY ".implode(",", $groupByClause) : "")
-		.($havingString ? " HAVING ".$havingString : "")
-		.($orderByClause ? " ORDER BY ".implode(",", $orderByClause) : "");
-
-		// APPLY OFFSET & LIMIT to the query.
-		if ($criteria->getLimit() || $criteria->getOffset()) {
-			$db->applyLimit($sql, $criteria->getOffset(), $criteria->getLimit());
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * Builds a params array, like the kind populated by Criterion::appendPsTo().
-	 * This is useful for building an array even when it is not using the appendPsTo() method.
-	 * @param      array $columns
-	 * @param      Criteria $values
-	 * @return     array params array('column' => ..., 'table' => ..., 'value' => ...)
-	 */
-	private static function buildParams($columns, Criteria $values)
-	{
-		$params = array();
-		foreach ($columns as $key) {
-			if ($values->containsKey($key)) {
-				$crit = $values->getCriterion($key);
-				$params[] = array('column' => $crit->getColumn(), 'table' => $crit->getTable(), 'value' => $crit->getValue());
-			}
-		}
-		return $params;
-	}
-
-	/**
-	 * This function searches for the given validator $name under propel/validator/$name.php,
-	 * imports and caches it.
-	 *
-	 * @param      string $classname The dot-path name of class (e.g. myapp.propel.MyValidator)
-	 * @return     Validator object or null if not able to instantiate validator class (and error will be logged in this case)
-	 */
-	public static function getValidator($classname)
-	{
-		try {
-			$v = isset(self::$validatorMap[$classname]) ? self::$validatorMap[$classname] : null;
-			if ($v === null) {
-				$cls = Propel::importClass($classname);
-				$v = new $cls();
-				self::$validatorMap[$classname] = $v;
-			}
-			return $v;
-		} catch (Exception $e) {
-			Propel::log("BasePeer::getValidator(): failed trying to instantiate " . $classname . ": ".$e->getMessage(), Propel::LOG_ERR);
-		}
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/Criteria.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/Criteria.php
deleted file mode 100644
index 42f11be..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/Criteria.php
+++ /dev/null
@@ -1,1754 +0,0 @@
-<?php
-/*
- *  $Id: Criteria.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is a utility class for holding criteria information for a query.
- *
- * BasePeer constructs SQL statements based on the values in this class.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Kaspars Jaudzems <kaspars.jaudzems at inbox.lv> (Propel)
- * @author     Frank Y. Kim <frank.kim at clearink.com> (Torque)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @author     Eric Dobbs <eric at dobbse.net> (Torque)
- * @author     Henning P. Schmiedehausen <hps at intermeta.de> (Torque)
- * @author     Sam Joseph <sam at neurogrid.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.util
- */
-class Criteria implements IteratorAggregate {
-
-	/** Comparison type. */
-	const EQUAL = "=";
-
-	/** Comparison type. */
-	const NOT_EQUAL = "<>";
-
-	/** Comparison type. */
-	const ALT_NOT_EQUAL = "!=";
-
-	/** Comparison type. */
-	const GREATER_THAN = ">";
-
-	/** Comparison type. */
-	const LESS_THAN = "<";
-
-	/** Comparison type. */
-	const GREATER_EQUAL = ">=";
-
-	/** Comparison type. */
-	const LESS_EQUAL = "<=";
-
-	/** Comparison type. */
-	const LIKE = " LIKE ";
-
-	/** Comparison type. */
-	const NOT_LIKE = " NOT LIKE ";
-
-	/** PostgreSQL comparison type */
-	const ILIKE = " ILIKE ";
-
-	/** PostgreSQL comparison type */
-	const NOT_ILIKE = " NOT ILIKE ";
-
-	/** Comparison type. */
-	const CUSTOM = "CUSTOM";
-
-	/** Comparison type for update */
-	const CUSTOM_EQUAL = "CUSTOM_EQUAL";
-
-	/** Comparison type. */
-	const DISTINCT = "DISTINCT ";
-
-	/** Comparison type. */
-	const IN = " IN ";
-
-	/** Comparison type. */
-	const NOT_IN = " NOT IN ";
-
-	/** Comparison type. */
-	const ALL = "ALL ";
-
-	/** Comparison type. */
-	const JOIN = "JOIN";
-
-	/** Binary math operator: AND */
-	const BINARY_AND = "&";
-
-	/** Binary math operator: OR */
-	const BINARY_OR = "|";
-
-	/** "Order by" qualifier - ascending */
-	const ASC = "ASC";
-
-	/** "Order by" qualifier - descending */
-	const DESC = "DESC";
-
-	/** "IS NULL" null comparison */
-	const ISNULL = " IS NULL ";
-
-	/** "IS NOT NULL" null comparison */
-	const ISNOTNULL = " IS NOT NULL ";
-
-	/** "CURRENT_DATE" ANSI SQL function */
-	const CURRENT_DATE = "CURRENT_DATE";
-
-	/** "CURRENT_TIME" ANSI SQL function */
-	const CURRENT_TIME = "CURRENT_TIME";
-
-	/** "CURRENT_TIMESTAMP" ANSI SQL function */
-	const CURRENT_TIMESTAMP = "CURRENT_TIMESTAMP";
-
-	/** "LEFT JOIN" SQL statement */
-	const LEFT_JOIN = "LEFT JOIN";
-
-	/** "RIGHT JOIN" SQL statement */
-	const RIGHT_JOIN = "RIGHT JOIN";
-
-	/** "INNER JOIN" SQL statement */
-	const INNER_JOIN = "INNER JOIN";
-
-	private $ignoreCase = false;
-	private $singleRecord = false;
-	private $selectModifiers = array();
-	private $selectColumns = array();
-	private $orderByColumns = array();
-	private $groupByColumns = array();
-	private $having = null;
-	private $asColumns = array();
-	private $joins = array();
-
-	/** The name of the database. */
-	private $dbName;
-
-	/**
-	 * The primary table for this Criteria.
-	 * Useful in cases where there are no select or where
-	 * columns.
-	 * @var        string
-	 */
-	private $primaryTableName;
-
-	/** The name of the database as given in the contructor. */
-	private $originalDbName;
-
-	/**
-	 * To limit the number of rows to return.  <code>0</code> means return all
-	 * rows.
-	 */
-	private $limit = 0;
-
-	/** To start the results at a row other than the first one. */
-	private $offset = 0;
-
-	// flag to note that the criteria involves a blob.
-	private $blobFlag = null;
-
-	private $aliases = array();
-
-	private $useTransaction = false;
-
-	/**
-	 * Primary storage of criteria data.
-	 * @var        array
-	 */
-	private $map = array();
-
-	/**
-	 * Creates a new instance with the default capacity which corresponds to
-	 * the specified database.
-	 *
-	 * @param      dbName The dabase name.
-	 */
-	public function __construct($dbName = null)
-	{
-		$this->setDbName($dbName);
-		$this->originalDbName = $dbName;
-	}
-
-	/**
-	 * Implementing SPL IteratorAggregate interface.  This allows
-	 * you to foreach () over a Criteria object.
-	 */
-	public function getIterator()
-	{
-		return new CriterionIterator($this);
-	}
-
-	/**
-	 * Get the criteria map.
-	 * @return     array
-	 */
-	public function getMap()
-	{
-		return $this->map;
-	}
-
-	/**
-	 * Brings this criteria back to its initial state, so that it
-	 * can be reused as if it was new. Except if the criteria has grown in
-	 * capacity, it is left at the current capacity.
-	 * @return     void
-	 */
-	public function clear()
-	{
-		$this->map = array();
-		$this->ignoreCase = false;
-		$this->singleRecord = false;
-		$this->selectModifiers = array();
-		$this->selectColumns = array();
-		$this->orderByColumns = array();
-		$this->groupByColumns = array();
-		$this->having = null;
-		$this->asColumns = array();
-		$this->joins = array();
-		$this->dbName = $this->originalDbName;
-		$this->offset = 0;
-		$this->limit = -1;
-		$this->blobFlag = null;
-		$this->aliases = array();
-		$this->useTransaction = false;
-	}
-
-	/**
-	 * Add an AS clause to the select columns. Usage:
-	 *
-	 * <code>
-	 * Criteria myCrit = new Criteria();
-	 * myCrit->addAsColumn("alias", "ALIAS(".MyPeer::ID.")");
-	 * </code>
-	 *
-	 * @param      string $name Wanted Name of the column (alias).
-	 * @param      string $clause SQL clause to select from the table
-	 *
-	 * If the name already exists, it is replaced by the new clause.
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addAsColumn($name, $clause)
-	{
-		$this->asColumns[$name] = $clause;
-		return $this;
-	}
-
-	/**
-	 * Get the column aliases.
-	 *
-	 * @return     array An assoc array which map the column alias names
-	 * to the alias clauses.
-	 */
-	public function getAsColumns()
-	{
-		return $this->asColumns;
-	}
-
-		/**
-	 * Returns the column name associated with an alias (AS-column).
-	 *
-	 * @param      string $alias
-	 * @return     string $string
-	 */
-	public function getColumnForAs($as)
-	{
-		if (isset($this->asColumns[$as])) {
-			return $this->asColumns[$as];
-		}
-	}
-
-	/**
-	 * Allows one to specify an alias for a table that can
-	 * be used in various parts of the SQL.
-	 *
-	 * @param      string $alias
-	 * @param      string $table
-	 * @return     void
-	 */
-	public function addAlias($alias, $table)
-	{
-		$this->aliases[$alias] = $table;
-	}
-
-	/**
-	 * Returns the table name associated with an alias.
-	 *
-	 * @param      string $alias
-	 * @return     string $string
-	 */
-	public function getTableForAlias($alias)
-	{
-		if (isset($this->aliases[$alias])) {
-			return $this->aliases[$alias];
-		}
-	}
-
-	/**
-	 * Get the keys for the criteria map.
-	 * @return     array
-	 */
-	public function keys()
-	{
-		return array_keys($this->map);
-	}
-
-	/**
-	 * Does this Criteria object contain the specified key?
-	 *
-	 * @param      string $column [table.]column
-	 * @return     boolean True if this Criteria object contain the specified key.
-	 */
-	public function containsKey($column)
-	{
-		// must use array_key_exists() because the key could
-		// exist but have a NULL value (that'd be valid).
-		return array_key_exists($column, $this->map);
-	}
-
-	/**
-	 * Does this Criteria object contain the specified key and does it have a value set for the key 
-	 *
-	 * @param      string $column [table.]column
-	 * @return     boolean True if this Criteria object contain the specified key and a value for that key
-	 */
-	public function keyContainsValue($column)
-	{
-		// must use array_key_exists() because the key could
-		// exist but have a NULL value (that'd be valid).
-		return (array_key_exists($column, $this->map) && ($this->map[$column]->getValue() !== null) );
-	}
-
-	/**
-	 * Will force the sql represented by this criteria to be executed within
-	 * a transaction.  This is here primarily to support the oid type in
-	 * postgresql.  Though it can be used to require any single sql statement
-	 * to use a transaction.
-	 * @return     void
-	 */
-	public function setUseTransaction($v)
-	{
-		$this->useTransaction = (boolean) $v;
-	}
-
-	/**
-	 * Whether the sql command specified by this criteria must be wrapped
-	 * in a transaction.
-	 *
-	 * @return     boolean
-	 */
-	public function isUseTransaction()
-	{
-		return $this->useTransaction;
-	}
-
-	/**
-	 * Method to return criteria related to columns in a table.
-	 *
-	 * @param      string $column Column name.
-	 * @return     Criterion A Criterion or null if $column is invalid.
-	 */
-	public function getCriterion($column)
-	{
-		if ( isset ( $this->map[$column] ) ) {
-			return $this->map[$column];
-		}
-		return null;
-	}
-
-	/**
-	 * Method to return criterion that is not added automatically
-	 * to this Criteria.  This can be used to chain the
-	 * Criterions to form a more complex where clause.
-	 *
-	 * @param      string $column Full name of column (for example TABLE.COLUMN).
-	 * @param      mixed $value
-	 * @param      string $comparison
-	 * @return     Criterion
-	 */
-	public function getNewCriterion($column, $value, $comparison = null)
-	{
-		return new Criterion($this, $column, $value, $comparison);
-	}
-
-	/**
-	 * Method to return a String table name.
-	 *
-	 * @param      string $name Name of the key.
-	 * @return     string The value of the object at key.
-	 */
-	public function getColumnName($name)
-	{
-		if (isset($this->map[$name])) {
-			return $this->map[$name]->getColumn();
-		}
-		return null;
-	}
-
-	/**
-	 * Shortcut method to get an array of columns indexed by table.
-	 * @return     array array(table => array(table.column1, table.column2))
-	 */
-	public function getTablesColumns()
-	{
-		$tables = array();
-		foreach ( array_keys ( $this->map ) as $key) {
-			$t = substr ( $key, 0, strrpos ( $key, '.' ) );
-			if ( ! isset ( $tables[$t] ) ) {
-				$tables[$t] = array( $key );
-			} else {
-				$tables[$t][] = $key;
-			}
-		}
-		return $tables;
-	}
-
-	/**
-	 * Method to return a comparison String.
-	 *
-	 * @param      string $key String name of the key.
-	 * @return     string A String with the value of the object at key.
-	 */
-	public function getComparison($key)
-	{
-		if ( isset ( $this->map[$key] ) ) {
-			return $this->map[$key]->getComparison();
-		}
-		return null;
-	}
-
-	/**
-	 * Get the Database(Map) name.
-	 *
-	 * @return     string A String with the Database(Map) name.
-	 */
-	public function getDbName()
-	{
-		return $this->dbName;
-	}
-
-	/**
-	 * Set the DatabaseMap name.  If <code>null</code> is supplied, uses value
-	 * provided by <code>Propel::getDefaultDB()</code>.
-	 *
-	 * @param      string $dbName The Database (Map) name.
-	 * @return     void
-	 */
-	public function setDbName($dbName = null)
-	{
-		$this->dbName = ($dbName === null ? Propel::getDefaultDB() : $dbName);
-	}
-
-	/**
-	 * Get the primary table for this Criteria.
-	 *
-	 * This is useful for cases where a Criteria may not contain
-	 * any SELECT columns or WHERE columns.  This must be explicitly
-	 * set, of course, in order to be useful.
-	 *
-	 * @return     string
-	 */
-	public function getPrimaryTableName()
-	{
-		return $this->primaryTableName;
-	}
-
-	/**
-	 * Sets the primary table for this Criteria.
-	 *
-	 * This is useful for cases where a Criteria may not contain
-	 * any SELECT columns or WHERE columns.  This must be explicitly
-	 * set, of course, in order to be useful.
-	 *
-	 * @param      string $v
-	 */
-	public function setPrimaryTableName($tableName)
-	{
-		$this->primaryTableName = $tableName;
-	}
-
-	/**
-	 * Method to return a String table name.
-	 *
-	 * @param      string $name The name of the key.
-	 * @return     string The value of table for criterion at key.
-	 */
-	public function getTableName($name)
-	{
-		if (isset($this->map[$name])) {
-			return $this->map[$name]->getTable();
-		}
-		return null;
-	}
-
-	/**
-	 * Method to return the value that was added to Criteria.
-	 *
-	 * @param      string $name A String with the name of the key.
-	 * @return     mixed The value of object at key.
-	 */
-	public function getValue($name)
-	{
-		if (isset($this->map[$name])) {
-			return $this->map[$name]->getValue();
-		}
-		return null;
-	}
-
-	/**
-	 * An alias to getValue() -- exposing a Hashtable-like interface.
-	 *
-	 * @param      string $key An Object.
-	 * @return     mixed The value within the Criterion (not the Criterion object).
-	 */
-	public function get($key)
-	{
-		return $this->getValue($key);
-	}
-
-	/**
-	 * Overrides Hashtable put, so that this object is returned
-	 * instead of the value previously in the Criteria object.
-	 * The reason is so that it more closely matches the behavior
-	 * of the add() methods. If you want to get the previous value
-	 * then you should first Criteria.get() it yourself. Note, if
-	 * you attempt to pass in an Object that is not a String, it will
-	 * throw a NPE. The reason for this is that none of the add()
-	 * methods support adding anything other than a String as a key.
-	 *
-	 * @param      string $key
-	 * @param      mixed $value
-	 * @return     Instance of self.
-	 */
-	public function put($key, $value)
-	{
-		return $this->add($key, $value);
-	}
-
-	/**
-	 * Copies all of the mappings from the specified Map to this Criteria
-	 * These mappings will replace any mappings that this Criteria had for any
-	 * of the keys currently in the specified Map.
-	 *
-	 * if the map was another Criteria, its attributes are copied to this
-	 * Criteria, overwriting previous settings.
-	 *
-	 * @param      mixed $t Mappings to be stored in this map.
-	 */
-	public function putAll($t)
-	{
-
-		if (is_array($t)) {
-
-			foreach ($t as $key=>$value) {
-
-				if ($value instanceof Criterion) {
-
-					$this->map[$key] = $value;
-
-				} else {
-
-					$this->put($key, $value);
-
-				}
-
-			}
-
-		} elseif ($t instanceof Criteria) {
-
-			$this->joins = $t->joins;
-
-		}
-
-	}
-
-
-	/**
-	 * This method adds a new criterion to the list of criterias.
-	 * If a criterion for the requested column already exists, it is
-	 * replaced. If is used as follow:
-	 *
-	 * <p>
-	 * <code>
-	 * $crit = new Criteria();
-	 * $crit->add(&quot;column&quot;,
-	 *                                      &quot;value&quot;
-	 *                                      &quot;Criteria::GREATER_THAN&quot;);
-	 * </code>
-	 *
-	 * Any comparison can be used.
-	 *
-	 * The name of the table must be used implicitly in the column name,
-	 * so the Column name must be something like 'TABLE.id'. If you
-	 * don't like this, you can use the add(table, column, value) method.
-	 *
-	 * @param      string $critOrColumn The column to run the comparison on, or Criterion object.
-	 * @param      mixed $value
-	 * @param      string $comparison A String.
-	 *
-	 * @return     A modified Criteria object.
-	 */
-	public function add($p1, $value = null, $comparison = null)
-	{
-		if ($p1 instanceof Criterion) {
-			$this->map[$p1->getTable() . '.' . $p1->getColumn()] = $p1;
-		} else {
-			$this->map[$p1] = new Criterion($this, $p1, $value, $comparison);
-		}
-		return $this;
-	}
-
-	/**
-	 * This is the way that you should add a straight (inner) join of two tables.  For
-	 * example:
-	 *
-	 * <p>
-	 * AND PROJECT.PROJECT_ID=FOO.PROJECT_ID
-	 * <p>
-	 *
-	 * left = PROJECT.PROJECT_ID
-	 * right = FOO.PROJECT_ID
-	 *
-	 * @param      mixed $left A String with the left side of the join.
-	 * @param      mixed $right A String with the right side of the join.
-	 * @param      mixed $operator A String with the join operator e.g. LEFT JOIN, ...
-   *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addJoin($left, $right, $operator = null)
-	{
-		$join = new Join();
-    if (!is_array($left)) {
-      // simple join
-      $join->addCondition($left, $right);
-    } else {
-      // join with multiple conditions
-      // deprecated: use addMultipleJoin() instead
-      foreach ($left as $key => $value)
-      {
-        $join->addCondition($value, $right[$key]);
-      }
-    }
-		$join->setJoinType($operator);
-		
-		return $this->addJoinObject($join);
-	}
-
-	/**
-	 * Add a join with multiple conditions
-	 * see http://propel.phpdb.org/trac/ticket/167, http://propel.phpdb.org/trac/ticket/606
-	 * 
-	 * Example usage:
-	 * $c->addMultipleJoin(array(
-	 *     array(LeftPeer::LEFT_COLUMN, RightPeer::RIGHT_COLUMN),  // if no third argument, defaults to Criteria::EQUAL
-	 *     array(FoldersPeer::alias( 'fo', FoldersPeer::LFT ), FoldersPeer::alias( 'parent', FoldersPeer::RGT ), Criteria::LESS_EQUAL )
-	 *   ),
-	 *   Criteria::LEFT_JOIN
- 	 * );
-	 * 
-	 * @see        addJoin()
-	 * @param      array $conditions An array of conditions, each condition being an array (left, right, operator)
-	 * @param      string $joinType  A String with the join operator. Defaults to an implicit join.
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addMultipleJoin($conditions, $joinType = null) 
-  {
-		$join = new Join();
-		foreach ($conditions as $condition) {
-		  $join->addCondition($condition[0], $condition[1], isset($condition[2]) ? $condition[2] : Criteria::EQUAL);
-		}
-		$join->setJoinType($joinType);
-		
-		return $this->addJoinObject($join);
-	}
-	
-	/**
-	 * Add a join object to the Criteria
-	 *
-	 * @param Join $join A join object
-	 *
-	 * @return Criteria A modified Criteria object
-	 */
-	public function addJoinObject(Join $join)
-	{
-	  if (!in_array($join, $this->joins)) { // compare equality, NOT identity
-			$this->joins[] = $join;
-		}
-		return $this;
-	}
-
-
-	/**
-	 * Get the array of Joins.
-	 * @return     array Join[]
-	 */
-	public function getJoins()
-	{
-		return $this->joins;
-	}
-
-	/**
-	 * Adds "ALL" modifier to the SQL statement.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setAll()
-	{
-		$this->selectModifiers[] = self::ALL;
-		return $this;
-	}
-
-	/**
-	 * Adds "DISTINCT" modifier to the SQL statement.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setDistinct()
-	{
-		$this->selectModifiers[] = self::DISTINCT;
-		return $this;
-	}
-
-	/**
-	 * Sets ignore case.
-	 *
-	 * @param      boolean $b True if case should be ignored.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setIgnoreCase($b)
-	{
-		$this->ignoreCase = (boolean) $b;
-		return $this;
-	}
-
-	/**
-	 * Is ignore case on or off?
-	 *
-	 * @return     boolean True if case is ignored.
-	 */
-	public function isIgnoreCase()
-	{
-		return $this->ignoreCase;
-	}
-
-	/**
-	 * Set single record?  Set this to <code>true</code> if you expect the query
-	 * to result in only a single result record (the default behaviour is to
-	 * throw a PropelException if multiple records are returned when the query
-	 * is executed).  This should be used in situations where returning multiple
-	 * rows would indicate an error of some sort.  If your query might return
-	 * multiple records but you are only interested in the first one then you
-	 * should be using setLimit(1).
-	 *
-	 * @param      boolean $b Set to TRUE if you expect the query to select just one record.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setSingleRecord($b)
-	{
-		$this->singleRecord = (boolean) $b;
-		return $this;
-	}
-
-	/**
-	 * Is single record?
-	 *
-	 * @return     boolean True if a single record is being returned.
-	 */
-	public function isSingleRecord()
-	{
-		return $this->singleRecord;
-	}
-
-	/**
-	 * Set limit.
-	 *
-	 * @param      limit An int with the value for limit.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setLimit($limit)
-	{
-		// TODO: do we enforce int here? 32bit issue if we do
-		$this->limit = $limit;
-		return $this;
-	}
-
-	/**
-	 * Get limit.
-	 *
-	 * @return     int An int with the value for limit.
-	 */
-	public function getLimit()
-	{
-		return $this->limit;
-	}
-
-	/**
-	 * Set offset.
-	 *
-	 * @param      int $offset An int with the value for offset.  (Note this values is
-	 * 							cast to a 32bit integer and may result in truncatation)
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setOffset($offset)
-	{
-		$this->offset = (int) $offset;
-		return $this;
-	}
-
-	/**
-	 * Get offset.
-	 *
-	 * @return     An int with the value for offset.
-	 */
-	public function getOffset()
-	{
-		return $this->offset;
-	}
-
-	/**
-	 * Add select column.
-	 *
-	 * @param      string $name Name of the select column.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function addSelectColumn($name)
-	{
-		$this->selectColumns[] = $name;
-		return $this;
-	}
-	
-	/**
-	 * Whether this Criteria has any select columns.
-	 * 
-	 * This will include columns added with addAsColumn() method.
-	 *
-	 * @return     boolean
-	 * @see        addAsColumn()
-	 * @see        addSelectColumn()
-	 */
-	public function hasSelectClause()
-	{
-		return (!empty($this->selectColumns) || !empty($this->asColumns));
-	}
-	
-	/**
-	 * Get select columns.
-	 *
-	 * @return     array An array with the name of the select
-	 * columns.
-	 */
-	public function getSelectColumns()
-	{
-		return $this->selectColumns;
-	}
-
-	/**
-	 * Clears current select columns.
-	 *
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function clearSelectColumns() {
-		$this->selectColumns = $this->asColumns = array();
-		return $this;
-	}
-
-	/**
-	 * Get select modifiers.
-	 *
-	 * @return     An array with the select modifiers.
-	 */
-	public function getSelectModifiers()
-	{
-		return $this->selectModifiers;
-	}
-
-	/**
-	 * Add group by column name.
-	 *
-	 * @param      string $groupBy The name of the column to group by.
-	 * @return     A modified Criteria object.
-	 */
-	public function addGroupByColumn($groupBy)
-	{
-		$this->groupByColumns[] = $groupBy;
-		return $this;
-	}
-
-	/**
-	 * Add order by column name, explicitly specifying ascending.
-	 *
-	 * @param      name The name of the column to order by.
-	 * @return     A modified Criteria object.
-	 */
-	public function addAscendingOrderByColumn($name)
-	{
-		$this->orderByColumns[] = $name . ' ' . self::ASC;
-		return $this;
-	}
-
-	/**
-	 * Add order by column name, explicitly specifying descending.
-	 *
-	 * @param      string $name The name of the column to order by.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function addDescendingOrderByColumn($name)
-	{
-		$this->orderByColumns[] = $name . ' ' . self::DESC;
-		return $this;
-	}
-
-	/**
-	 * Get order by columns.
-	 *
-	 * @return     array An array with the name of the order columns.
-	 */
-	public function getOrderByColumns()
-	{
-		return $this->orderByColumns;
-	}
-
-	/**
-	 * Clear the order-by columns.
-	 *
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function clearOrderByColumns()
-	{
-		$this->orderByColumns = array();
-		return $this;
-	}
-
-	/**
-	 * Clear the group-by columns.
-	 *
-	 * @return     Criteria
-	 */
-	public function clearGroupByColumns()
-	{
-		$this->groupByColumns = array();
-		return $this;
-	}
-
-	/**
-	 * Get group by columns.
-	 *
-	 * @return     array
-	 */
-	public function getGroupByColumns()
-	{
-		return $this->groupByColumns;
-	}
-
-	/**
-	 * Get Having Criterion.
-	 *
-	 * @return     Criterion A Criterion object that is the having clause.
-	 */
-	public function getHaving()
-	{
-		return $this->having;
-	}
-
-	/**
-	 * Remove an object from the criteria.
-	 *
-	 * @param      string $key A string with the key to be removed.
-	 * @return     mixed The removed value.
-	 */
-	public function remove($key)
-	{
-		if ( isset ( $this->map[$key] ) ) {
-			$removed = $this->map[$key];
-			unset ( $this->map[$key] );
-			if ( $removed instanceof Criterion ) {
-				return $removed->getValue();
-			}
-			return $removed;
-		}
-	}
-
-	/**
-	 * Build a string representation of the Criteria.
-	 *
-	 * @return     string A String with the representation of the Criteria.
-	 */
-	public function toString()
-	{
-
-		$sb = "Criteria:";
-		try {
-
-			$params = array();
-			$sb .= "\nSQL (may not be complete): "
-			  . BasePeer::createSelectSql($this, $params);
-
-			$sb .= "\nParams: ";
-			$paramstr = array();
-			foreach ($params as $param) {
-				$paramstr[] = $param['table'] . '.' . $param['column'] . ' => ' . var_export($param['value'], true);
-			}
-			$sb .= implode(", ", $paramstr);
-
-		} catch (Exception $exc) {
-			$sb .= "(Error: " . $exc->getMessage() . ")";
-		}
-
-		return $sb;
-	}
-
-	/**
-	 * Returns the size (count) of this criteria.
-	 * @return     int
-	 */
-	public function size()
-	{
-		return count($this->map);
-	}
-
-	/**
-	 * This method checks another Criteria to see if they contain
-	 * the same attributes and hashtable entries.
-	 * @return     boolean
-	 */
-	public function equals($crit)
-	{
-		$isEquiv = false;
-		if ($crit === null || !($crit instanceof Criteria)) {
-			$isEquiv = false;
-		} elseif ($this === $crit) {
-			$isEquiv = true;
-		} elseif ($this->size() === $crit->size()) {
-
-			// Important: nested criterion objects are checked
-
-			$criteria = $crit; // alias
-			if ($this->offset === $criteria->getOffset()
-				&& $this->limit === $criteria->getLimit()
-				&& $this->ignoreCase === $criteria->isIgnoreCase()
-				&& $this->singleRecord === $criteria->isSingleRecord()
-				&& $this->dbName === $criteria->getDbName()
-				&& $this->selectModifiers === $criteria->getSelectModifiers()
-				&& $this->selectColumns === $criteria->getSelectColumns()
-				&& $this->orderByColumns === $criteria->getOrderByColumns()
-				&& $this->groupByColumns === $criteria->getGroupByColumns()
-			   )
-			{
-				$isEquiv = true;
-				foreach ($criteria->keys() as $key) {
-					if ($this->containsKey($key)) {
-						$a = $this->getCriterion($key);
-						$b = $criteria->getCriterion($key);
-						if (!$a->equals($b)) {
-							$isEquiv = false;
-							break;
-						}
-					} else {
-						$isEquiv = false;
-						break;
-					}
-				}
-			}
-		}
-		return $isEquiv;
-	}
-
-	/**
-	 * This method adds a prepared Criterion object to the Criteria as a having clause.
-	 * You can get a new, empty Criterion object with the
-	 * getNewCriterion() method.
-	 *
-	 * <p>
-	 * <code>
-	 * $crit = new Criteria();
-	 * $c = $crit->getNewCriterion(BasePeer::ID, 5, Criteria::LESS_THAN);
-	 * $crit->addHaving($c);
-	 * </code>
-	 *
-	 * @param      having A Criterion object
-	 *
-	 * @return     A modified Criteria object.
-	 */
-	public function addHaving(Criterion $having)
-	{
-		$this->having = $having;
-		return $this;
-	}
-
-	/**
-	 * This method adds a new criterion to the list of criterias.
-	 * If a criterion for the requested column already exists, it is
-	 * "AND"ed to the existing criterion.
-	  *
-	 * addAnd(column, value, comparison)
-	 * <code>
-	 * $crit = $orig_crit->addAnd(&quot;column&quot;,
-	 *                                      &quot;value&quot;
-	 *                                      &quot;Criterion::GREATER_THAN&quot;);
-	 * </code>
-	 *
-	 * addAnd(column, value)
-	 * <code>
-	 * $crit = $orig_crit->addAnd(&quot;column&quot;, &quot;value&quot;);
-	 * </code>
-	 *
-	 * addAnd(Criterion)
-	 * <code>
-	 * $crit = new Criteria();
-	 * $c = $crit->getNewCriterion(BasePeer::ID, 5, Criteria::LESS_THAN);
-	 * $crit->addAnd($c);
-	 * </code>
-	 *
-	 * Any comparison can be used, of course.
-	 *
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addAnd($p1, $p2 = null, $p3 = null)
-	{
-		if ($p3 !== null) {
-			// addAnd(column, value, comparison)
-			$oc = $this->getCriterion($p1);
-			$nc = new Criterion($this, $p1, $p2, $p3);
-			if ( $oc === null) {
-				$this->map[$p1] = $nc;
-			} else {
-				$oc->addAnd($nc);
-			}
-		} elseif ($p2 !== null) {
-			// addAnd(column, value)
-			$this->addAnd($p1, $p2, self::EQUAL);
-		} elseif ($p1 instanceof Criterion) {
-			// addAnd(Criterion)
-			$oc = $this->getCriterion($p1->getTable() . '.' . $p1->getColumn());
-			if ($oc === null) {
-				$this->add($p1);
-			} else {
-				$oc->addAnd($p1);
-			}
-		} elseif ($p2 === null && $p3 === null) {
-			// client has not specified $p3 (comparison)
-			// which means Criteria::EQUAL but has also specified $p2 == null
-			// which is a valid combination we should handle by creating "IS NULL"
-			$this->addAnd($p1, $p2, self::EQUAL);
-		}
-		return $this;
-	}
-
-	/**
-	 * This method adds a new criterion to the list of criterias.
-	 * If a criterion for the requested column already exists, it is
-	 * "OR"ed to the existing criterion.
-	 *
-	 * Any comparison can be used.
-	 *
-	 * Supports a number of different signatures:
-	 *
-	 * addOr(column, value, comparison)
-	 * <code>
-	 * $crit = $orig_crit->addOr(&quot;column&quot;,
-	 *                                      &quot;value&quot;
-	 *                                      &quot;Criterion::GREATER_THAN&quot;);
-	 * </code>
-	 *
-	 * addOr(column, value)
-	 * <code>
-	 * $crit = $orig_crit->addOr(&quot;column&quot;, &quot;value&quot;);
-	 * </code>
-	 *
-	 * addOr(Criterion)
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addOr($p1, $p2 = null, $p3 = null)
-	{
-		if ($p3 !== null) {
-			// addOr(column, value, comparison)
-			$nc = new Criterion($this, $p1, $p2, $p3);
-			$oc = $this->getCriterion($p1);
-			if ($oc === null) {
-				$this->map[$p1] = $nc;
-			} else {
-				$oc->addOr($nc);
-			}
-		} elseif ($p2 !== null) {
-			// addOr(column, value)
-			$this->addOr($p1, $p2, self::EQUAL);
-		} elseif ($p1 instanceof Criterion) {
-			// addOr(Criterion)
-			$oc = $this->getCriterion($p1->getTable() . '.' . $p1->getColumn());
-			if ($oc === null) {
-				$this->add($p1);
-			} else {
-				$oc->addOr($p1);
-			}
-		} elseif ($p2 === null && $p3 === null) {
-			// client has not specified $p3 (comparison)
-			// which means Criteria::EQUAL but has also specified $p2 == null
-			// which is a valid combination we should handle by creating "IS NULL"
-			$this->addOr($p1, $p2, self::EQUAL);
-		}
-
-		return $this;
-	}
-}
-
-// --------------------------------------------------------------------
-// Criterion Iterator class -- allows foreach ($criteria as $criterion)
-// --------------------------------------------------------------------
-
-/**
- * Class that implements SPL Iterator interface.  This allows foreach () to
- * be used w/ Criteria objects.  Probably there is no performance advantage
- * to doing it this way, but it makes sense -- and simpler code.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    propel.util
- */
-class CriterionIterator implements Iterator {
-
-	private $idx = 0;
-	private $criteria;
-	private $criteriaKeys;
-	private $criteriaSize;
-
-	public function __construct(Criteria $criteria) {
-		$this->criteria = $criteria;
-		$this->criteriaKeys = $criteria->keys();
-		$this->criteriaSize = count($this->criteriaKeys);
-	}
-
-	public function rewind() {
-		$this->idx = 0;
-	}
-
-	public function valid() {
-		return $this->idx < $this->criteriaSize;
-	}
-
-	public function key() {
-		return $this->criteriaKeys[$this->idx];
-	}
-
-	public function current() {
-		return $this->criteria->getCriterion($this->criteriaKeys[$this->idx]);
-	}
-
-	public function next() {
-		$this->idx++;
-	}
-
-}
-
-// --------------------------------------------------------------------
-// Criterion "inner" class
-// --------------------------------------------------------------------
-
-/**
- * This is an "inner" class that describes an object in the criteria.
- *
- * In Torque this is an inner class of the Criteria class.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @package    propel.util
- */
-class Criterion  {
-
-	const UND = " AND ";
-	const ODER = " OR ";
-
-	/** Value of the CO. */
-	private $value;
-
-	/** Comparison value.
-	 * @var        SqlEnum
-	 */
-	private $comparison;
-
-	/** Table name. */
-	private $table;
-
-	/** Real table name */
-	private $realtable;
-
-	/** Column name. */
-	private $column;
-
-	/** flag to ignore case in comparision */
-	private $ignoreStringCase = false;
-
-	/**
-	 * The DBAdaptor which might be used to get db specific
-	 * variations of sql.
-	 */
-	private $db;
-
-	/**
-	 * other connected criteria and their conjunctions.
-	 */
-	private $clauses = array();
-	private $conjunctions = array();
-
-	/** "Parent" Criteria class */
-	private $parent;
-
-	/**
-	 * Create a new instance.
-	 *
-	 * @param      Criteria $parent The outer class (this is an "inner" class).
-	 * @param      string $column TABLE.COLUMN format.
-	 * @param      mixed $value
-	 * @param      string $comparison
-	 */
-	public function __construct(Criteria $outer, $column, $value, $comparison = null)
-	{
-		$this->value = $value;
-		$dotPos = strrpos($column,'.');
-		if ($dotPos === false) {
-			// no dot => aliased column
-			$this->table = null;
-			$this->column = $column;
-		} else {
-			$this->table = substr($column, 0, $dotPos); 
-			$this->column = substr($column, $dotPos+1, strlen($column));
-		}
-		$this->comparison = ($comparison === null ? Criteria::EQUAL : $comparison);
-		$this->init($outer);
-	}
-
-	/**
-	* Init some properties with the help of outer class
-	* @param      Criteria $criteria The outer class
-	*/
-	public function init(Criteria $criteria)
-	{
-		//init $this->db
-		try {
-			$db = Propel::getDB($criteria->getDbName());
-			$this->setDB($db);
-		} catch (Exception $e) {
-			// we are only doing this to allow easier debugging, so
-			// no need to throw up the exception, just make note of it.
-			Propel::log("Could not get a DBAdapter, sql may be wrong", Propel::LOG_ERR);
-		}
-
-		//init $this->realtable
-		$realtable = $criteria->getTableForAlias($this->table);
-		if (! strlen ( $realtable ) ) {
-			$realtable = $this->table;
-		}
-		$this->realtable = $realtable;
-
-	}
-
-	/**
-	 * Get the column name.
-	 *
-	 * @return     string A String with the column name.
-	 */
-	public function getColumn()
-	{
-		return $this->column;
-	}
-
-	/**
-	 * Set the table name.
-	 *
-	 * @param      name A String with the table name.
-	 * @return     void
-	 */
-	public function setTable($name)
-	{
-		$this->table = $name;
-	}
-
-	/**
-	 * Get the table name.
-	 *
-	 * @return     string A String with the table name.
-	 */
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	/**
-	 * Get the comparison.
-	 *
-	 * @return     string A String with the comparison.
-	 */
-	public function getComparison()
-	{
-		return $this->comparison;
-	}
-
-	/**
-	 * Get the value.
-	 *
-	 * @return     mixed An Object with the value.
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * Get the value of db.
-	 * The DBAdapter which might be used to get db specific
-	 * variations of sql.
-	 * @return     DBAdapter value of db.
-	 */
-	public function getDB()
-	{
-		return $this->db;
-	}
-
-	/**
-	 * Set the value of db.
-	 * The DBAdapter might be used to get db specific variations of sql.
-	 * @param      DBAdapter $v Value to assign to db.
-	 * @return     void
-	 */
-	public function setDB(DBAdapter $v)
-	{
-		$this->db = $v;
-		foreach ( $this->clauses as $clause ) {
-			$clause->setDB($v);
-		}
-	}
-
-	/**
-	 * Sets ignore case.
-	 *
-	 * @param      boolean $b True if case should be ignored.
-	 * @return     Criterion A modified Criterion object.
-	 */
-	public function setIgnoreCase($b)
-	{
-		$this->ignoreStringCase = (boolean) $b;
-		return $this;
-	}
-
-	/**
-	 * Is ignore case on or off?
-	 *
-	 * @return     boolean True if case is ignored.
-	 */
-	 public function isIgnoreCase()
-	 {
-		 return $this->ignoreStringCase;
-	 }
-
-	/**
-	 * Get the list of clauses in this Criterion.
-	 * @return     array
-	 */
-	private function getClauses()
-	{
-		return $this->clauses;
-	}
-
-	/**
-	 * Get the list of conjunctions in this Criterion
-	 * @return     array
-	 */
-	public function getConjunctions()
-	{
-		return $this->conjunctions;
-	}
-
-	/**
-	 * Append an AND Criterion onto this Criterion's list.
-	 */
-	public function addAnd(Criterion $criterion)
-	{
-		$this->clauses[] = $criterion;
-		$this->conjunctions[] = self::UND;
-		return $this;
-	}
-
-	/**
-	 * Append an OR Criterion onto this Criterion's list.
-	 * @return     Criterion
-	 */
-	public function addOr(Criterion $criterion)
-	{
-		$this->clauses[] = $criterion;
-		$this->conjunctions[] = self::ODER;
-		return $this;
-	}
-
-	/**
-	 * Appends a Prepared Statement representation of the Criterion
-	 * onto the buffer.
-	 *
-	 * @param      string &$sb The string that will receive the Prepared Statement
-	 * @param      array $params A list to which Prepared Statement parameters
-	 * will be appended
-	 * @return     void
-	 * @throws     PropelException - if the expression builder cannot figure out how to turn a specified
-	 *                           expression into proper SQL.
-	 */
-	public function appendPsTo(&$sb, array &$params)
-	{
-		if ($this->column === null) {
-			return;
-		}
-
-		$db = $this->getDb();
-		$sb .= str_repeat ( '(', count($this->clauses) );
-
-		if (Criteria::CUSTOM === $this->comparison) {
-			if ($this->value !== "") {
-				$sb .= (string) $this->value;
-			}
-		} else {
-
-			if  ($this->table === null) {
-				$field = $this->column;
-			} else {
-				$field = $this->table . '.' . $this->column;
-			}
-
-			// Check to see if table is an alias & store real name, if so
-			// (real table name is needed for the returned $params array)
-			$realtable = $this->realtable;
-
-			// There are several different types of expressions that need individual handling:
-			// IN/NOT IN, LIKE/NOT LIKE, and traditional expressions.
-
-			// OPTION 1:  table.column IN (?, ?) or table.column NOT IN (?, ?)
-			if ($this->comparison === Criteria::IN || $this->comparison === Criteria::NOT_IN) {
-				
-				$_bindParams = array(); // the param names used in query building
-				$_idxstart = count($params);
-				$valuesLength = 0;
-				foreach ( (array) $this->value as $value ) {
-					$valuesLength++; // increment this first to correct for wanting bind params to start with :p1
-					$params[] = array('table' => $realtable, 'column' => $this->column, 'value' => $value);
-					$_bindParams[] = ':p'.($_idxstart + $valuesLength);
-				}
-				if ( $valuesLength !== 0 ) {
-					$sb .= $field . $this->comparison . '(' . implode(',', $_bindParams) . ')';
-				} else {
-					$sb .= ($this->comparison === Criteria::IN) ? "1<>1" : "1=1";
-				}
-				unset ( $value, $valuesLength );
-
-			// OPTION 2:  table.column LIKE ? or table.column NOT LIKE ?  (or ILIKE for Postgres)
-			} elseif ($this->comparison === Criteria::LIKE || $this->comparison === Criteria::NOT_LIKE
-				|| $this->comparison === Criteria::ILIKE || $this->comparison === Criteria::NOT_ILIKE) {
-				// Handle LIKE, NOT LIKE (and related ILIKE, NOT ILIKE for Postgres)
-
-				// If selection is case insensitive use ILIKE for PostgreSQL or SQL
-				// UPPER() function on column name for other databases.
-				if ($this->ignoreStringCase) {
-					if ($db instanceof DBPostgres) {
-						if ($this->comparison === Criteria::LIKE) {
-							$this->comparison = Criteria::ILIKE;
-						} elseif ($this->comparison === Criteria::NOT_LIKE) {
-							$this->comparison = Criteria::NOT_ILIKE;
-						}
-					} else {
-						$field = $db->ignoreCase($field);
-					}
-				}
-				
-				$params[] = array('table' => $realtable, 'column' => $this->column, 'value' => $this->value);
-				
-				$sb .= $field . $this->comparison;
-
-				// If selection is case insensitive use SQL UPPER() function
-				// on criteria or, if Postgres we are using ILIKE, so not necessary.
-				if ($this->ignoreStringCase && !($db instanceof DBPostgres)) {
-					$sb .= $db->ignoreCase(':p'.count($params));
-				} else {
-					$sb .= ':p'.count($params);
-				}
-				
-			// OPTION 3:  table.column = ? or table.column >= ? etc. (traditional expressions, the default)
-			} else {
-
-				// NULL VALUES need special treatment because the SQL syntax is different
-				// i.e. table.column IS NULL rather than table.column = null
-				if ($this->value !== null) {
-
-					// ANSI SQL functions get inserted right into SQL (not escaped, etc.)
-					if ($this->value === Criteria::CURRENT_DATE || $this->value === Criteria::CURRENT_TIME || $this->value === Criteria::CURRENT_TIMESTAMP) {
-						$sb .= $field . $this->comparison . $this->value;
-					} else {
-						
-						$params[] = array('table' => $realtable, 'column' => $this->column, 'value' => $this->value);
-						
-						// default case, it is a normal col = value expression; value
-						// will be replaced w/ '?' and will be inserted later using PDO bindValue()
-						if ($this->ignoreStringCase) {
-							$sb .= $db->ignoreCase($field) . $this->comparison . $db->ignoreCase(':p'.count($params));
-						} else {
-							$sb .= $field . $this->comparison . ':p'.count($params);
-						}
-						
-					}
-				} else {
-
-					// value is null, which means it was either not specified or specifically
-					// set to null.
-					if ($this->comparison === Criteria::EQUAL || $this->comparison === Criteria::ISNULL) {
-						$sb .= $field . Criteria::ISNULL;
-					} elseif ($this->comparison === Criteria::NOT_EQUAL || $this->comparison === Criteria::ISNOTNULL) {
-						$sb .= $field . Criteria::ISNOTNULL;
-					} else {
-						// for now throw an exception, because not sure how to interpret this
-						throw new PropelException("Could not build SQL for expression: $field " . $this->comparison . " NULL");
-					}
-
-				}
-
-			}
-		}
-
-		foreach ( $this->clauses as $key=>$clause ) {
-			$sb .= $this->conjunctions[$key];
-			$clause->appendPsTo($sb, $params);
-			$sb .= ')';
-		}
-	}
-
-	/**
-	 * This method checks another Criteria to see if they contain
-	 * the same attributes and hashtable entries.
-	 * @return     boolean
-	 */
-	public function equals($obj)
-	{
-		// TODO: optimize me with early outs
-		if ($this === $obj) {
-			return true;
-		}
-
-		if (($obj === null) || !($obj instanceof Criterion)) {
-			return false;
-		}
-
-		$crit = $obj;
-
-		$isEquiv = ( ( ($this->table === null && $crit->getTable() === null)
-			|| ( $this->table !== null && $this->table === $crit->getTable() )
-						  )
-			&& $this->column === $crit->getColumn()
-			&& $this->comparison === $crit->getComparison());
-
-		// check chained criterion
-
-		$clausesLength = count($this->clauses);
-		$isEquiv &= (count($crit->getClauses()) == $clausesLength);
-		$critConjunctions = $crit->getConjunctions();
-		$critClauses = $crit->getClauses();
-		for ($i=0; $i < $clausesLength && $isEquiv; $i++) {
-			$isEquiv &= ($this->conjunctions[$i] === $critConjunctions[$i]);
-			$isEquiv &= ($this->clauses[$i] === $critClauses[$i]);
-		}
-
-		if ($isEquiv) {
-			$isEquiv &= $this->value === $crit->getValue();
-		}
-
-		return $isEquiv;
-	}
-
-	/**
-	 * Returns a hash code value for the object.
-	 */
-	public function hashCode()
-	{
-		$h = crc32(serialize($this->value)) ^ crc32($this->comparison);
-
-		if ($this->table !== null) {
-			$h ^= crc32($this->table);
-		}
-
-		if ($this->column !== null) {
-			$h ^= crc32($this->column);
-		}
-
-		foreach ( $this->clauses as $clause ) {
-			// TODO: i KNOW there is a php incompatibility with the following line
-			// but i dont remember what it is, someone care to look it up and
-			// replace it if it doesnt bother us?
-			// $clause->appendPsTo($sb='',$params=array());
-			$sb = '';
-			$params = array();
-			$clause->appendPsTo($sb,$params);
-			$h ^= crc32(serialize(array($sb,$params)));
-			unset ( $sb, $params );
-		}
-
-		return $h;
-	}
-
-	/**
-	 * Get all tables from nested criterion objects
-	 * @return     array
-	 */
-	public function getAllTables()
-	{
-		$tables = array();
-		$this->addCriterionTable($this, $tables);
-		return $tables;
-	}
-
-	/**
-	 * method supporting recursion through all criterions to give
-	 * us a string array of tables from each criterion
-	 * @return     void
-	 */
-	private function addCriterionTable(Criterion $c, array &$s)
-	{
-		$s[] = $c->getTable();
-		foreach ( $c->getClauses() as $clause ) {
-			$this->addCriterionTable($clause, $s);
-		}
-	}
-
-	/**
-	 * get an array of all criterion attached to this
-	 * recursing through all sub criterion
-	 * @return     array Criterion[]
-	 */
-	public function getAttachedCriterion()
-	{
-		$crits = array();
-		$this->traverseCriterion($this, $crits);
-		return $crits;
-	}
-
-	/**
-	 * method supporting recursion through all criterions to give
-	 * us an array of them
-	 * @param      Criterion $c
-	 * @param      array &$a
-	 * @return     void
-	 */
-	private function traverseCriterion(Criterion $c, array &$a)
-	{
-		$a[] = $c;
-		foreach ( $c->getClauses() as $clause ) {
-			$this->traverseCriterion($clause, $a);
-		}
-	}
-}
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/DebugPDO.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/DebugPDO.php
deleted file mode 100644
index a546b6c..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/DebugPDO.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-/*
- *  $Id: DebugPDO.php 1343 2009-11-29 22:36:48Z david $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PDO connection subclass that provides some basic support for query counting and logging.
- *
- * This class is ONLY intended for development use.  This class is also a work in-progress
- * and, as such, it should be expected that this class' API may change.
- * 
- * The following runtime configuration items affect the behaviour of this class:
- * 
- * - debugpdo.logging.enabled (default: true)
- *   Should any logging take place
- * 
- * - debugpdo.logging.innerglue (default: ": ")
- *   String to use for combining the title of a detail and its value
- * 
- * - debugpdo.logging.outerglue (default: " | ")
- *   String to use for combining details together on a log line
- * 
- * - debugpdo.logging.realmemoryusage (default: false)
- *   Parameter to memory_get_usage() and memory_get_peak_usage() calls 
- * 
- * - debugpdo.logging.methods (default: DebugPDO::$defaultLogMethods)
- *   An array of method names ("Class::method") to be included in method call logging
- * 
- * - debugpdo.logging.onlyslow (default: false)
- *   Suppress logging of non-slow queries.
- * 
- * - debugpdo.logging.details.slow.enabled (default: false)
- *   Enables flagging of slow method calls
- * 
- * - debugpdo.logging.details.slow.threshold (default: 0.1)
- *   Method calls taking more seconds than this threshold are considered slow 
- * 
- * - debugpdo.logging.details.time.enabled (default: false)
- *   Enables logging of method execution times
- * 
- * - debugpdo.logging.details.time.precision (default: 3)
- *   Determines the precision of the execution time logging
- * 
- * - debugpdo.logging.details.time.pad (default: 10)
- *   How much horizontal space to reserve for the execution time on a log line
- * 
- * - debugpdo.logging.details.mem.enabled (default: false)
- *   Enables logging of the instantaneous PHP memory consumption
- * 
- * - debugpdo.logging.details.mem.precision (default: 1)
- *   Determines the precision of the memory consumption logging
- * 
- * - debugpdo.logging.details.mem.pad (default: 9)
- *   How much horizontal space to reserve for the memory consumption on a log line
- * 
- * - debugpdo.logging.details.memdelta.enabled (default: false)
- *   Enables logging differences in memory consumption before and after the method call
- * 
- * - debugpdo.logging.details.memdelta.precision (default: 1)
- *   Determines the precision of the memory difference logging
- * 
- * - debugpdo.logging.details.memdelta.pad (default: 10)
- *   How much horizontal space to reserve for the memory difference on a log line
- * 
- * - debugpdo.logging.details.mempeak.enabled (default: false)
- *   Enables logging the peak memory consumption thus far by the currently executing PHP script
- * 
- * - debugpdo.logging.details.mempeak.precision (default: 1)
- *   Determines the precision of the memory peak logging
- * 
- * - debugpdo.logging.details.mempeak.pad (default: 9)
- *   How much horizontal space to reserve for the memory peak on a log line
- * 
- * - debugpdo.logging.details.querycount.enabled (default: false)
- *   Enables logging of the number of queries performed by the DebugPDO instance thus far
- * 
- * - debugpdo.logging.details.querycount.pad (default: 2)
- *   How much horizontal space to reserve for the query count on a log line
- * 
- * - debugpdo.logging.details.method.enabled (default: false)
- *   Enables logging of the name of the method call
- * 
- * - debugpdo.logging.details.method.pad (default: 28)
- *   How much horizontal space to reserve for the method name on a log line
- * 
- * The order in which the logging details are enabled is significant, since it determines the order in
- * which they will appear in the log file.
- * 
- * @example    // Enable simple query profiling, flagging calls taking over 1.5 seconds as slow:
- *             $config = Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT);
- *             $config->setParameter('debugpdo.logging.details.slow.enabled', true);
- *             $config->setParameter('debugpdo.logging.details.slow.threshold', 1.5);
- *             $config->setParameter('debugpdo.logging.details.time.enabled', true);
- * 
- * @author     Francois Zaninotto
- * @author     Cameron Brunner <cameron.brunner at gmail.com>
- * @author     Hans Lellelid <hans at xmpl.org>
- * @author     Christian Abegg <abegg.ch at gmail.com>
- * @author     Jarno Rantanen <jarno.rantanen at tkk.fi>
- * @since      2006-09-22
- * @package    propel.util
- */
-class DebugPDO extends PropelPDO
-{
-	const DEFAULT_SLOW_THRESHOLD        = 0.1;
-	const DEFAULT_ONLYSLOW_ENABLED      = false;
-	
-	/**
-	 * Count of queries performed.
-	 * 
-	 * @var        int
-	 */
-	protected $queryCount = 0;
-	
-	/**
-	 * SQL code of the latest performed query.
-	 * 
-	 * @var        string
-	 */
-	protected $lastExecutedQuery;
-
-	/**
-	 * The statement class to use.
-	 *
-	 * @var        string
-	 */
-	protected $statementClass = 'DebugPDOStatement';
-
-	/**
-	 * Configured BasicLogger (or compatible) logger.
-	 *
-	 * @var        BasicLogger
-	 */
-	protected $logger;
-
-	/**
-	 * The log level to use for logging.
-	 *
-	 * @var        int
-	 */
-	private $logLevel = Propel::LOG_DEBUG;
-	
-	/**
-	 * The default value for runtime config item "debugpdo.logging.methods".
-	 *
-	 * @var        array
-	 */
-	protected static $defaultLogMethods = array(
-		'DebugPDO::exec',
-		'DebugPDO::query',
-		'DebugPDOStatement::execute',
-	);
-	
-	/**
-	 * Creates a DebugPDO instance representing a connection to a database.
-	 *
-	 * This method is overridden in order to specify a custom PDOStatement class and to implement logging.
-	 *
-	 * @param      string $dsn Connection DSN.
-	 * @param      string $username (optional) The user name for the DSN string.
-	 * @param      string $password (optional) The password for the DSN string.
-	 * @param      array $driver_options (optional) A key=>value array of driver-specific connection options.
-	 * @throws     PDOException if there is an error during connection initialization.
-	 */
-	public function __construct($dsn, $username = null, $password = null, $driver_options = array())
-	{
-		$debug = $this->getDebugSnapshot();
-		
-		parent::__construct($dsn, $username, $password, $driver_options);
-		
-		$this->configureStatementClass($suppress=true);
-		$this->log('', null, __METHOD__, $debug);
-	}
-
-	/**
-	 * Configures the PDOStatement class for this connection.
-	 * 
-	 * @param      boolean $suppressError Whether to suppress an exception if the statement class cannot be set.
-	 * @throws     PropelException if the statement class cannot be set (and $suppressError is false).
-	 */
-	protected function configureStatementClass($suppressError = false)
-	{
-		// extending PDOStatement is not supported with persistent connections
-		if (!$this->getAttribute(PDO::ATTR_PERSISTENT)) {
-			$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array($this->getStatementClass(), array($this)));
-		} elseif (!$suppressError) {
-			throw new PropelException('Extending PDOStatement is not supported with persistent connections.');
-		}
-	}
-
-	/**
-	 * Sets the custom classname to use for PDOStatement.
-	 *
-	 * It is assumed that the specified classname has been loaded (or can be loaded
-	 * on-demand with autoload).
-	 *
-	 * @param      string $classname Name of the statement class to use.
-	 */
-	public function setStatementClass($classname)
-	{
-		$this->statementClass = $classname;
-		$this->configureStatementClass();
-	}
-
-	/**
-	 * Gets the custom classname to use for PDOStatement.
-	 * 
-	 * @return     string
-	 */
-	public function getStatementClass()
-	{
-		return $this->statementClass;
-	}
-
-	/**
-	 * Returns the number of queries this DebugPDO instance has performed on the database connection.
-	 * 
-	 * When using DebugPDOStatement as the statement class, any queries by DebugPDOStatement instances
-	 * are counted as well.
-	 * 
-	 * @return     int
-	 * @throws     PropelException if persistent connection is used (since unable to override PDOStatement in that case).
-	 */
-	public function getQueryCount()
-	{
-		// extending PDOStatement is not supported with persistent connections
-		if ($this->getAttribute(PDO::ATTR_PERSISTENT)) {
-			throw new PropelException('Extending PDOStatement is not supported with persistent connections. ' .
-																'Count would be inaccurate, because we cannot count the PDOStatment::execute() calls. ' .
-																'Either don\'t use persistent connections or don\'t call PropelPDO::getQueryCount()');
-		}
-		return $this->queryCount;
-	}
-
-	/**
-	 * Increments the number of queries performed by this DebugPDO instance.
-	 * 
-	 * Returns the original number of queries (ie the value of $this->queryCount before calling this method).
-	 * 
-	 * @return     int
-	 */
-	public function incrementQueryCount()
-	{
-		$this->queryCount++;
-	}
-
-	/**
-	 * Get the SQL code for the latest query executed by Propel
-	 * 
-	 * @return string Executable SQL code
-	 */
-	public function getLastExecutedQuery() 
-	{ 
-		return $this->lastExecutedQuery; 
-	}
-	
-	/**
-	 * Set the SQL code for the latest query executed by Propel
-	 * 
-	 * @param string $query Executable SQL code
-	 */
-	public function setLastExecutedQuery($query) 
-	{ 
-		$this->lastExecutedQuery = $query; 
-	}
-
-	/**
-	 * Prepares a statement for execution and returns a statement object.
-	 * 
-	 * Overrides PDO::prepare() to add logging and query counting.
-	 * 
-	 * @param      string $sql This must be a valid SQL statement for the target database server.
-	 * @param      array One or more key=>value pairs to set attribute values for the PDOStatement object that this method returns.
-	 * @return     PDOStatement
-	 */
-	public function prepare($sql, $driver_options = array())
-	{
-		$debug	= $this->getDebugSnapshot();
-		$return	= parent::prepare($sql, $driver_options);
-		
-		$this->log($sql, null, __METHOD__, $debug);
-		
-		return $return;
-	}
-
-	/**
-	 * Execute an SQL statement and return the number of affected rows.
-	 * 
-	 * Overridden for query counting and logging.
-	 * 
-	 * @return     int
-	 */
-	public function exec($sql)
-	{
-		$debug	= $this->getDebugSnapshot();
-		$return	= parent::exec($sql);
-
-		$this->log($sql, null, __METHOD__, $debug);
-		$this->setLastExecutedQuery($sql); 	
-		$this->incrementQueryCount();
-		
-		return $return;
-	}
-
-	/**
-	 * Executes an SQL statement, returning a result set as a PDOStatement object.  Despite its signature here,
-	 * this method takes a variety of parameters.
-	 * 
-	 * Overridden for query counting and logging.
-	 * 
-	 * @see        http://php.net/manual/en/pdo.query.php for a description of the possible parameters.
-	 * @return     PDOStatement
-	 */
-	public function query()
-	{
-		$debug	= $this->getDebugSnapshot();
-		$args	= func_get_args();
-		if (version_compare(PHP_VERSION, '5.3', '<')) {
-			$return	= call_user_func_array(array($this, 'parent::query'), $args);
-		} else {
-			$return	= call_user_func_array('parent::query', $args);
-		}
-		
-		$sql = $args[0];
-		$this->log($sql, null, __METHOD__, $debug);
-		$this->setLastExecutedQuery($sql);
-		$this->incrementQueryCount();
-		
-		return $return;
-	}
-
-	/**
-	 * Sets the logging level to use for logging method calls and SQL statements.
-	 *
-	 * @param      int $level Value of one of the Propel::LOG_* class constants.
-	 */
-	public function setLogLevel($level)
-	{
-		$this->logLevel = $level;
-	}
-
-	/**
-	 * Sets a logger to use.
-	 * 
-	 * The logger will be used by this class to log various method calls and their properties.
-	 * 
-	 * @param      BasicLogger $logger A Logger with an API compatible with BasicLogger (or PEAR Log).
-	 */
-	public function setLogger($logger)
-	{
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Logs the method call or SQL using the Propel::log() method or a registered logger class.
-	 * 
-	 * @uses       self::getLogPrefix()
-	 * @see        self::setLogger()
-	 * 
-	 * @param      string $msg Message to log.
-	 * @param      int $level (optional) Log level to use; will use self::setLogLevel() specified level by default.
-	 * @param      string $methodName (optional) Name of the method whose execution is being logged.
-	 * @param      array $debugSnapshot (optional) Previous return value from self::getDebugSnapshot().
-	 */
-	public function log($msg, $level = null, $methodName = null, array $debugSnapshot = null)
-	{
-		// If logging has been specifically disabled, this method won't do anything
-		if (!$this->getLoggingConfig('enabled', true))
-			return;
-		
-		// If the method being logged isn't one of the ones to be logged, bail
-		if (!in_array($methodName, $this->getLoggingConfig('methods', self::$defaultLogMethods)))
-			return;
-		
-		// If a logging level wasn't provided, use the default one
-		if ($level === null)
-			$level = $this->logLevel;
-
-        // Determine if this query is slow enough to warrant logging
-        if ($this->getLoggingConfig("onlyslow", self::DEFAULT_ONLYSLOW_ENABLED))
-        {
-            $now = $this->getDebugSnapshot();
-            if ($now['microtime'] - $debugSnapshot['microtime'] < $this->getLoggingConfig("details.slow.threshold", self::DEFAULT_SLOW_THRESHOLD)) return;
-        }
-		
-		// If the necessary additional parameters were given, get the debug log prefix for the log line
-		if ($methodName && $debugSnapshot)
-			$msg = $this->getLogPrefix($methodName, $debugSnapshot) . $msg;
-		
-		// We won't log empty messages
-		if (!$msg)
-			return;
-		
-		// Delegate the actual logging forward
-		if ($this->logger)
-			$this->logger->log($msg, $level);
-		else
-			Propel::log($msg, $level);
-	}
-	
-	/**
-	 * Returns a snapshot of the current values of some functions useful in debugging.
-	 *
-	 * @return     array
-	 */
-	public function getDebugSnapshot()
-	{
-		return array(
-			'microtime'				=> microtime(true),
-			'memory_get_usage'		=> memory_get_usage($this->getLoggingConfig('realmemoryusage', false)),
-			'memory_get_peak_usage'	=> memory_get_peak_usage($this->getLoggingConfig('realmemoryusage', false)),
-			);
-	}
-	
-	/**
-	 * Returns a named configuration item from the Propel runtime configuration, from under the
-	 * 'debugpdo.logging' prefix.  If such a configuration setting hasn't been set, the given default
-	 * value will be returned. 
-	 *
-	 * @param      string $key Key for which to return the value.
-	 * @param      mixed $defaultValue Default value to apply if config item hasn't been set.
-	 * @return     mixed
-	 */
-	protected function getLoggingConfig($key, $defaultValue)
-	{
-		return Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT)->getParameter("debugpdo.logging.$key", $defaultValue);
-	}
-	
-	/**
-	 * Returns a prefix that may be prepended to a log line, containing debug information according
-	 * to the current configuration.
-	 * 
-	 * Uses a given $debugSnapshot to calculate how much time has passed since the call to self::getDebugSnapshot(),
-	 * how much the memory consumption by PHP has changed etc.
-	 *
-	 * @see        self::getDebugSnapshot()
-	 * 
-	 * @param      string $methodName Name of the method whose execution is being logged.
-	 * @param      array $debugSnapshot A previous return value from self::getDebugSnapshot().
-	 * @return     string
-	 */
-	protected function getLogPrefix($methodName, $debugSnapshot)
-	{
-		$prefix		= '';
-		$now		= $this->getDebugSnapshot();
-		$logDetails	= array_keys($this->getLoggingConfig('details', array()));
-		$innerGlue	= $this->getLoggingConfig('innerglue', ': ');
-		$outerGlue	= $this->getLoggingConfig('outerglue', ' | ');
-		
-		// Iterate through each detail that has been configured to be enabled
-		foreach ($logDetails as $detailName) {
-			
-			if (!$this->getLoggingConfig("details.$detailName.enabled", false))
-				continue;
-			
-			switch ($detailName) {
-				
-				case 'slow';
-					$value = $now['microtime'] - $debugSnapshot['microtime'] >= $this->getLoggingConfig("details.$detailName.threshold", self::DEFAULT_SLOW_THRESHOLD) ? 'YES' : ' NO';
-					break;
-				
-				case 'time':
-					$value = number_format($now['microtime'] - $debugSnapshot['microtime'], $this->getLoggingConfig("details.$detailName.precision", 3)) . ' sec';
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 10), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'mem':
-					$value = self::getReadableBytes($now['memory_get_usage'], $this->getLoggingConfig("details.$detailName.precision", 1));
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 9), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'memdelta':
-					$value = $now['memory_get_usage'] - $debugSnapshot['memory_get_usage'];
-					$value = ($value > 0 ? '+' : '') . self::getReadableBytes($value, $this->getLoggingConfig("details.$detailName.precision", 1));
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 10), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'mempeak':
-					$value = self::getReadableBytes($now['memory_get_peak_usage'], $this->getLoggingConfig("details.$detailName.precision", 1));
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 9), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'querycount':
-					$value = $this->getQueryCount();
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 2), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'method':
-					$value = $methodName;
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 28), ' ', STR_PAD_RIGHT);
-					break;
-				
-				default:
-					$value = 'n/a';
-					break;
-				
-			}
-			
-			$prefix .= $detailName . $innerGlue . $value . $outerGlue;
-			
-		}
-		
-		return $prefix;
-	}
-	
-	/**
-	 * Returns a human-readable representation of the given byte count.
-	 *
-	 * @param      int $bytes Byte count to convert.
-	 * @param      int $precision How many decimals to include.
-	 * @return     string
-	 */
-	protected function getReadableBytes($bytes, $precision)
-	{
-		$suffix	= array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-	    $total	= count($suffix);
-	    
-	    for ($i = 0; $bytes > 1024 && $i < $total; $i++)
-	    	$bytes /= 1024;
-	    
-	    return number_format($bytes, $precision) . ' ' . $suffix[$i];
-	}
-	
-	/**
-	 * If so configured, makes an entry to the log of the state of this DebugPDO instance just prior to its destruction.
-	 *
-	 * @see        self::log()
-	 */
-	public function __destruct()
-	{
-		$this->log('', null, __METHOD__, $this->getDebugSnapshot());
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/DebugPDOStatement.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/DebugPDOStatement.php
deleted file mode 100644
index a1452c5..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/DebugPDOStatement.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/*
- *  $Id: DebugPDOStatement.php 1601 2010-03-15 13:06:11Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PDOStatement that provides some enhanced functionality needed by Propel.
- *
- * Simply adds the ability to count the number of queries executed and log the queries/method calls.
- *
- * @author     Oliver Schonrock <oliver at realtsp.com>
- * @author     Jarno Rantanen <jarno.rantanen at tkk.fi>
- * @since      2007-07-12
- * @package    propel.util
- */
-class DebugPDOStatement extends PDOStatement
-{
-
-	/**
-	 * The PDO connection from which this instance was created.
-	 * 
-	 * @var        DebugPDO
-	 */
-	protected $pdo;
-	
-	/**
-	 * Hashmap for resolving the PDO::PARAM_* class constants to their human-readable names.
-	 * 
-	 * This is only used in logging the binding of variables.
-	 * 
-	 * @see        self::bindValue()
-	 * @var        array
-	 */
-	protected static $typeMap = array(
-		PDO::PARAM_BOOL => "PDO::PARAM_BOOL",
-		PDO::PARAM_INT => "PDO::PARAM_INT",
-		PDO::PARAM_STR => "PDO::PARAM_STR",
-		PDO::PARAM_LOB => "PDO::PARAM_LOB",
-		PDO::PARAM_NULL => "PDO::PARAM_NULL",
-	);
-
-  /**
-   * @var array The values that have been bound
-   */
-  protected $boundValues = array();
-
-	/**
-	 * Construct a new statement class with reference to main DebugPDO object from
-	 * which this instance was created.
-	 * 
-	 * @param      DebugPDO $pdo Reference to the parent PDO instance.
-	 */
-	protected function __construct(DebugPDO $pdo)
-	{
-		$this->pdo = $pdo;
-	}
-
-	public function getExecutedQueryString()
-	{
-		$sql = $this->queryString;
-		
-		$matches = array();
-		if (preg_match_all('/(:p[0-9]+\b)/', $sql, $matches)) {
-			$size = count($matches[1]);
-			for ($i = $size-1; $i >= 0; $i--) { 
-				$pos = $matches[1][$i];
-				$sql = str_replace($pos, $this->boundValues[$pos], $sql);
-			}
-		}
-		
-		return $sql;
-	}
-
-	/**
-	 * Executes a prepared statement.  Returns a boolean value indicating success.
-	 * 
-	 * Overridden for query counting and logging.
-	 * 
-	 * @return     bool
-	 */
-	public function execute($input_parameters = null)
-	{
-		$debug	= $this->pdo->getDebugSnapshot();
-		$return	= parent::execute($input_parameters);
-		
-		$sql = $this->getExecutedQueryString();
-		$this->pdo->log($sql, null, __METHOD__, $debug);
-		$this->pdo->setLastExecutedQuery($sql); 
-		$this->pdo->incrementQueryCount();
-		
-		return $return;
-	}
-
-	/**
-	 * Binds a value to a corresponding named or question mark placeholder in the SQL statement
-	 * that was use to prepare the statement.  Returns a boolean value indicating success.
-	 *
-	 * @param      int $pos Parameter identifier (for determining what to replace in the query).
-	 * @param      mixed $value The value to bind to the parameter.
-	 * @param      int $type Explicit data type for the parameter using the PDO::PARAM_* constants. Defaults to PDO::PARAM_STR.
-	 * @return     boolean
-	 */
-	public function bindValue($pos, $value, $type = PDO::PARAM_STR)
-	{
-		$debug		= $this->pdo->getDebugSnapshot();
-		$typestr	= isset(self::$typeMap[$type]) ? self::$typeMap[$type] : '(default)';
-		$return		= parent::bindValue($pos, $value, $type);
-		$valuestr	= $type == PDO::PARAM_LOB ? '[LOB value]' : var_export($value, true);
-		$msg		= "Binding $valuestr at position $pos w/ PDO type $typestr";
-
-    $this->boundValues[$pos] = $valuestr;
-		
-		$this->pdo->log($msg, null, __METHOD__, $debug);
-		
-		return $return;
-	}
-	
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/Join.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/Join.php
deleted file mode 100644
index 448859e..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/Join.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/*
- *  $Id: Join.php 1126 2009-09-15 12:55:35Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Data object to describe a join between two tables, for example
- * <pre>
- * table_a LEFT JOIN table_b ON table_a.id = table_b.a_id
- * </pre>
- *
- * @author     Francois Zaninotto (Propel)
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @author     Kaspars Jaudzems <kaspars.jaudzems at inbox.lv> (Propel)
- * @author     Frank Y. Kim <frank.kim at clearink.com> (Torque)
- * @author     John D. McNally <jmcnally at collab.net> (Torque)
- * @author     Brett McLaughlin <bmclaugh at algx.net> (Torque)
- * @author     Eric Dobbs <eric at dobbse.net> (Torque)
- * @author     Henning P. Schmiedehausen <hps at intermeta.de> (Torque)
- * @author     Sam Joseph <sam at neurogrid.com> (Torque)
- * @package    propel.util
- */
-class Join
-{
-  // default comparison type
-	const EQUAL = "=";
-	
-	// the left parts of the join condition
-	protected $left = array();
-
-	// the right parts of the join condition
-	protected $right = array();
-
-	// the comparison operators for each pair of columns in the join condition
-	protected $operator = array();
-	
-	// the type of the join (LEFT JOIN, ...), or null for an implicit join
-	protected $joinType = null;
-	
-	// the number of conditions in the join
-	protected $count = 0;
-
-	/**
-	 * Constructor
-	 * Use it preferably with no arguments, and then use addCondition() and setJoinType()
-	 * Syntax with arguments used mainly for backwards compatibility
-	 *
-	 * @param string $leftColumn  The left column of the join condition
-	 *                            (may contain an alias name)
-	 * @param string $rightColumn The right column of the join condition
-	 *                            (may contain an alias name)
-	 * @param string $joinType    The type of the join. Valid join types are null (implicit join),
-	 *                            Criteria::LEFT_JOIN, Criteria::RIGHT_JOIN, and Criteria::INNER_JOIN
-	 */
-	public function __construct($leftColumn = null, $rightColumn = null, $joinType = null)
-	{
-		if(!is_null($leftColumn)) {
-		  if (!is_array($leftColumn)) {
-		    // simple join
-		    $this->addCondition($leftColumn, $rightColumn);
-		  } else {
-		    // join with multiple conditions
-		    if (count($leftColumn) != count($rightColumn) ) {
-			    throw new PropelException("Unable to create join because the left column count isn't equal to the right column count");
-		    }
-		    foreach ($leftColumn as $key => $value)
-		    {
-		      $this->addCondition($value, $rightColumn[$key]);
-		    }
-		  }
-		  $this->setJoinType($joinType);
-		}
-	}
-	
-	/**
-	 * Join condition definition
-	 *
-	 * @param string $left     The left column of the join condition
-	 *                         (may contain an alias name)
-	 * @param string $right    The right column of the join condition
-	 *                         (may contain an alias name)
-	 * @param string $joinType The type of the join. Valid join types are null (implicit join),
-	 *                         Criteria::LEFT_JOIN, Criteria::RIGHT_JOIN, and Criteria::INNER_JOIN
-	 */
-	public function addCondition($left, $right, $operator = self::EQUAL)
-	{
-		$this->left[] = $left;
-		$this->right[] = $right;
-		$this->operator[] = $operator;
-		$this->count++;
-	}
-	
-	/**
-	 * Retrieve the number of conditions in the join
-	 *
-	 * @return integer The number of conditions in the join
-	 */
-	public function countConditions()
-	{
-	  return $this->count;
-	}
-	
-	/**
-	 * Return an array of the join conditions
-	 *
-	 * @return array An array of arrays representing (left, comparison, right) for each condition
-	 */
-	public function getConditions()
-	{
-	  $conditions = array();
-	  for ($i=0; $i < $this->count; $i++) { 
-	    $conditions[] = array(
-	      'left'     => $this->getLeftColumn($i), 
-	      'operator' => $this->getOperator($i),
-	      'right'    => $this->getRightColumn($i)
-	    );
-	  }
-	  return $conditions;
-	}
-
-  /**
-   * @return     the comparison operator for the join condition
-   */
-  public function getOperator($index = 0)
-  {
-    return $this->operator[$index];
-  }
-	
-	public function getOperators()
-	{
-	  return $this->operator;
-	}
-  
-	/**
-	 * Set the join type
-	 *
-	 * @param string  $joinType The type of the join. Valid join types are
-	 *        null (adding the join condition to the where clause),
-	 *        Criteria::LEFT_JOIN(), Criteria::RIGHT_JOIN(), and Criteria::INNER_JOIN()
-	 */
-	public function setJoinType($joinType = null)
-	{
-	  $this->joinType = $joinType;
-	}
-	
-	/**
-	 * Get the join type
-	 *
-	 * @return string The type of the join, i.e. Criteria::LEFT_JOIN(), ...,
-	 *         or null for adding the join condition to the where Clause
-	 */
-	public function getJoinType()
-	{
-		return $this->joinType;
-	}
-
-	/**
-	 * @return     the left column of the join condition
-	 */
-	public function getLeftColumn($index = 0)
-	{
-		return $this->left[$index];
-	}
-	
-	/**
-	 * @return     all right columns of the join condition
-	 */
-	public function getLeftColumns() 
-	{
-		return $this->left;
-	}
-
-
-	public function getLeftColumnName($index = 0)
-	{
-		return substr($this->left[$index], strrpos($this->left[$index], '.') + 1);
-	}
-
-	public function getLeftTableName($index = 0)
-	{
-		return substr($this->left[$index], 0, strrpos($this->left[$index], '.'));
-	}
-
-	/**
-	 * @return     the right column of the join condition
-	 */
-	public function getRightColumn($index = 0)
-	{
-		return $this->right[$index];
-	}
-	
-	/**
-	 * @return     all right columns of the join condition
-	 */
-	public function getRightColumns() 
-	{
-		return $this->right;
-	}
-
-	public function getRightColumnName($index = 0)
-	{
-		return substr($this->right[$index], strrpos($this->right[$index], '.') + 1);
-	}
-
-	public function getRightTableName($index = 0)
-	{
-		return substr($this->right[$index], 0, strrpos($this->right[$index], '.'));
-	}
-
-	/**
-	 * returns a String representation of the class,
-	 * mainly for debugging purposes
-	 *
-	 * @return string     A String representation of the class
-	 */
-	public function toString()
-	{
-		$result = '';
-		if ($this->joinType !== null)
-		{
-			$result .= $this->joinType . ' : ';
-		}
-		foreach ($$this->getConditions() as $index => $condition)
-		{
-		  $result .= implode($condition);
-		  if ($index + 1 < $this->count) {
-				$result .= ' AND ';
-			}
-		}
-    $result .= '(ignoreCase not considered)';
-    
-		return $result;
-	}
-}
- 
\ No newline at end of file
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/NodePeer.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/NodePeer.php
deleted file mode 100644
index e70c0ff..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/NodePeer.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/*
- *  $Id: NodePeer.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is a utility interface for all generated NodePeer classes in the system.
- *
- * @author     Heltem <heltem at o2php.com> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.util
- */
-interface NodePeer {
-	/**
-	 * Creates the supplied node as the root node.
-	 *
-	 * @param      object $node	Propel object for model
-	 * @return     object		Inserted propel object for model
-	 */
-	public static function createRoot(NodeObject $node);
-
-	/**
-	 * Returns the root node for a given scope id
-	 *
-	 * @param      int $scopeId		Scope id to determine which root node to return
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object			Propel object for root node
-	 */
-	public static function retrieveRoot($scopeId = 1, PropelPDO $con = null);
-
-	/**
-	 * Inserts $child as first child of destination node $parent
-	 *
-	 * @param      object $child	Propel object for child node
-	 * @param      object $parent	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsFirstChildOf(NodeObject $child, NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts $child as last child of destination node $parent
-	 *
-	 * @param      object $child	Propel object for child node
-	 * @param      object $parent	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsLastChildOf(NodeObject $child, NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts $sibling as previous sibling to destination node $node
-	 *
-	 * @param      object $node		Propel object for destination node
-	 * @param      object $sibling	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsPrevSiblingOf(NodeObject $node, NodeObject $sibling, PropelPDO $con = null);
-
-	/**
-	 * Inserts $sibling as next sibling to destination node $node
-	 *
-	 * @param      object $node		Propel object for destination node
-	 * @param      object $sibling	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsNextSiblingOf(NodeObject $node, NodeObject $sibling, PropelPDO $con = null);
-
-	/**
-	 * Inserts $parent as parent of given $node.
-	 *
-	 * @param      object $parent  	Propel object for given parent node
-	 * @param      object $node  	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     Exception      When trying to insert node as parent of a root node
-	 */
-	public static function insertAsParentOf(NodeObject $parent, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Inserts $node as root node
-	 *
-	 * @param      object $node	Propel object as root node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertRoot(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Delete root node
-	 *
-	 * @param      int $scopeId		Scope id to determine which root node to delete
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteRoot($scopeId = 1, PropelPDO $con = null);
-
-	/**
-	 * Delete $dest node
-	 *
-	 * @param      object $dest	Propel object node to delete
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteNode(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Moves $child to be first child of $parent
-	 *
-	 * @param      object $parent	Propel object for parent node
-	 * @param      object $child	Propel object for child node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToFirstChildOf(NodeObject $parent, NodeObject $child, PropelPDO $con = null);
-
-	/**
-	 * Moves $node to be last child of $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToLastChildOf(NodeObject $dest, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Moves $node to be prev sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToPrevSiblingOf(NodeObject $dest, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Moves $node to be next sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToNextSiblingOf(NodeObject $dest, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets first child for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveFirstChild(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets last child for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveLastChild(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrievePrevSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveNextSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Retrieves the entire tree from root
-	 *
-	 * @param      int $scopeId		Scope id to determine which scope tree to return
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveTree($scopeId = 1, PropelPDO $con = null);
-
-	/**
-	 * Retrieves the entire tree from parent $node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveBranch(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets direct children for the node
-	 *
-	 * @param      object $node	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveChildren(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets all descendants for the node
-	 *
-	 * @param      object $node	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveDescendants(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets all siblings for the node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveSiblings(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets ancestor for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveParent(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets level for the given node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getLevel(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets number of direct children for given node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfChildren(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets number of descendants for given node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfDescendants(NodeObject $node, PropelPDO $con = null);
-
- 	/**
-	 * Returns path to a specific node as an array, useful to create breadcrumbs
-	 *
-	 * @param      object $node	Propel object of node to create path to
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     array		Array in order of heirarchy
-	 */
-	public static function getPath(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if node is valid
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isValid(NodeObject $node = null);
-
-	/**
-	 * Tests if node is a root
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isRoot(NodeObject $node);
-
-	/**
-	 * Tests if node is a leaf
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isLeaf(NodeObject $node);
-
-	/**
-	 * Tests if $child is a child of $parent
-	 *
-	 * @param      object $child	Propel object for node
-	 * @param      object $parent	Propel object for node
-	 * @return     bool
-	 */
-	public static function isChildOf(NodeObject $child, NodeObject $parent);
-
-	/**
-	 * Tests if $node1 is equal to $node2
-	 *
-	 * @param      object $node1	Propel object for node
-	 * @param      object $node2	Propel object for node
-	 * @return     bool
-	 */
-	public static function isEqualTo(NodeObject $node1, NodeObject $node2);
-
-	/**
-	 * Tests if $node has an ancestor
-	 *
-	 * @param      object $node	Propel object for node
-	 * @param      PropelPDO $con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasParent(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if $node has prev sibling
-	 *
-	 * @param      object $node	Propel object for node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public static function hasPrevSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if $node has next sibling
-	 *
-	 * @param      object $node	Propel object for node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public static function hasNextSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if $node has children
-	 *
-	 * @param      object $node	Propel object for node
-	 * @return     bool
-	 */
-	public static function hasChildren(NodeObject $node);
-
-	/**
-	 * Deletes $node and all of its descendants
-	 *
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function deleteDescendants(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Returns a node given its primary key or the node itself
-	 *
-	 * @param      int/object $node	Primary key/instance of required node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object		Propel object for model
-	 */
-	public static function getNode($node, PropelPDO $con = null);
-
-} // NodePeer
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelColumnTypes.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelColumnTypes.php
deleted file mode 100644
index 81bc1f2..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelColumnTypes.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
- *  $Id: PropelColumnTypes.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Enumeration of Propel types.
- *
- * THIS CLASS MUST BE KEPT UP-TO-DATE WITH THE MORE EXTENSIVE GENERATOR VERSION OF THIS CLASS.
- *
- * @author     Hans Lellelid <hans at xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.util
- */
-class PropelColumnTypes {
-
-	const CHAR = "CHAR";
-	const VARCHAR = "VARCHAR";
-	const LONGVARCHAR = "LONGVARCHAR";
-	const CLOB = "CLOB";
-	const NUMERIC = "NUMERIC";
-	const DECIMAL = "DECIMAL";
-	const TINYINT = "TINYINT";
-	const SMALLINT = "SMALLINT";
-	const INTEGER = "INTEGER";
-	const BIGINT = "BIGINT";
-	const REAL = "REAL";
-	const FLOAT = "FLOAT";
-	const DOUBLE = "DOUBLE";
-	const BINARY = "BINARY";
-	const VARBINARY = "VARBINARY";
-	const LONGVARBINARY = "LONGVARBINARY";
-	const BLOB = "BLOB";
-	const DATE = "DATE";
-	const TIME = "TIME";
-	const TIMESTAMP = "TIMESTAMP";
-
-	const BU_DATE = "BU_DATE";
-	const BU_TIMESTAMP = "BU_TIMESTAMP";
-
-	const BOOLEAN = "BOOLEAN";
-
-	private static $propelToPdoMap = array(
-		self::CHAR 			=> PDO::PARAM_STR,
-		self::VARCHAR 		=> PDO::PARAM_STR,
-		self::LONGVARCHAR 	=> PDO::PARAM_STR,
-		self::CLOB 			=> PDO::PARAM_LOB,
-		self::NUMERIC 		=> PDO::PARAM_STR,
-		self::DECIMAL 		=> PDO::PARAM_STR,
-		self::TINYINT 		=> PDO::PARAM_INT,
-		self::SMALLINT 		=> PDO::PARAM_INT,
-		self::INTEGER 		=> PDO::PARAM_INT,
-		self::BIGINT 		=> PDO::PARAM_STR,
-		self::REAL 			=> PDO::PARAM_STR,
-		self::FLOAT 		=> PDO::PARAM_STR,
-		self::DOUBLE 		=> PDO::PARAM_STR,
-		self::BINARY 		=> PDO::PARAM_STR,
-		self::VARBINARY 	=> PDO::PARAM_STR,
-		self::LONGVARBINARY => PDO::PARAM_STR,
-		self::BLOB 			=> PDO::PARAM_LOB,
-		self::DATE 			=> PDO::PARAM_STR,
-		self::TIME 			=> PDO::PARAM_STR,
-		self::TIMESTAMP 	=> PDO::PARAM_STR,
-		self::BU_DATE 		=> PDO::PARAM_STR,
-		self::BU_TIMESTAMP 	=> PDO::PARAM_STR,
-		self::BOOLEAN 		=> PDO::PARAM_BOOL,
-	);
-
-	/**
-	 * Resturns the PDO type (PDO::PARAM_* constant) value for the Propel type provided.
-	 * @param      string $propelType
-	 * @return     int
-	 */
-	public static function getPdoType($propelType)
-	{
-		return self::$propelToPdoMap[$propelType];
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelConfiguration.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelConfiguration.php
deleted file mode 100644
index d802fc9..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelConfiguration.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/*
- *  $Id: PropelConfiguration.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PropelConfiguration is a container for all Propel's configuration data.
- *
- * PropelConfiguration implements ArrayAccess interface so the configuration
- * can be accessed as an array or using a simple getter and setter. The whole
- * configuration can also be retrieved as a nested arrays, flat array or as a
- * PropelConfiguration instance.
- *
- * @author     Veikko Mäkinen <veikko at veikko.fi>
- * @version    $Revision: 1262 $
- * @package    propel
- */
-class PropelConfiguration implements ArrayAccess
-{
-	const TYPE_ARRAY = 1;
-
-	const TYPE_ARRAY_FLAT = 2;
-
-	const TYPE_OBJECT = 3;
-
-	/**
-	* @var        array An array of parameters
-	*/
-	protected $parameters = array();
-
-	/**
-	 * Construct a new configuration container
-	 *
-	 * @param      array $parameters
-	 */
-	public function __construct(array $parameters = array())
-	{
-		$this->parameters = $parameters;
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetExists($offset)
-	{
-		return isset($this->parameter[$offset]) || array_key_exists($offset, $this->parameters);
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetSet($offset, $value)
-	{
-		$this->parameter[$offset] = $value;
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetGet($offset)
-	{
-		return $this->parameters[$offset];
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetUnset($offset)
-	{
-		unset($this->parameters[$offset]);
-	}
-
-	/**
-	 * Get parameter value from the container
-	 *
-	 * @param      string $name    Parameter name
-	 * @param      mixed  $default Default value to be used if the
-	 *                             requested value is not found
-	 * @return     mixed           Parameter value or the default
-	 */
-	public function getParameter($name, $default = null)
-	{
-		$ret = $this->parameters;
-		$parts = explode('.', $name); //name.space.name
-		while ($part = array_shift($parts)) {
-			if (array_key_exists($part, $ret)) {
-				$ret = $ret[$part];
-			} else {
-				return $default;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Store a value to the container
-	 *
-	 * @param      string $name Configuration item name (name.space.name)
-	 * @param      mixed $value Value to be stored
-	 */
-	public function setParameter($name, $value)
-	{
-		$param = &$this->parameters;
-		$parts = explode('.', $name); //name.space.name
-		while ($part = array_shift($parts)) {
-			$param = &$param[$part];
-		}
-		$param = $value;
-	}
-
-	/**
-	 *
-	 *
-	 * @param      int $type
-	 * @return     mixed
-	 */
-	public function getParameters($type = PropelConfiguration::TYPE_ARRAY)
-	{
-		switch ($type) {
-			case PropelConfiguration::TYPE_ARRAY:
-				return $this->parameters;
-			case PropelConfiguration::TYPE_ARRAY_FLAT:
-				return $this->toFlatArray();
-			case PropelConfiguration::TYPE_OBJECT:
-				return $this;
-			default:
-				throw new PropelException('Unknown configuration type: '. var_export($type, true));
-		}
-
-	}
-
-
-	/**
-	 * Get the configuration as a flat array. ($array['name.space.item'] = 'value')
-	 *
-	 * @return     array
-	 */
-	protected function toFlatArray()
-	{
-		$result = array();
-		$it = new PropelConfigurationIterator(new RecursiveArrayIterator($this->parameters), RecursiveIteratorIterator::SELF_FIRST);
-		foreach($it as $key => $value) {
-			$ns = $it->getDepth() ? $it->getNamespace() . '.'. $key : $key;
-			if ($it->getNodeType() == PropelConfigurationIterator::NODE_ITEM) {
-				$result[$ns] = $value;
-			}
-		}
-
-		return $result;
-	}
-
-}
-
-?>
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelConfigurationIterator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelConfigurationIterator.php
deleted file mode 100644
index 26d1edc..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelConfigurationIterator.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
- *  $Id: PropelConfigurationIterator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PropelConfigurationIterator is used internally by PropelConfiguration to
- * build a flat array from nesting configuration arrays.
- *
- * @author     Veikko Mäkinen <veikko at veikko.fi>
- * @version    $Revision: 1262 $
- * @package    propel
- */
-class PropelConfigurationIterator extends RecursiveIteratorIterator
-{
-	/**
-	 * Node is a parent node
-	 */
-	const NODE_PARENT = 0;
-
-	/**
-	 * Node is an actual configuration item
-	 */
-	const NODE_ITEM = 1;
-
-	/**
-	 * Namespace stack when recursively iterating the configuration tree
-	 *
-	 * @var        array
-	 */
-	protected $namespaceStack = array();
-
-	/**
-	 * Current node type. Possible values: null (undefined), self::NODE_PARENT or self::NODE_ITEM
-	 *
-	 * @var        int
-	 */
-	protected $nodeType = null;
-
-	/**
-	 * Get current namespace
-	 *
-	 * @return     string
-	 */
-	public function getNamespace()
-	{
-		return implode('.', $this->namespaceStack);
-	}
-
-	/**
-	 * Get current node type.
-	 *
-	 * @see        http://www.php.net/RecursiveIteratorIterator
-	 * @return     int
-	 *             - null (undefined)
-	 *             - self::NODE_PARENT
-	 *             - self::NODE_ITEM
-	 */
-	public function getNodeType()
-	{
-		return $this->nodeType;
-	}
-
-	/**
-	 * Get the current element
-	 *
-	 * @see        http://www.php.net/RecursiveIteratorIterator
-	 * @return     mixed
-	 */
-	public function current()
-	{
-		$current = parent::current();
-		if (is_array($current)) {
-			$this->namespaceStack[] = $this->key();
-			$this->nodeType = self::NODE_PARENT;
-		}
-		else {
-			$this->nodeType = self::NODE_ITEM;
-		}
-
-		return $current;
-	}
-
-	/**
-	 * Called after current child iterator is invalid and right before it gets destructed.
-	 *
-	 * @see        http://www.php.net/RecursiveIteratorIterator
-	 */
-	public function endChildren()
-	{
-		if ($this->namespaceStack) {
-			array_pop($this->namespaceStack);
-		}
-	}
-
-}
-
-?>
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelDateTime.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelDateTime.php
deleted file mode 100644
index 4913e62..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelDateTime.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- *  $Id: PropelDateTime.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * DateTime subclass which supports serialization.
- *
- * Currently Propel is not using this for storing date/time objects
- * within model objeects; however, we are keeping it in the repository
- * because it is useful if you want to store a DateTime object in a session.
- *
- * @author     Alan Pinstein
- * @author     Soenke Ruempler
- * @author     Hans Lellelid
- * @package    propel.util
- */
-class PropelDateTime extends DateTime
-{
-
-	/**
-	 * A string representation of the date, for serialization.
-	 * @var        string
-	 */
-	private $dateString;
-
-	/**
-	 * A string representation of the time zone, for serialization.
-	 * @var        string
-	 */
-	private $tzString;
-
-	/**
-	 * Convenience method to enable a more fluent API.
-	 * @param      string $date Date/time value.
-	 * @param      DateTimeZone $tz (optional) timezone
-	 */
-	public static function newInstance($date, DateTimeZone $tz = null)
-	{
-		if ($tz) {
-			return new DateTime($date, $tz);
-		} else {
-			return new DateTime($date);
-		}
-	}
-
-	/**
-	 * PHP "magic" function called when object is serialized.
-	 * Sets an internal property with the date string and returns properties
-	 * of class that should be serialized.
-	 * @return     array string[]
-	 */
-	function __sleep()
-	{
-		// We need to use a string without a time zone, due to
-		// PHP bug: http://bugs.php.net/bug.php?id=40743
-		$this->dateString = $this->format('Y-m-d H:i:s');
-		$this->tzString = $this->getTimeZone()->getName();
-		return array('dateString', 'tzString');
-	}
-
-	/**
-	 * PHP "magic" function called when object is restored from serialized state.
-	 * Calls DateTime constructor with previously stored string value of date.
-	 */
-	function __wakeup()
-	{
-		parent::__construct($this->dateString, new DateTimeZone($this->tzString));
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelPDO.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelPDO.php
deleted file mode 100644
index b51fa10..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelPDO.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/*
- *  $Id: PropelPDO.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * PDO connection subclass that provides the basic fixes to PDO that are required by Propel.
- *
- * This class was designed to work around the limitation in PDO where attempting to begin
- * a transaction when one has already been begun will trigger a PDOException.  Propel
- * relies on the ability to create nested transactions, even if the underlying layer
- * simply ignores these (because it doesn't support nested transactions).
- *
- * The changes that this class makes to the underlying API include the addition of the
- * getNestedTransactionDepth() and isInTransaction() and the fact that beginTransaction()
- * will no longer throw a PDOException (or trigger an error) if a transaction is already
- * in-progress.
- *
- * @author     Cameron Brunner <cameron.brunner at gmail.com>
- * @author     Hans Lellelid <hans at xmpl.org>
- * @author     Christian Abegg <abegg.ch at gmail.com>
- * @since      2006-09-22
- * @package    propel.util
- */
-class PropelPDO extends PDO {
-
-	/**
-	 * Attribute to use to set whether to cache prepared statements.
-	 */
-	const PROPEL_ATTR_CACHE_PREPARES = -1;
-
-	/**
-	 * The current transaction depth.
-	 * @var        int
-	 */
-	protected $nestedTransactionCount = 0;
-
-	/**
-	 * Cache of prepared statements (PDOStatement) keyed by md5 of SQL.
-	 *
-	 * @var        array [md5(sql) => PDOStatement]
-	 */
-	protected $preparedStatements = array();
-
-	/**
-	 * Whether to cache prepared statements.
-	 *
-	 * @var        boolean
-	 */
-	protected $cachePreparedStatements = false;
-	
-	/**
-	 * Whether the final commit is possible
-	 * Is false if a nested transaction is rolled back
-	 */
-	protected $isUncommitable = false;
-
-	/**
-	 * Gets the current transaction depth.
-	 * @return     int
-	 */
-	public function getNestedTransactionCount()
-	{
-		return $this->nestedTransactionCount;
-	}
-
-	/**
-	 * Set the current transaction depth.
-	 * @param      int $v The new depth.
-	 */
-	protected function setNestedTransactionCount($v)
-	{
-		$this->nestedTransactionCount = $v;
-	}
-
-	/**
-	 * Decrements the current transaction depth by one.
-	 */
-	protected function decrementNestedTransactionCount()
-	{
-		$this->nestedTransactionCount--;
-	}
-
-	/**
-	 * Increments the current transaction depth by one.
-	 */
-	protected function incrementNestedTransactionCount()
-	{
-		$this->nestedTransactionCount++;
-	}
-
-	/**
-	 * Is this PDO connection currently in-transaction?
-	 * This is equivalent to asking whether the current nested transaction count
-	 * is greater than 0.
-	 * @return     boolean
-	 */
-	public function isInTransaction()
-	{
-		return ($this->getNestedTransactionCount() > 0);
-	}
-	
-	/**
-	 * Overrides PDO::beginTransaction() to prevent errors due to already-in-progress transaction.
-	 */
-	public function beginTransaction()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ( $opcount === 0 ) {
-			$return = parent::beginTransaction();
-			$this->isUncommitable = false;
-		}
-		$this->incrementNestedTransactionCount();
-		return $return;
-	}
-
-	/**
-	 * Overrides PDO::commit() to only commit the transaction if we are in the outermost
-	 * transaction nesting level.
-	 */
-	public function commit()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) {
-				if ($this->isUncommitable) {
-					throw new PropelException('Cannot commit because a nested transaction was rolled back');
-				} else {
-					$return = parent::commit();
-				}
-			}
-			$this->decrementNestedTransactionCount();
-		}
-		return $return;
-	}
-
-	/**
-	 * Overrides PDO::rollBack() to only rollback the transaction if we are in the outermost
-	 * transaction nesting level
-	 * @return     boolean Whether operation was successful.
-	 */
-	public function rollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) { 
-				$return = parent::rollBack(); 
-			} else {
-				$this->isUncommitable = true;
-			}
-			$this->decrementNestedTransactionCount(); 
-		}
-		return $return;
-	}
-
-	/**
-	* Rollback the whole transaction, even if this is a nested rollback
-	* and reset the nested transaction count to 0.
-	* @return     boolean Whether operation was successful.
-	*/
-	public function forceRollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			// If we're in a transaction, always roll it back
-			// regardless of nesting level.
-			$return = parent::rollBack();
-			
-			// reset nested transaction count to 0 so that we don't
-			// try to commit (or rollback) the transaction outside this scope.
-			$this->nestedTransactionCount = 0;
-		}
-		return $return;
-	}
-  
-	/**
-	 * Sets a connection attribute.
-	 *
-	 * This is overridden here to provide support for setting Propel-specific attributes
-	 * too.
-	 *
-	 * @param      int $attribute The attribute to set (e.g. PropelPDO::PROPEL_ATTR_CACHE_PREPARES).
-	 * @param      mixed $value The attribute value.
-	 */
-	public function setAttribute($attribute, $value)
-	{
-		switch($attribute) {
-			case self::PROPEL_ATTR_CACHE_PREPARES:
-				$this->cachePreparedStatements = $value;
-				break;
-			default:
-				parent::setAttribute($attribute, $value);
-		}
-	}
-
-	/**
-	 * Gets a connection attribute.
-	 *
-	 * This is overridden here to provide support for setting Propel-specific attributes
-	 * too.
-	 *
-	 * @param      int $attribute The attribute to get (e.g. PropelPDO::PROPEL_ATTR_CACHE_PREPARES).
-	 */
-	public function getAttribute($attribute)
-	{
-		switch($attribute) {
-			case self::PROPEL_ATTR_CACHE_PREPARES:
-				return $this->cachePreparedStatements;
-				break;
-			default:
-				return parent::getAttribute($attribute);
-		}
-	}
-
-	/**
-	 * Overrides PDO::prepare() to add query caching support if the
-	 * PropelPDO::PROPEL_ATTR_CACHE_PREPARES was set to true.
-	 * .
-	 * @param      string $sql
-	 * @param      array
-	 * @return     PDOStatement
-	 */
-	public function prepare($sql, $driver_options = array())
-	{
-		if ($this->cachePreparedStatements) {
-			$key = $sql;
-			if (!isset($this->preparedStatements[$key])) {
-				$stmt = parent::prepare($sql, $driver_options);
-				$this->preparedStatements[$key] = $stmt;
-				return $stmt;
-			} else {
-				return $this->preparedStatements[$key];
-			}
-		} else {
-			return parent::prepare($sql, $driver_options);
-		}
-	}
-
-	/**
-	 * Clears any stored prepared statements for this connection.
-	 */
-	public function clearStatementCache()
-	{
-		$this->preparedStatements = array();
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelPager.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelPager.php
deleted file mode 100644
index 1bac7b4..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/util/PropelPager.php
+++ /dev/null
@@ -1,607 +0,0 @@
-<?php
-/*
- *  $Id: PropelPager.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- *  PropelPager
- *
- *  Example Usage:
- *
- *  require_once 'propel/util/PropelPager.php';
- *  require_once 'PEACH/Propel/Poem/poemPeer.php';
- *
- *  $c = new Criteria();
- *  $c->addDescendingOrderByColumn(poemPeer::SID);
- *
- *  // with join
- *  $pager = new PropelPager($c, 'poemPeer', 'doSelectJoinPoemUsers', 1, 50);
- *
- *  // without Join
- *
- *  $pager = new PropelPager($c, 'poemPeer', 'doSelect', 1, 50);
- *
- * Some template:
- *
- * <p>
- * Total Pages: <?=$pager->getTotalPages()?>  Total Records: <?=$pager->getTotalRecordCount()?>
- * </p>
- * <table>
- * <tr>
- * <td>
- * <?if ($link = $pager->getFirstPage):?>
- * <a href="somescript?page=<?=$link?>"><?=$link?></a>|
- * <?endif?>
- * </td>
- * <td>
- * <?if ($link = $pager->getPrev()):?>
- * <a href="somescript?page=<?=$link?>">Previous</a>|
- * <?endif?>
- * </td>
- * <td>
- * <?foreach ($pager->getPrevLinks() as $link):?>
- * <a href="somescript?page=<?=$link?>"><?=$link?></a>|
- * <?endforeach?>
- * </td>
- * <td><?=$pager->getPage()?></td>
- * <td>
- * <?foreach ($pager->getNextLinks() as $link):?>
- * | <a href="somescript?page=<?=$link?>"><?=$link?></a>
- * <?endforeach?>
- * </td>
- * <td>
- * <?if ($link = $pager->getNext()):?>
- * <a href="somescript?page=<?=$link?>">Last</a>|
- * <?endif?>
- * </td>
- * <td>
- * <?if ($link = $pager->getLastPage()):?>
- * <a href="somescript?page=<?=$link?>"><?=$link?></a>|
- * <?endif?>
- * </td>
- * </tr>
- * </table>
- * <table id="latestPoems">
- * <tr>
- * <th>Title</th>
- * <th>Auteur</th>
- * <th>Date</th>
- * <th>comments</th>
- * </tr>
- * <?foreach ($pager->getResult() as $poem):?>
- * <tr>
- * <td><?=$poem->getTitle()?></td>
- * <td><?=$poem->getPoemUsers()->getUname()?></td>
- * <td><?=$poem->getTime()?></td>
- * <td><?=$poem->getComments()?></td>
- * </tr>
- * <?endforeach?>
- * </table>
- *
- *
- * @author     Rob Halff <info at rhalff.com>
- * @author	   Niklas Närhinen <niklas at narhinen.net>
- * @version    $Revision: 1262 $
- * @copyright  Copyright (c) 2004 Rob Halff: LGPL - See LICENCE
- * @package    propel.util
- */
-class PropelPager implements Countable, Iterator {
-
-	private $recordCount;
-	private $pages;
-	private $peerClass;
-	private $peerSelectMethod;
-	private $peerCountMethod;
-	private $criteria;
-	private $countCriteria;
-	private $page;
-	private $rs = null;
-	
-	//Iterator vars
-	private $currentKey = 0;
-
-	/** @var        int Start row (offset) */
-	protected $start = 0;
-
-	/** @var        int Max rows to return (0 means all) */
-	protected $max = 0;
-
-	/**
-	 * Create a new Propel Pager.
-	 * @param      Criteria $c
-	 * @param      string $peerClass The name of the static Peer class.
-	 * @param      string $peerSelectMethod The name of the static method for selecting content from the Peer class.
-	 * @param      int $page The current page (1-based).
-	 * @param      int $rowsPerPage The number of rows that should be displayed per page.
-	 */
-	public function __construct($c = null, $peerClass = null, $peerSelectMethod = null, $page = 1, $rowsPerPage = 25)
-	{
-		if (!isset($c)) {
-			$c = new Criteria();
-		}
-		$this->setCriteria($c);
-		$this->setPeerClass($peerClass);
-		$this->setPeerSelectMethod($peerSelectMethod);
-		$this->guessPeerCountMethod();
-		$this->setPage($page);
-		$this->setRowsPerPage($rowsPerPage);
-	}
-
-	/**
-	 * Set the criteria for this pager.
-	 * @param      Criteria $c
-	 * @return     void
-	 */
-	public function setCriteria(Criteria $c)
-	{
-		$this->criteria = $c;
-	}
-
-	/**
-	 * Return the Criteria object for this pager.
-	 * @return     Criteria
-	 */
-	public function getCriteria()
-	{
-		return $this->criteria;
-	}
-
-	/**
-	 * Set the Peer Classname
-	 *
-	 * @param      string $class
-	 * @return     void
-	 */
-	public function setPeerClass($class)
-	{
-		$this->peerClass = $class;
-	}
-
-	/**
-	 * Return the Peer Classname.
-	 * @return     string
-	 */
-	public function getPeerClass()
-	{
-		return $this->peerClass;
-	}
-
-	/**
-	 * Set the Peer select method.
-	 * This exists for legacy support, please use setPeerSelectMethod().
-	 * @param      string $method The name of the static method to call on the Peer class.
-	 * @return     void
-	 * @see        setPeerSelectMethod()
-	 * @deprecated
-	 */
-	public function setPeerMethod($method)
-	{
-		$this->setPeerSelectMethod($method);
-	}
-
-	/**
-	 * Return the Peer select method.
-	 * This exists for legacy support, please use getPeerSelectMethod().
-	 * @return     string
-	 * @see        getPeerSelectMethod()
-	 * @deprecated
-	 */
-	public function getPeerMethod()
-	{
-		return $this->getPeerSelectMethod();
-	}
-
-	/**
-	 * Set the Peer select method.
-	 *
-	 * @param      string $method The name of the static method to call on the Peer class.
-	 * @return     void
-	 */
-	public function setPeerSelectMethod($method)
-	{
-		$this->peerSelectMethod = $method;
-	}
-
-	/**
-	 * Return the Peer select method.
-	 * @return     string
-	 */
-	public function getPeerSelectMethod()
-	{
-		return $this->peerSelectMethod;
-	}
-
-	/**
-	 * Sets the Count method.
-	 * This is set based on the Peer method, for example if Peer method is doSelectJoin*() then the
-	 * count method will be doCountJoin*().
-	 * @param      string $method The name of the static method to call on the Peer class.
-	 */
-	public function setPeerCountMethod($method)
-	{
-		$this->peerCountMethod = $method;
-	}
-
-	/**
-	 * Return the Peer count method.
-	 */
-	public function getPeerCountMethod()
-	{
-		return $this->peerCountMethod;
-	}
-
-	/**
-	 * Guesses the Peer count method based on the select method.
-	 */
-	private function guessPeerCountMethod()
-	{
-		$selectMethod = $this->getPeerSelectMethod();
-		if ($selectMethod == 'doSelect') {
-			$countMethod = 'doCount';
-		} elseif ( ($pos = stripos($selectMethod, 'doSelectJoin')) === 0) {
-			$countMethod = 'doCount' . substr($selectMethod, strlen('doSelect'));
-		} else {
-			// we will fall back to doCount() if we don't understand the join
-			// method; however, it probably won't be accurate.  Maybe triggering an error would
-			// be appropriate ...
-			$countMethod = 'doCount';
-		}
-		$this->setPeerCountMethod($countMethod);
-	}
-
-	/**
-	 * Get the paged resultset
-	 *
-	 * @return     mixed $rs
-	 */
-	public function getResult()
-	{
-		if (!isset($this->rs)) {
-			$this->doRs();
-		}
-
-		return $this->rs;
-	}
-
-	/**
-	 * Get the paged resultset
-	 *
-	 * Main method which creates a paged result set based on the criteria
-	 * and the requested peer select method.
-	 *
-	 */
-	private function doRs()
-	{
-		$this->criteria->setOffset($this->start);
-		$this->criteria->setLimit($this->max);
-		$this->rs = call_user_func(array($this->getPeerClass(), $this->getPeerSelectMethod()), $this->criteria);
-	}
-
-	/**
-	 * Get the first page
-	 *
-	 * For now I can only think of returning 1 always.
-	 * It should probably return 0 if there are no pages
-	 *
-	 * @return     int 1
-	 */
-	public function getFirstPage()
-	{
-		return '1';
-	}
-
-	/**
-	 * Convenience method to indicate whether current page is the first page.
-	 *
-	 * @return     boolean
-	 */
-	public function atFirstPage()
-	{
-		return $this->getPage() == $this->getFirstPage();
-	}
-
-	/**
-	 * Get last page
-	 *
-	 * @return     int $lastPage
-	 */
-	public function getLastPage()
-	{
-		$totalPages = $this->getTotalPages();
-		if ($totalPages == 0) {
-			return 1;
-		} else {
-			return $totalPages;
-		}
-	}
-
-	/**
-	 * Convenience method to indicate whether current page is the last page.
-	 *
-	 * @return     boolean
-	 */
-	public function atLastPage()
-	{
-		return $this->getPage() == $this->getLastPage();
-	}
-
-	/**
-	 * get total pages
-	 *
-	 * @return     int $this->pages
-	 */
-	public function getTotalPages() {
-		if (!isset($this->pages)) {
-			$recordCount = $this->getTotalRecordCount();
-			if ($this->max > 0) {
-					$this->pages = ceil($recordCount/$this->max);
-			} else {
-					$this->pages = 0;
-			}
-		}
-		return $this->pages;
-	}
-
-	/**
-	 * get an array of previous id's
-	 *
-	 * @param      int $range
-	 * @return     array $links
-	 */
-	public function getPrevLinks($range = 5)
-	{
-		$total = $this->getTotalPages();
-		$start = $this->getPage() - 1;
-		$end = $this->getPage() - $range;
-		$first =  $this->getFirstPage();
-		$links = array();
-		for ($i=$start; $i>$end; $i--) {
-			if ($i < $first) {
-					break;
-			}
-			$links[] = $i;
-		}
-
-		return array_reverse($links);
-	}
-
-	/**
-	 * get an array of next id's
-	 *
-	 * @param      int $range
-	 * @return     array $links
-	 */
-	public function getNextLinks($range = 5)
-	{
-		$total = $this->getTotalPages();
-		$start = $this->getPage() + 1;
-		$end = $this->getPage() + $range;
-		$last =  $this->getLastPage();
-		$links = array();
-		for ($i=$start; $i<$end; $i++) {
-			if ($i > $last) {
-					break;
-			}
-			$links[] = $i;
-		}
-
-		return $links;
-	}
-
-	/**
-	 * Returns whether last page is complete
-	 *
-	 * @return     bool Last page complete or not
-	 */
-	public function isLastPageComplete()
-	{
-		return !($this->getTotalRecordCount() % $this->max);
-	}
-
-	/**
-	 * get previous id
-	 *
-	 * @return     mixed $prev
-	 */
-	public function getPrev() {
-		if ($this->getPage() != $this->getFirstPage()) {
-				$prev = $this->getPage() - 1;
-		} else {
-				$prev = false;
-		}
-		return $prev;
-	}
-
-	/**
-	 * get next id
-	 *
-	 * @return     mixed $next
-	 */
-	public function getNext() {
-		if ($this->getPage() != $this->getLastPage()) {
-				$next = $this->getPage() + 1;
-		} else {
-				$next = false;
-		}
-		return $next;
-	}
-
-	/**
-	 * Set the current page number (First page is 1).
-	 * @param      int $page
-	 * @return     void
-	 */
-	public function setPage($page)
-	{
-		$this->page = $page;
-		// (re-)calculate start rec
-		$this->calculateStart();
-	}
-
-	/**
-	 * Get current page.
-	 * @return     int
-	 */
-	public function getPage()
-	{
-		return $this->page;
-	}
-
-	/**
-	 * Set the number of rows per page.
-	 * @param      int $r
-	 */
-	public function setRowsPerPage($r)
-	{
-		$this->max = $r;
-		// (re-)calculate start rec
-		$this->calculateStart();
-	}
-
-	/**
-	 * Get number of rows per page.
-	 * @return     int
-	 */
-	public function getRowsPerPage()
-	{
-		return $this->max;
-	}
-
-	/**
-	 * Calculate startrow / max rows based on current page and rows-per-page.
-	 * @return     void
-	 */
-	private function calculateStart()
-	{
-		$this->start = ( ($this->page - 1) * $this->max );
-	}
-
-	/**
-	 * Gets the total number of (un-LIMITed) records.
-	 *
-	 * This method will perform a query that executes un-LIMITed query.
-	 *
-	 * @return     int Total number of records - disregarding page, maxrows, etc.
-	 */
-	public function getTotalRecordCount()
-	{
-
-				if (!isset($this->rs)) {
-					$this->doRs();
-				}
-
-				if (empty($this->recordCount)) {
-						$this->countCriteria = clone $this->criteria;
-						$this->countCriteria->setLimit(0);
-						$this->countCriteria->setOffset(0);
-
-						$this->recordCount = call_user_func(
-								        array(
-								                $this->getPeerClass(),
-												$this->getPeerCountMethod()
-								             ),
-								        $this->countCriteria
-								        );
-
-				}
-
-				return $this->recordCount;
-
-	}
-
-	/**
-	 * Sets the start row or offset.
-	 * @param      int $v
-	 */
-	public function setStart($v)
-	{
-		$this->start = $v;
-	}
-
-	/**
-	 * Sets max rows (limit).
-	 * @param      int $v
-	 * @return     void
-	 */
-	public function setMax($v)
-	{
-		$this->max = $v;
-	}
-	
-	/**
-	 * Returns the count of the current page's records
-	 * @return 	int
-	 */
-	public function count()
-	{
-		return count($this->getResult());
-	}
-	
-	/**
-	 * Returns the current element of the iterator
-	 * @return mixed
-	 */
-	public function current()
-	{
-		if (!isset($this->rs)) {
-			$this->doRs();
-		}
-		return $this->rs[$this->currentKey];
-	}
-	
-	/**
-	 * Returns the current key of the iterator
-	 * @return int
-	 */
-	public function key()
-	{
-		return $this->currentKey;
-	}
-	
-	/**
-	 * Advances the iterator to the next element
-	 * @return void
-	 */
-	public function next()
-	{
-		$this->currentKey++;
-	}
-	
-	/**
-	 * Resets the iterator to the first element
-	 * @return void
-	 */
-	public function rewind()
-	{
-		$this->currentKey = 0;
-	}
-	
-	/**
-	 * Checks if the current key exists in the container
-	 * @return boolean
-	 */
-	public function valid()
-	{
-		if (!isset($this->rs)) {
-			$this->doRs();
-		}
-		return in_array($this->currentKey, array_keys($this->rs));
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/BasicValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/BasicValidator.php
deleted file mode 100644
index 24e2168..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/BasicValidator.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- *  $Id: BasicValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Basic Validator interface.
- *
- * BasicValidator objects perform validation without any knowledge of column/table
- * context.  They are simply given an input and some value and asked whether the input
- * is valid.
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-interface BasicValidator
-{
-
-	/**
-	 * Determine whether a value meets the criteria specified
-	 *
-	 * @param      ValidatorMap $map A column map object for the column to be validated.
-	 * @param      string $str a <code>String</code> to be tested
-	 *
-	 * @return     mixed TRUE if valid, error message otherwise
-	 */
-	public function isValid(ValidatorMap $map, $str);
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MatchValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MatchValidator.php
deleted file mode 100644
index 283e91c..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MatchValidator.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
- *  $Id: MatchValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for regular expressions.
- *
- * This validator will return true, when the passed value *matches* the
- * regular expression.
- *
- * ## This class replaces the former class MaskValidator ##
- *
- * If you do want to test if the value does *not* match an expression,
- * you can use the MatchValidator class instead.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="email" type="VARCHAR" size="128" required="true" />
- *   <validator column="username">
- *     <!-- allow strings that match the email adress pattern -->
- *     <rule
- *       name="match"
- *       value="/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9])+(\.[a-zA-Z0-9_-]+)+$/"
- *       message="Please enter a valid email address." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MatchValidator implements BasicValidator
-{
-	/**
-	 * Prepares the regular expression entered in the XML
-	 * for use with preg_match().
-	 * @param      string $exp
-	 * @return     string Prepared regular expession.
-	 */
-	private function prepareRegexp($exp)
-	{
-		// remove surrounding '/' marks so that they don't get escaped in next step
-		if ($exp{0} !== '/' || $exp{strlen($exp)-1} !== '/' ) {
-			$exp = '/' . $exp . '/';
-		}
-
-		// if they did not escape / chars; we do that for them
-		$exp = preg_replace('/([^\\\])\/([^$])/', '$1\/$2', $exp);
-
-		return $exp;
-	}
-
-	/**
-	 * Whether the passed string matches regular expression.
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return (preg_match($this->prepareRegexp($map->getValue()), $str) != 0);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MaxLengthValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MaxLengthValidator.php
deleted file mode 100644
index 7737e07..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MaxLengthValidator.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- *  $Id: MaxLengthValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for maximum string length.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * Note that if you have specified the size attribute in the column tag
- * you do not have to specify it as value in the validator rule again as
- * this is done automatically.
- *
- * <code>
- *   <column name="username" type="VARCHAR" size="25" required="true" />
- *
- *   <validator column="username">
- *     <rule name="maxLength" message="Passwort must be at least ${value} characters !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MaxLengthValidator implements BasicValidator
-{
-
-  public function isValid (ValidatorMap $map, $str)
-  {
-	return strlen($str) <= intval($map->getValue());
-  }
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MaxValueValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MaxValueValidator.php
deleted file mode 100644
index 4322652..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MaxValueValidator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- *  $Id: MaxValueValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for maximum values.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="articles" type="INTEGER" required="true" />
- *
- *   <validator column="articles">
- *     <rule name="minValue" value="1"  message="Minimum value for selected articles is ${value} !" />
- *     <rule name="maxValue" value="10"  message="Maximum value for selected articles is ${value} !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MaxValueValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $value)
-	{
-		if (is_null($value) == false && is_numeric($value) == true) {
-			return intval($value) <= intval($map->getValue());
-		}
-
-		return false;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MinLengthValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MinLengthValidator.php
deleted file mode 100644
index b6c3ebd..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MinLengthValidator.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- *  $Id: MinLengthValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for minimum string length.
- *
- * <code>
- *   <column name="password" type="VARCHAR" size="34" required="true" />
- *
- *   <validator column="password">
- *     <rule name="minLength" value="5" message="Passwort must be at least ${value} characters !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MinLengthValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return strlen($str) >= intval($map->getValue());
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MinValueValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MinValueValidator.php
deleted file mode 100644
index 5d1cfda..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/MinValueValidator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- *  $Id: MinValueValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for minimum values.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="articles" type="INTEGER" required="true" />
- *
- *   <validator column="articles">
- *     <rule name="minValue" value="1"  message="Minimum value for selected articles is ${value} !" />
- *     <rule name="maxValue" value="10"  message="Maximum value for selected articles is ${value} !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MinValueValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $value)
-	{
-	  if (is_null($value) == false && is_numeric($value)) {
-		  return intval($value) >= intval($map->getValue());
-	  }
-
-	  return false;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/NotMatchValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/NotMatchValidator.php
deleted file mode 100644
index a372615..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/NotMatchValidator.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/*
- *  $Id: NotMatchValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for regular expressions.
- *
- * This validator will return true, when the passed value does *not* match
- * the regular expression.
- *
- * If you do want to test if the value *matches* an expression, you can use
- * the MatchValidator class instead.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="ISBN" type="VARCHAR" size="20" required="true" />
- *   <validator column="username">
- *     <!-- disallow everything that's not a digit or minus -->
- *     <rule
- *       name="notMatch"
- *       value="/[^\d-]+/"
- *       message="Please enter a valid email adress." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class NotMatchValidator implements BasicValidator
-{
-	/**
-	 * Prepares the regular expression entered in the XML
-	 * for use with preg_match().
-	 * @param      string $exp
-	 * @return     string Prepared regular expession.
-	 */
-	private function prepareRegexp($exp)
-	{
-		// remove surrounding '/' marks so that they don't get escaped in next step
-		if ($exp{0} !== '/' || $exp{strlen($exp)-1} !== '/' ) {
-			$exp = '/' . $exp . '/';
-		}
-
-		// if they did not escape / chars; we do that for them
-		$exp = preg_replace('/([^\\\])\/([^$])/', '$1\/$2', $exp);
-
-		return $exp;
-	}
-
-	/**
-	 * Whether the passed string matches regular expression.
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return (preg_match($this->prepareRegexp($map->getValue()), $str) == 0);
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/RequiredValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/RequiredValidator.php
deleted file mode 100644
index 28daf41..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/RequiredValidator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/*
- *  $Id: RequiredValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for required fields.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="username" type="VARCHAR" size="25" required="true" />
- *
- *   <validator column="username">
- *     <rule name="required" message="Username is required." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class RequiredValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return ($str !== null && $str !== "");
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/TypeValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/TypeValidator.php
deleted file mode 100644
index 994d17c..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/TypeValidator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- *  $Id: TypeValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for validating the (PHP) type of the value submitted.
- *
- * <code>
- *   <column name="some_int" type="INTEGER" required="true"/>
- *
- *   <validator column="some_int">
- *     <rule name="type" value="integer" message="Please specify an integer value for some_int column." />
- *   </validator>
- * </code>
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class TypeValidator implements BasicValidator
-{
-
-	public function isValid(ValidatorMap $map, $value)
-	{
-		return (gettype($value) == $map->getValue());
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/UniqueValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/UniqueValidator.php
deleted file mode 100644
index 5bb10bf..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/UniqueValidator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- *  $Id: UniqueValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for unique column names.
- *
- * <code>
- *   <column name="username" type="VARCHAR" size="25" required="true" />
- *
- *   <validator column="username">
- *     <rule name="unique" message="Username already exists !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class UniqueValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		$column = $map->getColumn();
-
-		$c = new Criteria();
-		$c->add($column->getFullyQualifiedName(), $str, Criteria::EQUAL);
-
-		$table = $column->getTable()->getClassName();
-
-		$clazz = $table . 'Peer';
-		$count = call_user_func(array($clazz, 'doCount'), $c);
-
-		$isValid = ($count === 0);
-
-		return $isValid;
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/ValidValuesValidator.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/ValidValuesValidator.php
deleted file mode 100644
index f3b4885..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/ValidValuesValidator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- *  $Id: ValidValuesValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for valid values (e.g. for enum fields)
- *
- * <code>
- *   <column name="address_type" type="VARCHAR" required="true" default="delivery" />
- *
- *   <validator column="address_type">
- *     <rule name="validValues" value="account|delivery" message="Please select a valid address type." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler at mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class ValidValuesValidator implements BasicValidator
-{
-
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return in_array($str, preg_split("/[|,]/", $map->getValue()));
-	}
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/ValidationFailed.php b/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/ValidationFailed.php
deleted file mode 100644
index 47e759c..0000000
--- a/debian/propel/usr/share/php/propel/runtime/classes/propel/validator/ValidationFailed.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*
- *  $Id: ValidationFailed.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * Simple class that serves as a container for any information about a failed validation.
- *
- * Currently this class stores the qualified column name (e.g. tablename.COLUMN_NAME) and
- * the message that should be displayed to the user.
- *
- * An array of these objects will be returned by BasePeer::doValidate() if validation
- * failed.
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- * @see        BasePeer::doValidate()
- */
-class ValidationFailed {
-
-	/** Column name in tablename.COLUMN_NAME format */
-	private $colname;
-
-	/** Message to display to user. */
-	private $message;
-
-	/** Validator object that caused this to fail. */
-	private $validator;
-
-	/**
-	 * Construct a new ValidationFailed object.
-	 * @param      string $colname Column name.
-	 * @param      string $message Message to display to user.
-	 * @param      object $validator The Validator that caused this column to fail.
-	 */
-	public function __construct($colname, $message, $validator = null)
-	{
-		$this->colname = $colname;
-		$this->message = $message;
-		$this->validator = $validator;
-	}
-
-	/**
-	 * Set the column name.
-	 * @param      string $v
-	 */
-	public function setColumn($v)
-	{
-		$this->colname = $v;
-	}
-
-	/**
-	 * Gets the column name.
-	 * @return     string Qualified column name (tablename.COLUMN_NAME)
-	 */
-	public function getColumn()
-	{
-		return $this->colname;
-	}
-
-	/**
-	 * Set the message for the validation failure.
-	 * @param      string $v
-	 */
-	public function setMessage($v)
-	{
-		$this->message = $v;
-	}
-
-	/**
-	 * Gets the message for the validation failure.
-	 * @return     string
-	 */
-	public function getMessage()
-	{
-		return $this->message;
-	}
-
-	/**
-	 * Set the validator object that caused this to fail.
-	 * @param      object $v
-	 */
-	public function setValidator($v)
-	{
-		$this->validator = $v;
-	}
-
-	/**
-	 * Gets the validator object that caused this to fail.
-	 * @return     object
-	 */
-	public function getValidator()
-	{
-		return $this->validator;
-	}
-
-	/**
-	 * "magic" method to get string represenation of object.
-	 * Maybe someday PHP5 will support the invoking this method automatically
-	 * on (string) cast.  Until then it's pretty useless.
-	 * @return     string
-	 */
-	public function __toString()
-	{
-		return $this->getMessage();
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/pear/BuildPropelPEARPackageTask.php b/debian/propel/usr/share/php/propel/runtime/pear/BuildPropelPEARPackageTask.php
deleted file mode 100644
index f042af1..0000000
--- a/debian/propel/usr/share/php/propel/runtime/pear/BuildPropelPEARPackageTask.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/*
- *  $Id: BuildPropelPEARPackageTask.php 954 2008-02-05 23:08:18Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-include_once 'phing/types/FileSet.php';
-include_once 'phing/tasks/ext/pearpackage/Fileset.php';
-
-/**
- *
- * @author     Hans Lellelid <hans at xmpl.org>
- * @package    phing.tasks.ext
- * @version    $Revision: 954 $
- */
-class BuildPropelPEARPackageTask extends MatchingTask {
-
-	/** Base directory for reading files. */
-	private $dir;
-
-	private $version;
-	private $state = 'stable';
-	private $notes;
-
-	private $filesets = array();
-
-	/** Package file */
-	private $packageFile;
-
-	public function init() {
-		include_once 'PEAR/PackageFileManager2.php';
-		if (!class_exists('PEAR_PackageFileManager2')) {
-			throw new BuildException("You must have installed PEAR_PackageFileManager2 (PEAR_PackageFileManager >= 1.6.0) in order to create a PEAR package.xml file.");
-		}
-	}
-
-	private function setOptions($pkg){
-
-		$options['baseinstalldir'] = 'propel';
-		$options['packagedirectory'] = $this->dir->getAbsolutePath();
-
-		if (empty($this->filesets)) {
-			throw new BuildException("You must use a <fileset> tag to specify the files to include in the package.xml");
-		}
-
-		$options['filelistgenerator'] = 'Fileset';
-
-		// Some PHING-specific options needed by our Fileset reader
-		$options['phing_project'] = $this->getProject();
-		$options['phing_filesets'] = $this->filesets;
-
-		if ($this->packageFile !== null) {
-			// create one w/ full path
-			$f = new PhingFile($this->packageFile->getAbsolutePath());
-			$options['packagefile'] = $f->getName();
-			// must end in trailing slash
-			$options['outputdirectory'] = $f->getParent() . DIRECTORY_SEPARATOR;
-			$this->log("Creating package file: " . $f->getPath(), Project::MSG_INFO);
-		} else {
-			$this->log("Creating [default] package.xml file in base directory.", Project::MSG_INFO);
-		}
-
-		$pkg->setOptions($options);
-
-	}
-
-	/**
-	 * Main entry point.
-	 * @return     void
-	 */
-	public function main() {
-
-		if ($this->dir === null) {
-			throw new BuildException("You must specify the \"dir\" attribute for PEAR package task.");
-		}
-
-		if ($this->version === null) {
-			throw new BuildException("You must specify the \"version\" attribute for PEAR package task.");
-		}
-
-		$package = new PEAR_PackageFileManager2();
-
-		$this->setOptions($package);
-
-		// the hard-coded stuff
-		$package->setPackage('propel_runtime');
-		$package->setSummary('Runtime component of the Propel PHP object persistence layer');
-		$package->setDescription('Propel is an object persistence layer for PHP5 based on Apache Torque. This package provides the runtime engine that transparently handles object persistence and retrieval.');
-		$package->setChannel('pear.phpdb.org');
-		$package->setPackageType('php');
-
-		$package->setReleaseVersion($this->version);
-		$package->setAPIVersion($this->version);
-
-		$package->setReleaseStability($this->state);
-		$package->setAPIStability($this->state);
-
-		$package->setNotes($this->notes);
-
-		$package->setLicense('LGPL', 'http://www.gnu.org/licenses/lgpl.html');
-
-		// Add package maintainers
-		$package->addMaintainer('lead', 'hans', 'Hans Lellelid', 'hans at xmpl.org');
-		$package->addMaintainer('lead', 'david', 'David Zuelke', 'dz at bitxtender.com');
-
-		// "core" dependencies
-		$package->setPhpDep('5.2.0');
-		$package->setPearinstallerDep('1.4.0');
-
-		// "package" dependencies
-		$package->addExtensionDep('required', 'pdo');
-		$package->addExtensionDep('required', 'spl');
-
-		// now we run this weird generateContents() method that apparently
-		// is necessary before we can add replacements ... ?
-		$package->generateContents();
-
-		$e = $package->writePackageFile();
-
-		if (PEAR::isError($e)) {
-			throw new BuildException("Unable to write package file.", new Exception($e->getMessage()));
-		}
-
-	}
-
-	/**
-	 * Used by the PEAR_PackageFileManager_PhingFileSet lister.
-	 * @return     array FileSet[]
-	 */
-	public function getFileSets() {
-		return $this->filesets;
-	}
-
-	// -------------------------------
-	// Set properties from XML
-	// -------------------------------
-
-	/**
-	 * Nested creator, creates a FileSet for this task
-	 *
-	 * @return     FileSet The created fileset object
-	 */
-	function createFileSet() {
-		$num = array_push($this->filesets, new FileSet());
-		return $this->filesets[$num-1];
-	}
-
-	/**
-	 * Set the version we are building.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setVersion($v){
-		$this->version = $v;
-	}
-
-	/**
-	 * Set the state we are building.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setState($v) {
-		$this->state = $v;
-	}
-
-	/**
-	 * Sets release notes field.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setNotes($v) {
-		$this->notes = $v;
-	}
-	/**
-	 * Sets "dir" property from XML.
-	 * @param      PhingFile $f
-	 * @return     void
-	 */
-	public function setDir(PhingFile $f) {
-		$this->dir = $f;
-	}
-
-	/**
-	 * Sets the file to use for generated package.xml
-	 */
-	public function setDestFile(PhingFile $f) {
-		$this->packageFile = $f;
-	}
-
-}
diff --git a/debian/propel/usr/share/php/propel/runtime/pear/build-pear-package.xml b/debian/propel/usr/share/php/propel/runtime/pear/build-pear-package.xml
deleted file mode 100644
index b7a467b..0000000
--- a/debian/propel/usr/share/php/propel/runtime/pear/build-pear-package.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-	This build file creates a minimal package of propel-runtime files,
-	builds a package.xml for installation using PEAR and creates the necessary TGZ file.
-
--->
-
-<project name="propel_runtime" default="main">
-
-	<property name="propel.home" value=".."/>
-	<property name="build.base.dir" value="build"/>
-	<property name="pkgname" value="${phing.project.name}-${version}"/>
-	<property name="build.src.dir" value="${build.base.dir}/${pkgname}"/>
-
-	<!-- some default properties -->
-	<property name="notes"><![CDATA[This is a release of the 1.4 branch of the Propel Runtime.
-See: http://propel.phpdb.org/trac/query?status=closed&milestone=1.4&resolution=fixed&order=priority for CHANGELOG.
-	]]></property>
-	<property name="state" value="stable"/>
-
-	<taskdef
-    name="pear-package"
-    classname="BuildPropelPEARPackageTask" classpath="."/>
-
-	<fileset dir="${propel.home}/classes/propel" id="classes">
-		<include name="**"/>
-	</fileset>
-
-	<!--
-		==============================================
-		Main entry point
-		==============================================
-	-->
-	<target name="main" if="version" depends="versioncheck">
-		<phingcall target="build"/>
-		<phingcall target="pear-package"/>
-		<phingcall target="tar"/>
-	</target>
-
-	<!--
-	 ===================================================================
-	 Target: checks if language was given, otherwise fail
-	 ===================================================================
-	-->
-	<target name="versioncheck" unless="version">
-		<echo message="====================================================="/>
-		<echo message="Version not specified. You must enter a version. In"/>
-		<echo message="the future you can add this to build.properties or"/>
-		<echo message="enter it on the command line: "/>
-		<echo message=" "/>
-		<echo message="-Dversion=1.0.0"/>
-		<echo message="====================================================="/>
-		<input propertyname="version" promptChar=":">Propel version for package</input>
-
-		<property name="pkgname" value="${phing.project.name}-${version}" override="true"/>
-		<property name="build.src.dir" value="${build.base.dir}/${pkgname}" override="true"/>
-
-	</target>
-
-	<!--
-		==============================================
-		Copy the desired files into the build/ dir
-		making sure to put them in the directory
-		structure that will be needed for PEAR install
-		==============================================
-	-->
-	<target name="build">
-		<echo>-----------------------------</echo>
-		<echo>| Creating directory layout |</echo>
-		<echo>-----------------------------</echo>
-
-		<delete dir="${build.base.dir}"/>
-		<mkdir dir="${build.base.dir}"/>
-
-		<copy todir="${build.src.dir}">
-			<fileset refid="classes"/>
-		</copy>
-
-	</target>
-
-	<!--
-		==============================================
-		Create a PEAR package.xml which will guide the
-		installation.
-		==============================================
-	-->
-	<target name="pear-package">
-
-		<echo>-----------------------------</echo>
-		<echo>| Creating PEAR package.xml |</echo>
-		<echo>-----------------------------</echo>
-		<echo></echo>
-
-		<pear-package dir="${build.src.dir}" destFile="${build.base.dir}/package.xml" version="${version}" state="${state}" notes="${notes}">
-
-			<fileset dir="${build.src.dir}">
-				<include name="**"/>
-			</fileset>
-
-		</pear-package>
-
-	</target>
-
-	<!--
-		==============================================
-		Create a tar.gz of the files, which will be
-		installed by pear package manager.
-		==============================================
-	-->
-	<target name="tar">
-		<echo>-----------------------------</echo>
-		<echo>| Creating tar.gz package   |</echo>
-		<echo>-----------------------------</echo>
-		<property name="tarfile" value="${build.base.dir}/${pkgname}.tgz"/>
-		<delete	file="${tarfile}"/>
-		<tar destFile="${tarfile}" basedir="${build.base.dir}" />
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644
index 9a77fd4..0000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php propel-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/propel-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/propel-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/propel/propel-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html propel-(.*)\.tar\.gz

-- 
Propel repository to pkg-symfony project



More information about the Pkg-symfony-commits mailing list