diff --git a/ccm-core/build-hooks.xml b/ccm-core/build-hooks.xml
index 2d51f0f22..2d4f103b3 100755
--- a/ccm-core/build-hooks.xml
+++ b/ccm-core/build-hooks.xml
@@ -45,11 +45,19 @@
+
+
+
+
+
+
diff --git a/ccm-core/debian/ccm-build.sh b/ccm-core/debian/ccm-build.sh
deleted file mode 100755
index 6d0fad9cd..000000000
--- a/ccm-core/debian/ccm-build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-build.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
-
-. debian/ccm-settings.sh
-
-# for eg Oracle jar
-CLASSPATH=./lib/:$CLASSPATH
-$ANT build-${name}
diff --git a/ccm-core/debian/ccm-clean.sh b/ccm-core/debian/ccm-clean.sh
deleted file mode 100755
index 1c890a5e9..000000000
--- a/ccm-core/debian/ccm-clean.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-clean.sh,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-
-. debian/ccm-settings.sh
-
-[ -f build.xml ] && $ANT clean-${appname}
-
-rm -rf build build.xml ccm.classpath
-
-# ccm-disperse.sh creates the .install files automatically, so let's clean them too.
-
-rm -f ${appname}.install ${appname}-doc.install
diff --git a/ccm-core/debian/ccm-config.sh b/ccm-core/debian/ccm-config.sh
deleted file mode 100755
index 90094298f..000000000
--- a/ccm-core/debian/ccm-config.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-config.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
-
-. debian/ccm-settings.sh
-
-if [ ! -L $name ]; then
- ln -s . $name
-fi
-ccm-create-projectxml.pl > project.xml
-ccm-configure.sh
diff --git a/ccm-core/debian/ccm-core.dirs b/ccm-core/debian/ccm-core.dirs
deleted file mode 100755
index 05c696966..000000000
--- a/ccm-core/debian/ccm-core.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/ccm-core-6.3.2
diff --git a/ccm-core/debian/ccm-disperse.sh b/ccm-core/debian/ccm-disperse.sh
deleted file mode 100755
index ebef1978f..000000000
--- a/ccm-core/debian/ccm-disperse.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-disperse.sh,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-
-. debian/ccm-settings.sh
-
-SRCDIR="$1"
-[ "x$SRCDIR" != "x" ] || exit 1
-
-# automatically generate the .install file lists for dh_install:
-
-(cd $SRCDIR && find . -type f \
- | grep -v DEBIAN \
- | grep -v var/www/html \
- | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}.install
-
-(cd $SRCDIR && find . -type f -path './var/www/html/*' \
- | sed -e 's/^\.\/*\(.*\)/\1/' -e '/./,/^$/!d') > debian/${name}-doc.install
-
-# for some reason, dh_install doesn't work properly; let's disperse the files ourselves:
-
-for pkg in ${name} ${name}-doc; do
- # skip this package if mentioned in CCM_DEBIAN_NO_PACKAGES
- [ `echo $CCM_DEBIAN_NO_PACKAGES | tr ' ' '\n' | grep -c "^${pkg}$"` -eq 1 ] && continue || true
-
- # this should exist [due to dh_installdocs, dh_installchangelog], but just in case...
- mkdir -p debian/$pkg
-
- [ -e debian/${pkg}.install ] && \
- echo -n "Dispersing files to debian/$pkg/ ... " && \
- for file in `cat debian/${pkg}.install`; do
- dir=`dirname $file`
- mkdir -p debian/$pkg/$dir
- cp $SRCDIR/$file debian/$pkg/$dir/
- done
- echo "done."
-done
diff --git a/ccm-core/debian/ccm-install.sh b/ccm-core/debian/ccm-install.sh
deleted file mode 100755
index 39f3f2839..000000000
--- a/ccm-core/debian/ccm-install.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-install.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
-
-. debian/ccm-settings.sh
-
-DESTDIR="$1"
-[ "xDESTDIR" != "x" ] || exit 1
-
-rm -rf $DESTDIR
-mkdir -p $DESTDIR
-mkdir -p $DESTDIR${confdir}
-mkdir -p $DESTDIR/var/www/html/${name}-${version}
-
-ANT_OPTS="-Dapps.${name}.version=${version}"
-ANT_OPTS="$ANT_OPTS -Ddeploy.conf.dir=$DESTDIR${confdir}"
-ANT_OPTS="$ANT_OPTS -Ddeploy.shared.lib.dir=$DESTDIR${sharedjardir}"
-ANT_OPTS="$ANT_OPTS -Ddeploy.private.lib.dir=$DESTDIR${sharedjardir}/${name}-${version}"
-ANT_OPTS="$ANT_OPTS -Ddeploy.webapp.dir=$DESTDIR${webappdir}/${name}-${version}"
-ANT_OPTS="$ANT_OPTS -Ddeploy.system.jars.dir=$DESTDIR${sharedjardir}"
-ANT_OPTS="$ANT_OPTS -Ddeploy.api.dir.${appname}=$DESTDIR/var/www/html/${name}-${version}/api"
-ANT_OPTS="$ANT_OPTS -Ddeploy.shared.classes.dir=$DESTDIR/tmp/${name}-${version}"
-export ANT_OPTS
-
-$ANT deploy-jar-classes-${appname}
-$ANT deploy-${appname}
-
-rm -rf "$DESTDIR/tmp"
-
-
-# only generate and deploy javadocs if we didn't specify otherwise in CCM_DEBIAN_NO_JAVADOC
-
-GENERATE_JAVADOC=true
-if [ `echo $CCM_DEBIAN_NO_JAVADOC | tr ' ' '\n' | grep -c "^${name}-doc$"` -eq 1 ]; then
- GENERATE_JAVADOC=false
-fi
-
-if [ -d ${appname}/src ]; then
- $ANT deploy-jar-classes-${appname}
- [ "$GENERATE_JAVADOC" == "true" ] && $ANT deploy-javadoc-${appname} || true
-fi
diff --git a/ccm-core/debian/ccm-settings-run.sh b/ccm-core/debian/ccm-settings-run.sh
deleted file mode 100755
index 65ee0ba2c..000000000
--- a/ccm-core/debian/ccm-settings-run.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
-
-# say which app to compile, amongst those specified in the project.xml
-export CCM_APP=$name
-
-# do some checks
-
-check_JAVA_HOME
-
-if [ "$name" = "ccm-core" ]; then
- check_ORACLE_JDBC_LIB
-fi
-
-
-# set the environment
-
-for file in `echo /etc/profile.d/ccm-{tools,devel,scripts}.sh`; do
- . $file
-done
-
-cd ..
-. $CCM_SCRIPTS_HOME/bin/env-conf.sh ${appname} > /dev/null
-cd -
-export CCM_HOME=`pwd`
-
-if which classic-ant > /dev/null 2>&1; then
- ANT=classic-ant
-else
- ANT=ant
-fi
-
-
-# perhaps we don't like to build some packages -- get them from DH_OPTIONS
-
-export CCM_DEBIAN_NO_PACKAGES=`echo $DH_OPTIONS | tr -s ' ' '\n' | grep -E '(-N|--no-package=)' | xargs | sed -re 's/(-N|--no-package)//g'`
-
-# for now, assume that if we don't want to build some packages then we don't
-# want to generate javadocs for them either
-
-export CCM_DEBIAN_NO_JAVADOC="$CCM_DEBIAN_NO_JAVADOC $CCM_DEBIAN_NO_PACKAGES"
diff --git a/ccm-core/debian/ccm-settings.sh b/ccm-core/debian/ccm-settings.sh
deleted file mode 100755
index 0c9b68d3c..000000000
--- a/ccm-core/debian/ccm-settings.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: ccm-settings.sh,v 1.1.1.1 2004/11/12 09:29:59 fabrice Exp $
-
-# source the shell library [for the check_* functions]
-# FIXME: ugly-looking hack.
-orig_DEBIAN_HAS_FRONTEND=$DEBIAN_HAS_FRONTEND
-DEBIAN_HAS_FRONTEND=1
-. /usr/share/ccm-tools/lib/shellmodule
-DEBIAN_HAS_FRONTEND=$orig_DEBIAN_HAS_FRONTEND
-
-
-# variables we use [especially in ccm-install.sh]
-
-name=ccm-core
-version=6.3.2
-appname=ccm-core
-appversion=6.3.2
-confdir="/etc/ccm/conf"
-sharedjardir="/usr/share/java"
-webappdir="/usr/share/java/webapps"
-ccmclasspathfile="ccm/ccm.classpath"
-ccmwebappfile="ccm/ccm.webapps"
-
-. debian/ccm-settings-run.sh
diff --git a/ccm-core/debian/cctest b/ccm-core/debian/cctest
deleted file mode 100755
index 1dcc24a8a..000000000
--- a/ccm-core/debian/cctest
+++ /dev/null
@@ -1,39 +0,0 @@
-Test file to see if cruisecontrol will pick up the changes and build automatically.
-
-Testing
-
-Testing 2
-
-Testing 3
-
-Testing 4
-
-Testing 5
-
-Testing 6
-
-Testing 7
-
-Testing 8
-
-Testing 9
-
-Testing 11
-
-Testing 12
-
-Testing 13
-
-Testing 14
-
-Testing 15
-
-Testing 16
-
-Testing 17
-
-Testing 18
-
-Testing 19
-
-Testing 20
diff --git a/ccm-core/debian/changelog b/ccm-core/debian/changelog
deleted file mode 100755
index f9f83e9b0..000000000
--- a/ccm-core/debian/changelog
+++ /dev/null
@@ -1,287 +0,0 @@
-ccm-core (6.3.2-3) unstable; urgency=low
-
- * Added a new parameter: waf.xml.formatters.locale. If this is set then
- given locale will be used instead of getting the locale from the
- KernelContext. Currently this is only used by date formatters.
-
- -- Matt Roberts Tue, 18 Apr 2006 11:48:36 +0100
-
-ccm-core (6.3.2-2) unstable; urgency=low
-
- * Increment the version in debian/ccm-settings.sh. This should be done
- automatically.
-
- -- David Pashley Tue, 18 Apr 2006 11:09:57 +0100
-
-ccm-core (6.3.2-1) unstable; urgency=low
-
- * Added a default value (en) for cat_purposes.language
-
- -- Matt Roberts Wed, 5 Apr 2006 17:25:19 +0100
-
-ccm-core (6.3.1-6) unstable; urgency=low
-
- * Updating static table definition for cat_purposes. Made language not null
- and added a compound unique constraint on language and key
-
- -- Matt Roberts Thu, 30 Mar 2006 10:46:53 +0100
-
-ccm-core (6.3.1-5) unstable; urgency=low
-
- * Updating static table definition for cat_purposes. Added the language
- column.
-
- -- Matt Roberts Thu, 30 Mar 2006 10:35:05 +0100
-
-ccm-core (6.3.1-4) unstable; urgency=low
-
- * Added waf.dispatcher.default_page_class. By default it is set to
- com.arsdigita.bebop.Page but you can change that now.
-
- -- Matt Roberts Mon, 6 Mar 2006 15:58:26 +0000
-
-ccm-core (6.3.1-3) unstable; urgency=low
-
- * Adding language to category purpose, from UNDP
-
- -- My Fri, 3 Mar 2006 10:55:29 +0000
-
-ccm-core (6.3.1-2) unstable; urgency=low
-
- * Suggest rather than depend on postgresql
-
- -- David Pashley Fri, 10 Feb 2006 12:29:25 +0000
-
-ccm-core (6.3.1-1) unstable; urgency=low
-
- * Upgrade script for users.banned
-
- -- My Fri, 3 Feb 2006 11:22:09 +0000
-
-ccm-core (6.3.0-8) unstable; urgency=low
-
- * Removed hardcoded server names from file upload
-
- -- James Burt Tue, 24 Jan 2006 14:12:35 +0000
-
-ccm-core (6.3.0-7) unstable; urgency=low
-
- * Changes to complete HTMLArea change
-
- -- James Burt Tue, 24 Jan 2006 10:23:44 +0000
-
-ccm-core (6.3.0-6) unstable; urgency=low
-
- * Fixing RedHat breaking the build, it seems
-
- -- My Fri, 20 Jan 2006 08:41:59 +0000
-
-ccm-core (6.3.0-5) unstable; urgency=low
-
- * Tree enhancement (show isSelected)
-
- -- My Thu, 19 Jan 2006 15:30:28 +0000
-
-ccm-core (6.3.0-4) unstable; urgency=low
-
- * RedHat patches
-
- -- My Fri, 30 Dec 2005 08:52:59 +0000
-
-ccm-core (6.3.0-3) unstable; urgency=low
-
- * New changes to add banned status for users
-
- -- James Burt Mon, 7 Nov 2005 09:51:34 +0000
-
-ccm-core (6.3.0-2) unstable; urgency=low
-
- * Adding missing description of form config param
-
- -- My Wed, 19 Oct 2005 11:14:24 +0000
-
-ccm-core (6.3.0-1) unstable; urgency=low
-
- * Automatic update of version number from 6.2.0 to 6.3.0
-
- -- Runtime Collective Ltd. Mon, 10 Oct 2005 13:51:58 +0000
-
-ccm-core (6.2.0-1) unstable; urgency=low
-
- * Automatic update of version number from 6.1.2 to 6.2.0
-
- -- Runtime Collective Ltd. Mon, 10 Oct 2005 12:30:10 +0000
-
-ccm-core (6.1.2-17) unstable; urgency=low
-
- * fix encoding messup
-
- -- My Wed, 21 Sep 2005 08:26:13 +0000
-
-ccm-core (6.1.2-16) unstable; urgency=low
-
- * Catch more POI exceptions when indexing content
-
- -- My Thu, 1 Sep 2005 07:23:11 +0000
-
-ccm-core (6.1.2-15) unstable; urgency=low
-
- * replacing spaces with spaces in htmlarea.js, yeah. Ticket 19036
-
- -- My Thu, 4 Aug 2005 12:46:58 +0000
-
-ccm-core (6.1.2-14) unstable; urgency=low
-
- * 17170 - DefaultAncestorsFixer tools
-
- -- My Fri, 29 Jul 2005 13:34:15 +0000
-
-ccm-core (6.1.2-13) unstable; urgency=low
-
- * Patches from Phil Collins
-
- -- My Wed, 27 Jul 2005 08:14:21 +0000
-
-ccm-core (6.1.2-12) unstable; urgency=low
-
- * Upgrade patch from RedHat
-
- -- My Fri, 8 Jul 2005 08:53:05 +0000
-
-ccm-core (6.1.2-11) unstable; urgency=low
-
- * Attempt to fix permissions fix
-
- -- David Pashley Tue, 28 Jun 2005 14:46:04 +0100
-
-ccm-core (6.1.2-10) unstable; urgency=low
-
- * Permissions fix
-
- -- My Fri, 24 Jun 2005 12:39:40 +0000
-
-ccm-core (6.1.2-9) unstable; urgency=low
-
- * Log output for 17509
-
- -- My Tue, 17 May 2005 09:17:25 +0000
-
-ccm-core (6.1.2-8) unstable; urgency=low
-
- * Upgrading PDFBox version
-
- -- Fabrice Retkowsky Thu, 12 May 2005 12:34:36 +0000
-
-ccm-core (6.1.2-7) unstable; urgency=low
-
- * Let the build know where the oracle jar file is.
-
- -- David Pashley Thu, 12 May 2005 10:14:48 +0100
-
-ccm-core (6.1.2-6) unstable; urgency=low
-
- * Parameter to prevent notifications
-
- -- Fabrice Retkowsky Tue, 10 May 2005 13:53:04 +0000
-
-ccm-core (6.1.2-5) unstable; urgency=low
-
- * #17876 dynamichostprovider used to specify servername in email reminder
-
- -- Fabrice Retkowsky Fri, 29 Apr 2005 07:50:39 +0000
-
-ccm-core (6.1.2-4) unstable; urgency=low
-
- * Added new member to Category class to enable categories to ignore the
- default parent index item.
-
- -- Mon, 25 Apr 2005 12:17:27 +0000
-
-ccm-core (6.1.2-3) unstable; urgency=low
-
- * New parameter waf.formbuilder.interpolate_email_actions_to_address to send simple/xml/templated emails to an interpolated email address, ticket 17328
-
- -- Fabrice Retkowsky Fri, 22 Apr 2005 08:29:47 +0000
-
-ccm-core (6.1.2-2) unstable; urgency=low
-
- * parameter to de-activate fulldateformatter
-
- -- Fabrice Retkowsky Wed, 13 Apr 2005 15:43:30 +0000
-
-ccm-core (6.1.2-1) unstable; urgency=low
-
- * Automatic update of version number from 6.1.1 to 6.1.2
-
- -- Runtime Collective Ltd. Thu, 31 Mar 2005 11:59:54 +0000
-
-ccm-core (6.1.1-1) unstable; urgency=low
-
- * for qa
-
- -- Fabrice Retkowsky Mon, 28 Feb 2005 11:12:56 +0000
-
-ccm-core (6.1.0-8) unstable; urgency=low
-
- * fixed for null string for content-section
- * added build-all-rpms.sh
-
- -- Fabrice Retkowsky Mon, 28 Feb 2005 11:12:56 +0000
-
-ccm-core (6.1.0-7) unstable; urgency=low
-
- * modified DHTMLEditor.xsl to remove a hard-coded variable (config_text_entry), replacing with the dynamic version used elsewhere in the file.
-
- -- Steve Hunt Tue, 22 Feb 2005 17:27:56 +0000
-
-ccm-core (6.1.0-6) unstable; urgency=low
-
- * bebop.form.Submit has methods to set onclick attribute
-
- -- Fabrice Retkowsky Tue, 22 Feb 2005 09:36:31 +0000
-
-ccm-core (6.1.0-5) unstable; urgency=low
-
- * Depend on j2sdk1.4 | java2-compiler
- * Update to policy 3.6.1
- * Change maintainer to the mailing list and add uploaders
-
- -- David Pashley Mon, 31 Jan 2005 11:39:40 +0000
-
-ccm-core (6.1.0-4) unstable; urgency=low
-
- * debian/postrm: disabled the purge operations [had some weird problems].
- * updated the debian control scripts to get the package name and version from their invocation.
-
- -- Berkan Eskikaya Mon, 10 May 2004 12:33:33 +0100
-
-ccm-core (6.1.0-3) unstable; urgency=low
-
- * debian/templates: made load-at-install and setup-database-at-install the default behaviour.
- * debian/postinst: ccm_hostinit will try to use web.xml-aplaws from ccm-ldn-aplaws.
- * debian/ccm-settings.sh: correct checking/setting of ORACLE_JDBC_LIB [Chris].
- * debian/templates: changed the default postgresql database and user names to "ccm01.db" and "ccm".
- * debian/config: added detection of the hostname of the machine and possibly the user's email.
- * major restructuring of the debian scripts: moved all utility functions to ccm-tools and made postinst, postrm, prerm and ccm-settings.sh source and use that file.
-
- -- Berkan Eskikaya Fri, 7 May 2004 13:04:43 +0100
-
-ccm-core (6.1.0-2) unstable; urgency=low
-
- * The build process now tries to automatically detect JAVA_HOME and the location of Oracle's java library.
- * debian/ccm-clean.sh: only calls the ant process if build.xml exists.
- * debian/{postinst,prerm,config,templates}: added debconf support
- * debian/postinst: accepts 'reconfigure' and treats it as 'configure'.
- * debian/postinst: added postgresql.jar to CLASSPATH; added libpgjava to the dependencies.
- * debian/postinst: removed some bashisms upon recommendation from lintian.
- * debian/rules: enabled dh_installdebconf.
- * debian/control: made the package depend on debconf.
-
- -- Berkan Eskikaya Fri, 1 May 2004 15:41:43 +0100
-
-
-ccm-core (6.1.0-1) unstable; urgency=low
-
- * Initial release.
-
- -- Berkan Eskikaya Fri, 24 Apr 2004 12:27:56 +0100
diff --git a/ccm-core/debian/compat b/ccm-core/debian/compat
deleted file mode 100755
index b8626c4cf..000000000
--- a/ccm-core/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/ccm-core/debian/config b/ccm-core/debian/config
deleted file mode 100755
index 64c685c9b..000000000
--- a/ccm-core/debian/config
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: config,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_capb backup
-
-HOSTNAME=`hostname -f` 2>/dev/null || true
-
-if [ -n "$HOSTNAME" ]; then
- db_metaget ccm/shared/waf_web_server default || true
- PORTNUM=`echo $RET | cut -d: -f2`
- db_set ccm/shared/waf_web_server "$HOSTNAME:$PORTNUM" || true
-fi
-
-if [ -n "$EMAIL" ]; then
- db_set ccm/shared/waf_admin_email "$EMAIL" || true
-fi
-
-
-STATE=1
-LASTSTATE=5
-
-while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
- case "$STATE" in
- 1)
- # Database questions
- db_input high ccm/shared/dbase_type || true
- db_input high ccm/shared/dbase_host || true
- db_input high ccm/shared/dbase_name || true
- db_input high ccm/shared/dbase_user || true
- db_input high ccm/shared/dbase_password || true
-
- ;;
- 2)
- # Server address
- db_input high ccm/shared/waf_web_server || true
- ;;
- 3)
- # Admin questions
- db_input high ccm/shared/waf_admin_email || true
- db_input high ccm/shared/waf_admin_name_given || true
- db_input high ccm/shared/waf_admin_name_family || true
- db_input high ccm/shared/waf_admin_password || true
- db_input high ccm/shared/waf_admin_password_question || true
- db_input high ccm/shared/waf_admin_password_answer || true
- ;;
- 4)
- # When to load the applications
- db_input medium ccm/shared/ccm_load_apps_at_install_p || true
- ;;
- 5)
- # Whether to set up the [local] database
- db_get ccm/shared/dbase_host || true
- if [ "$RET" = "localhost" ]; then
- db_input medium ccm/shared/pg_set_up_database_p || true
- fi
- ;;
-
- # Add additional states here, making sure to
- # increment LASTSTATE.
- esac
-
- if db_go; then
- STATE=$(($STATE + 1))
- else
- STATE=$(($STATE - 1))
- fi
-done
-
-
-db_go || true
-
-db_stop
-
diff --git a/ccm-core/debian/control b/ccm-core/debian/control
deleted file mode 100755
index 558a6d25c..000000000
--- a/ccm-core/debian/control
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: ccm-core
-Section: contrib/web
-Priority: optional
-Maintainer: Runtime Packaging
-Uploaders: David Pashley
-Build-Depends-Indep: debhelper (>= 4.0.0), j2sdk1.4| java2-compiler, ant, libservlet2.3-java, libpgjava, debconf, po-debconf, ccm-tools, ccm-devel, ccm-scripts, libjdbc-oracle9i-java, ccm-runtime
-Standards-Version: 3.6.1
-
-Package: ccm-core
-Architecture: all
-Depends: java-virtual-machine-dummy | j2sdk1.4 | java-virtual-machine, ccm-tools, ccm-servlet-container, libservlet2.3-java, libpgjava, liblog4j1.2-java | debconf
-Suggests: postgresql
-Description: APLAWS: CCM Core
- This package contains the Core application for APLAWS.
- .
- FIXME: We need a longer and more meaningful description here.
-
-Package: ccm-core-doc
-Architecture: all
-Depends: ccm-tools
-Description: Documentation for ccm-core
- Documentation for ccm-core. Provides the JavaDoc API documentation.
diff --git a/ccm-core/debian/copyright b/ccm-core/debian/copyright
deleted file mode 100755
index 2f47e3b15..000000000
--- a/ccm-core/debian/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-This package was debianized by Berkan Eskikaya on
-Tue, 13 Apr 2004 19:03:14 +0100.
-
-It was downloaded from http://aplaws.sourceforge.net/
-
-Upstream Authors: Redhat UK.
-
-Copyright:
-
-You are free to distribute this software under the terms of
-the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
-
-
diff --git a/ccm-core/debian/postinst b/ccm-core/debian/postinst
deleted file mode 100755
index af1b0db42..000000000
--- a/ccm-core/debian/postinst
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /bin/sh
-# postinst script for ccm-core
-#
-# see: dh_installdeb(1)
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: postinst,v 1.1.1.1 2004/11/12 09:30:10 fabrice Exp $
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/ccm-tools/lib/shellmodule
-
-# summary of how this script can be called:
-# * `configure'
-# * `abort-upgrade'
-# * `abort-remove' `in-favour'
-#
-# * `abort-deconfigure' `in-favour'
-# `removing'
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
- configure|reconfigure)
- # FIXME: we need to be sensitive to upgrade operations here.
- # basically, if pkgversion = appversion, then the datamodel
- # hasn't changed -- we just configure the package and don't
- # touch the database; else, we need to also update the
- # datamodel in the database.
-
-
- ### get the settings for the operations below
-
- ccm_set_env
- db_get_ccm_settings ;# db_stop
-
- get_pkgname_from_arg "$0"
- ccm_package_name="$RET"
- get_pkgversion_from_dpkg "$ccm_package_name"
- ccm_package_version="$RET"
-
-
- ### do the usual post-installion configuration
-
- if [ ! -d "/etc/ccm" ]; then
- db_message "ccm/shared/error_etc_ccm_missing_dir"
- mkdir -p "/etc/ccm"
- fi
-
- ccm_update_ccm_classpath add $ccm_package_name $ccm_package_version
- ccm_update_ccm_webapps add $ccm_package_name $ccm_package_version
- ccm_update_file_attributes $ccm_package_name $ccm_package_version
-
-
- ### try to set up the database if asked to do so
-
- if [ "$pg_set_up_database_p" = "true" ]; then
- pg_set_up_database
- fi
-
- ### try to load the application if asked to do so
-
- if [ "$ccm_load_apps_at_install_p" = "true" -a -n "$JAVA_HOME" ]; then
- ccm_load
- fi
-
- ### run the hostinit step
-
- if [ -n "$JAVA_HOME" ]; then
- tomcat_http_port=`echo $waf_web_server | cut -d':' -f2` || true
- tomcat_shutdown_port=`expr $tomcat_http_port + 1` || true
- ccm_host_init tomcat $tomcat_http_port $tomcat_shutdown_port
- fi
-
-
- ### don't give others the registry details [eg the database password] on a golden plate
- # FIXME: this interferes with "ccm load" updating the registry. Need to find the right ownership.
- # chmod -R o-rwx /etc/ccm/conf/registry || true
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/ccm-core/debian/postrm b/ccm-core/debian/postrm
deleted file mode 100755
index b7a438b17..000000000
--- a/ccm-core/debian/postrm
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# postrm script for ccm-core
-#
-# see: dh_installdeb(1)
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: postrm,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/ccm-tools/lib/shellmodule
-
-db_get_ccm_settings
-
-get_pkgname_from_arg "$0"
-ccm_package_name="$RET"
-get_pkgversion_from_dpkg "$ccm_package_name"
-ccm_package_version="$RET"
-
-if [ "$ccm_package_name" != "ccm-core" ]; then
- exit 0 ;# nothing to do
-fi
-
-case "$1" in
- purge-FIXME)
- # FIXME: there are problems with this, so disabling for the moment.
-
- # maybe drop the database
- if [ "$dbase_host" = "localhost" ]; then
-
- db_input high ccm/shared/pg_drop_database_at_purge_p || true
- db_go
- db_stop
-
- if [ "$pg_drop_database_at_purge_p" = "true" ]; then
- su - postgres -c "dropdb $dbase_name" 1>&2 || true
- su - postgres -c "dropuser $dbase_user" 1>&2 || true
- fi
-
- fi
-
- # FIXME: should we still remove /etc/ccm/conf/registry/registry.properties,
- # even if we don't or fail to drop the database.
- rm -rf /etc/ccm/conf/registry/*
- ;;
-
- *)
- # Nothing to do here.
- ;;
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/ccm-core/debian/prerm b/ccm-core/debian/prerm
deleted file mode 100755
index 3f9c0bf9a..000000000
--- a/ccm-core/debian/prerm
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-# prerm script for ccm-core
-#
-# see: dh_installdeb(1)
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: prerm,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/ccm-tools/lib/shellmodule
-
-# summary of how this script can be called:
-# * `remove'
-# * `upgrade'
-# * `failed-upgrade'
-# * `remove' `in-favour'
-# * `deconfigure' `in-favour'
-# `removing'
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-db_get_ccm_settings ; db_stop
-
-get_pkgname_from_arg "$0"
-ccm_package_name="$RET"
-get_pkgversion_from_dpkg "$ccm_package_name"
-ccm_package_version="$RET"
-
-case "$1" in
- remove|purge|upgrade|deconfigure)
-
- ccm_update_ccm_classpath remove $ccm_package_name $ccm_package_version
- ccm_update_ccm_webapps remove $ccm_package_name $ccm_package_version
- ;;
-
- failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-if [ "$1" = "remove" -a "$ccm_package_name" = "ccm-core" -a -x "/etc/init.d/ccm" ]; then
- invoke-rc.d ccm stop || true
-fi
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/ccm-core/debian/rules b/ccm-core/debian/rules
deleted file mode 100755
index 264b5df3d..000000000
--- a/ccm-core/debian/rules
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess.
-#
-# This version is for packages that are architecture independent.
-#
-# Author: Berkan Eskikaya , 2004
-#
-# $Id: rules,v 1.1.1.1 2004/11/12 09:30:00 fabrice Exp $
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export ORACLE_JDBC_LIB=/usr/share/java/oracle/classes111.jar
-
-build.xml:
- dh_testdir
- # Add here commands to configure the package.
- @sh debian/ccm-config.sh
-
-build: build-stamp
-build-stamp: build.xml
- dh_testdir
-
- # Add here commands to compile the package.
- @sh debian/ccm-build.sh
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- @sh debian/ccm-clean.sh
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/.
- @sh debian/ccm-install.sh $(CURDIR)/debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdirs
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- @sh debian/ccm-disperse.sh debian/tmp
-# dh_install --sourcedir=debian/tmp
-# dh_installmenu
- dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installcatalogs
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_undocumented
- dh_installman
- dh_link
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/ccm-core/debian/templates b/ccm-core/debian/templates
deleted file mode 100755
index 0ecdcd689..000000000
--- a/ccm-core/debian/templates
+++ /dev/null
@@ -1,207 +0,0 @@
-Template: ccm/debconf/version
-Type: string
-Default: $Id: templates,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-Description: The version of the debconf template
- Author: Berkan Eskikaya , 2004
- .
- $Id: templates,v 1.1.1.1 2004/11/12 09:30:11 fabrice Exp $
-
-Template: ccm/package_name
-Type: string
-Default: ccm-core
-Description: The name of the package
- This is syntetic sugar.
-
-Template: ccm/package_version
-Type: string
-Default: 6.3.2
-Description: The version of the package
- This is synthetic sugar.
-
-Template: ccm/shared/dbase_type
-Type: select
-Choices: postgresql
-Default: postgresql
-Description: Database backend:
- Please choose a database backend. At the moment, you could only select PostgreSQL.
-
-Template: ccm/shared/dbase_host
-Type: string
-Default: localhost
-Description: Database host:
- Please specify the host that the database runs on.
-
-Template: ccm/shared/dbase_name
-Type: string
-Default: ccm01.db
-Description: Database name:
- Please specify the name of the APLAWS database.
-
-Template: ccm/shared/dbase_user
-Type: string
-Default: ccm
-Description: Database user name:
- Please specify the database account for the APLAWS database.
-
-Template: ccm/shared/dbase_password
-Type: password
-Default: ccmpwd
-Description: Database password:
- Please choose a password for the APLAWS database account.
-
-Template: ccm/shared/waf_runtime_jdbc_url
-Type: string
-Default: jdbc:postgresql://localhost/ccm01.db?user=ccm&password=ccmpwd
-Description: JDBC connection URL:
- The WAF runtime uses this value to connect to a database.
- .
- Format: jdbc:[subprotocol]:[subname]
- .
- Example: jdbc:postgresql://localhost/ccm01.db?user=ccm&password=ccmpwd
-
-Template: ccm/shared/waf_web_server
-Type: string
-Default: localhost:9090
-Description: Server virtual host:
- Please specify the hostname and port that users of a site will
- see in URLs generated by WAF.
- .
- Format: [server hostname]:[port number]
- .
- Example: example.com:80
-
-Template: ccm/shared/waf_admin_email
-Type: string
-Default:
-Description: Administrator Email Address:
- Please specify the system administrator account.
- .
- Format: @
- .
- Example: joe@example.com
-
-Template: ccm/shared/waf_admin_name_given
-Type: string
-Default:
-Description: Administrator First Name:
- Please specify the name of the system administrator.
-
-Template: ccm/shared/waf_admin_name_family
-Type: string
-Default:
-Description: Administrator Last Name:
- Please specify the surname of the system administrator.
-
-Template: ccm/shared/waf_admin_password
-Type: password
-Default:
-Description: Administrator Password
- Please choose a password for the system administrator account.
-
-Template: ccm/shared/waf_admin_password_question
-Type: string
-Default: The name of your primary school
-Description: Administrator Password Question:
- This question will be asked when the password to the system administrator
- account is lost and access must be recovered.
- .
- Please only use letters and numbers.
-
-Template: ccm/shared/waf_admin_password_answer
-Type: string
-Default:
-Description: Administrator Password Answer:
- Now specify the correct answer to the Administrator Password Question.
- .
- Please only use letters and numbers.
-
-Template: ccm/shared/ccm_load_apps_at_install_p
-Type: boolean
-Default: true
-Description: Load CCM applications as they install?
- You could choose to load CCM applications into the database
- automatically after they are installed, or you could load them
- manually [with 'ccm load'] yourself.
- .
- The former will save you some manual work, while the latter is probably
- most suited if you are trying to build the applications from the
- sources and prefer to load them once all are built and installed.
-
-Template: ccm/shared/pg_set_up_database_p
-Type: boolean
-Default: true
-Description: Do you want me to set up the CCM database and adjust the access permissions?
- You have specified a database on your localhost. I could set it up
- for you and automatically adjust the access permissions. I could do
- this independently of whether or not you have choosen to load the
- applications at install time.
- .
- Say no here if you have already prepared the CCM database yourself
- or if you would like to do it later. Saying yes will save you some
- manual work.
-
-Template: ccm/shared/pg_drop_database_at_purge_p
-Type: boolean
-Default: true
-Description: Do you want me to drop the CCM database?
-
-
-Template: ccm/shared/error_etc_ccm_missing_dir
-Type: note
-Description: CCM configuration directory does not exist.
- I couldn't find the CCM configuration directory: /etc/ccm.
- .
- This probably points at a corrupt or unusual CCM installation. The ccm-tools
- package creates this directory --- please verify that it is installed and
- intact.
- .
- I will continue with the configuration by re-creating the directory,
- but we may experience problems later.
-
-Template: ccm/shared/ccm_aux_setupdb_failed
-Type: note
-Description: ccm-aux-setupdb couldn't complete.
- The helper script ccm-aux-setupdb didn't succeed.
- This means that the CCM database couldn't be set up.
- .
- If you have answered yes to the automatic loading of
- applications at install time, I will still try to honour
- that.
- .
- In case that doesn't succeed [likely now], please manually
- prepare the database and load the application(s) after the
- installation.
-
-Template: ccm/shared/ccm_aux_update_hba_conf_failed
-Type: note
-Description: ccm-aux-update-hba-conf couldn't complete.
- The helper script ccm-aux-update-hba-conf didn't succeed.
- This means that the access permissions for the ccm database
- couldn't be set up.
- .
- If you have answered yes to the automatic loading of
- applications at install time, I will still try to honour
- that.
- .
- In case that doesn't succeed [likely now], please manually
- check/edit the pg_hba.conf file of your PostgreSQL instance
- and load the application(s) after the installation.
-
-Template: ccm/shared/error_ccm_tool_not_found
-Type: note
-Description: The 'ccm' tool not found.
- I need the 'ccm' tool [/usr/bin/ccm] to continue but I cannot find it.
- .
- This probably points at a corrupt or unusual CCM installation. The ccm-tools
- package contains this file --- please check your setup after the installation,
- and then run "dpkg-reconfigure ccm-core".
-
-Template: ccm/shared/error_java_home_not_found
-Type: note
-Description: JAVA_HOME not found.
- JAVA_HOME isn't set --- I have even tried to guess it but failed.
- .
- This will cancel any 'ccm load' and 'ccm hostinit' operations.
- .
- Please check your java setup after the installation, and then run
- "dpkg-reconfigure ccm-core".
diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java
index 6c974126e..833c82ce4 100755
--- a/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java
+++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java
@@ -27,6 +27,8 @@ package com.redhat.persistence.engine.rdbms;
public class PostgresWriter extends ANSIWriter {
- public final static String versionId = "$Id: PostgresWriter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: PostgresWriter.java 287 2005-02-22 00:29:02Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
}
diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java
index e6c4004fb..c4e01be84 100755
--- a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java
+++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java
@@ -68,7 +68,9 @@ import org.apache.log4j.Priority;
public class RDBMSEngine extends Engine {
- public final static String versionId = "$Id: RDBMSEngine.java 1327 2006-09-25 08:10:48Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: RDBMSEngine.java 1327 2006-09-25 08:10:48Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
private static final Logger LOG = Logger.getLogger(RDBMSEngine.class);
diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java
index 4b9a51f49..b868fdd28 100755
--- a/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java
+++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java
@@ -53,7 +53,9 @@ import java.util.List;
public abstract class SQLWriter {
- public final static String versionId = "$Id: SQLWriter.java 735 2005-09-01 06:42:59Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: SQLWriter.java 735 2005-09-01 06:42:59Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
private RDBMSEngine m_engine;
private Operation m_op = null;
@@ -120,7 +122,8 @@ public abstract class SQLWriter {
} catch (SQLException e) {
if (cycle != null) { cycle.endSet(e); }
throw new WrappedError
- ("SQL error binding [" + (index) + "] to " + obj + " in " + m_sql.toString(), e);
+ ("SQL error binding [" + (index) + "] to " + obj +
+ " in " + m_sql.toString(), e);
}
}
}
diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java
index e650c1374..453a78363 100755
--- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java
+++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java
@@ -31,7 +31,9 @@ import com.redhat.persistence.oql.Query;
class Select extends Operation {
- public final static String versionId = "$Id: Select.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: Select.java 738 2005-09-01 12:36:52Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
private Query m_query;
private Signature m_sig ;
diff --git a/ccm-core/src/com/redhat/persistence/metadata/Model.java b/ccm-core/src/com/redhat/persistence/metadata/Model.java
index 572aa1cb7..fc5f814d4 100755
--- a/ccm-core/src/com/redhat/persistence/metadata/Model.java
+++ b/ccm-core/src/com/redhat/persistence/metadata/Model.java
@@ -29,7 +29,9 @@ import java.util.HashMap;
public class Model {
- public final static String versionId = "$Id: Model.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: Model.java 287 2005-02-22 00:29:02Z sskracic $" +
+ "by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
private static final HashMap MODELS = new HashMap();
diff --git a/ccm-core/src/com/redhat/persistence/metadata/ObjectMap.java b/ccm-core/src/com/redhat/persistence/metadata/ObjectMap.java
index eec560ec8..8399c607f 100755
--- a/ccm-core/src/com/redhat/persistence/metadata/ObjectMap.java
+++ b/ccm-core/src/com/redhat/persistence/metadata/ObjectMap.java
@@ -34,7 +34,9 @@ import java.util.List;
public class ObjectMap extends Element {
- public final static String versionId = "$Id: ObjectMap.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: ObjectMap.java 287 2005-02-22 00:29:02Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
private ObjectType m_type;
private Mist m_mappings = new Mist(this);
diff --git a/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java b/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java
index 83ade18a9..22813c160 100755
--- a/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java
+++ b/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java
@@ -33,7 +33,9 @@ import java.util.List;
public class ObjectType extends Element {
- public final static String versionId = "$Id: ObjectType.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: ObjectType.java 738 2005-09-01 12:36:52Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
private final Model m_model;
private final String m_name;
diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java
index dc5651f99..daa5db39a 100755
--- a/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java
+++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java
@@ -33,10 +33,12 @@ import java.sql.Types;
public class BigDecimalAd extends SimpleAdapter {
- public final static String versionId = "$Id: BigDecimalAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: BigDecimalAd.java 287 2005-02-22 00:29:02Z sskracic $" +
+ "$DateTime: 2004/08/16 18:10:38 $";
public BigDecimalAd() {
- super("global.BigDecimal", Types.NUMERIC);
+ super("global.BigDecimal", Types.NUMERIC);
}
public void bind(PreparedStatement ps, int index, Object obj, int type)
diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java
index 014d750d3..d0e831862 100755
--- a/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java
+++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java
@@ -33,24 +33,26 @@ import java.sql.Types;
public class DoubleAd extends SimpleAdapter {
- public final static String versionId = "$Id: DoubleAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: DoubleAd.java 287 2005-02-22 00:29:02Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
public DoubleAd() {
- super("global.Double", Types.DOUBLE);
+ super("global.Double", Types.DOUBLE);
}
public void bind(PreparedStatement ps, int index, Object obj, int type)
- throws SQLException {
- ps.setDouble(index, ((Double) obj).doubleValue());
+ throws SQLException {
+ ps.setDouble(index, ((Double) obj).doubleValue());
}
public Object fetch(ResultSet rs, String column) throws SQLException {
- double d = rs.getDouble(column);
- if (rs.wasNull()) {
- return null;
- } else {
- return new Double(d);
- }
+ double d = rs.getDouble(column);
+ if (rs.wasNull()) {
+ return null;
+ } else {
+ return new Double(d);
+ }
}
}
diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java
index ba71501b7..c01956b6b 100755
--- a/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java
+++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java
@@ -24,7 +24,11 @@ import com.redhat.persistence.metadata.ObjectType;
/**
- * SimpleAdapter
+ * SimpleAd (SimpleAdapter) is the base clase for the various type specific
+ * classes.
+ *
+ * It implements general management methods (get/set the data type etc). Is is
+ * only used by the type specific classes of its package.
*
* @author Rafael H. Schloming <rhs@mit.edu>
* @version $Revision: #7 $ $Date: 2004/08/16 $
@@ -32,19 +36,21 @@ import com.redhat.persistence.metadata.ObjectType;
abstract class SimpleAdapter extends Adapter {
- public final static String versionId = "$Id: SimpleAdapter.java 735 2005-09-01 06:42:59Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: SimpleAdapter.java 735 2005-09-01 06:42:59Z sskracic $" +
+ "$DateTime: 2004/08/16 18:10:38 $";
private String m_type;
private int m_defaultJDBCType;
protected SimpleAdapter(String type, int defaultJDBCType) {
- if (type == null) { throw new IllegalArgumentException(); }
- m_type = type;
+ if (type == null) { throw new IllegalArgumentException(); }
+ m_type = type;
m_defaultJDBCType = defaultJDBCType;
}
public PropertyMap getProperties(Object obj) {
- return new PropertyMap(getObjectType(obj));
+ return new PropertyMap(getObjectType(obj));
}
public ObjectType getObjectType(Object obj) {
diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java
index 90b74f29e..3d2d947eb 100755
--- a/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java
+++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java
@@ -30,7 +30,8 @@ import java.sql.Types;
/**
- * StringAd
+ * StringAd: StringAdapter class
+ *
*
* @author Rafael H. Schloming <rhs@mit.edu>
* @version $Revision: #7 $ $Date: 2004/08/16 $
@@ -38,15 +39,17 @@ import java.sql.Types;
public class StringAd extends SimpleAdapter {
- public final static String versionId = "$Id: StringAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+ public final static String versionId =
+ "$Id: StringAd.java 287 2005-02-22 00:29:02Z sskracic $" +
+ " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
public StringAd() {
- super("global.String", Types.VARCHAR);
+ super("global.String", Types.VARCHAR);
}
public void bind(PreparedStatement ps, int index, Object obj, int type)
- throws SQLException {
- ps.setString(index, (String) obj);
+ throws SQLException {
+ ps.setString(index, (String) obj);
}
public Object fetch(ResultSet rs, String column) throws SQLException {