[apache-directory-server] 01/02: Initial packaging

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 1 20:26:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-directory-server.

commit 8abaacb73664b0bed3cd577548d0fdfb68d28c19
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 1 22:22:10 2015 +0200

    Initial packaging
---
 debian/README.source                  |   9 +
 debian/apacheds.default               |  40 +++
 debian/apacheds.dirs                  |   5 +
 debian/apacheds.init                  | 225 ++++++++++++
 debian/apacheds.install               |   2 +
 debian/apacheds.links                 |  65 ++++
 debian/apacheds.postinst              |  54 +++
 debian/apacheds.postrm                |  43 +++
 debian/apacheds.service               |  22 ++
 debian/changelog                      |   5 +
 debian/compat                         |   1 +
 debian/control                        |  77 +++++
 debian/copyright                      |  19 +
 debian/libapacheds-java.poms          |  82 +++++
 debian/maven.ignoreRules              |  24 ++
 debian/maven.properties               |   5 +
 debian/maven.rules                    |  12 +
 debian/orig-tar.sh                    |  19 +
 debian/patches/01-jar-packaging.patch | 628 ++++++++++++++++++++++++++++++++++
 debian/patches/series                 |   1 +
 debian/rules                          |   9 +
 debian/source/format                  |   1 +
 debian/watch                          |   4 +
 23 files changed, 1352 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..ece4a9c
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about apache-directory-server
+-----------------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
diff --git a/debian/apacheds.default b/debian/apacheds.default
new file mode 100644
index 0000000..eb97528
--- /dev/null
+++ b/debian/apacheds.default
@@ -0,0 +1,40 @@
+# Home directory of the Java runtime (JRE/JDK). You need at least Java 7.
+JAVA_HOME=/usr/lib/jvm/default-java
+
+# Any additional java options (ex: -Xms:256m)
+JAVA_OPTS="-Djava.awt.headless=true -Xmx256m"
+
+# To enable remote debugging uncomment the following line.
+# You will then be able to use a java debugger on port 8000.
+#JAVA_OPTS="${JAVA_OPTS} -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+
+# Directory that contains your apacheds install
+ADS_HOME=/usr/share/apacheds
+
+# Parent directory for the instances.
+ADS_INSTANCES="$ADS_HOME/instances"
+
+# Name of the instance.
+ADS_INSTANCE=default
+
+# Controls to register.
+ADS_CONTROLS="\
+org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,\
+org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,\
+org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,\
+org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,\
+org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,\
+org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,\
+org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,\
+org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,\
+org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,\
+org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,\
+org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
+
+# Extended operations to register.
+ADS_EXTENDED_OPERATIONS="\
+org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory,\
+org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,\
+org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,\
+org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,\
+org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
diff --git a/debian/apacheds.dirs b/debian/apacheds.dirs
new file mode 100644
index 0000000..e452d17
--- /dev/null
+++ b/debian/apacheds.dirs
@@ -0,0 +1,5 @@
+var/lib/apacheds/instances/default
+var/lib/apacheds/instances/default/cache
+var/lib/apacheds/instances/default/partitions
+var/lib/apacheds/instances/default/run
+var/log/apacheds
diff --git a/debian/apacheds.init b/debian/apacheds.init
new file mode 100644
index 0000000..4dd026c
--- /dev/null
+++ b/debian/apacheds.init
@@ -0,0 +1,225 @@
+#!/bin/sh -e
+#
+# /etc/init.d/apacheds -- startup script for Apache Directory Server
+#
+### BEGIN INIT INFO
+# Provides:          apacheds
+# Required-Start:    $local_fs $remote_fs $network
+# Required-Stop:     $local_fs $remote_fs $network
+# Should-Start:      $named
+# Should-Stop:       $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start ApacheDS
+# Description:       Start Apache Directory Server
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=apacheds
+DESC="Apache Directory Server"
+ADS_HOME=/usr/share/$NAME
+LOGDIR="/var/log/$NAME"
+START_JAR="$ADS_HOME/lib/apacheds-service.jar"
+DEFAULT=/etc/default/$NAME
+PIDFILE="/var/run/$NAME.pid"
+
+ADS_USER=apacheds
+
+if [ `id -u` -ne 0 ]; then
+	echo "You need root privileges to run this script"
+	exit 1
+fi
+
+# Make sure apacheds is started with system locale
+if [ -r /etc/default/locale ]; then
+	. /etc/default/locale
+	export LANG
+fi
+
+. /lib/lsb/init-functions
+
+if [ -r /etc/default/rcS ]; then
+	. /etc/default/rcS
+fi
+
+
+# This function sets the variable JDK_DIRS
+find_jdks()
+{
+    for java_version in 9 8 7
+    do
+        for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
+                      /usr/lib/jvm/jdk-${java_version}-oracle-* \
+                      /usr/lib/jvm/jre-${java_version}-oracle-*
+        do
+            if [ -d "${jvmdir}" -a "${jvmdir}" != "/usr/lib/jvm/java-${java_version}-openjdk-common" ]
+            then
+                JDK_DIRS="${JDK_DIRS} ${jvmdir}"
+            fi
+        done
+    done
+
+    # Add older non multi arch installations
+    JDK_DIRS="${JDK_DIRS} /usr/lib/jvm/java-7-oracle"
+}
+
+# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
+# defined in $DEFAULT)
+JDK_DIRS="/usr/lib/jvm/default-java"
+find_jdks
+
+# Look for the right JVM to use
+for jdir in $JDK_DIRS; do
+	if [ -d "$jdir" -a -z "${JAVA_HOME}" ]; then
+		JAVA_HOME="$jdir"
+	fi
+done
+export JAVA_HOME
+
+export JAVA="$JAVA_HOME/bin/java"
+
+# Check for JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+	log_failure_msg "Could not start $DESC because no Java runtime was found."
+	exit 0
+fi
+
+
+# overwrite settings from default file
+if [ -f "$DEFAULT" ]; then
+	. "$DEFAULT"
+fi
+
+# Timeout in seconds for the shutdown of ApacheDS
+ADS_SHUTDOWN=30
+
+
+# Check whether apacheds is still installed (it might not be if this package was
+# removed and not purged)
+if [ ! -r "$START_JAR" ]; then
+	log_failure_msg "$NAME is not installed"
+	exit 1
+fi
+
+JAVA_OPTIONS="${JAVA_OPTS} \
+            -Dapacheds.controls=${ADS_CONTROLS} \
+            -Dapacheds.extendedOperations=${ADS_EXTENDED_OPERATIONS} \
+            -Dlog4j.configuration=file:${ADS_INSTANCES}/${ADS_INSTANCE}/conf/log4j.properties \
+            -Dapacheds.log.dir=${ADS_INSTANCES}/${ADS_INSTANCE}/log \
+            -cp '${ADS_HOME}/lib/*' \
+            org.apache.directory.server.UberjarMain \
+            ${ADS_INSTANCES}/${ADS_INSTANCE}/"
+
+export JAVA_OPTIONS
+
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC instance '$ADS_INSTANCE'" "$NAME"
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+	                --user "$ADS_USER" --startas "$JAVA" > /dev/null; then
+
+		if [ -f $PIDFILE ] ; then
+			log_warning_msg "$PIDFILE exists, but apacheds was not running. Ignoring $PIDFILE"
+		fi
+
+		ADS_CMD="$JAVA $JAVA_OPTIONS"
+
+		start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$ADS_USER" --verbose \
+		    --chdir "$ADS_HOME" --background --make-pidfile -x /bin/bash -- -c \
+		    "$ADS_CMD"
+
+		log_daemon_msg "$DESC started" "$NAME"
+
+		sleep 5
+		if start-stop-daemon --test --start --pidfile "$PIDFILE" \
+			--user $ADS_USER --exec "$JAVA" >/dev/null; then
+			log_end_msg 1
+		else
+			log_end_msg 0
+		fi
+
+	else
+		log_warning_msg "(already running)."
+		log_end_msg 0
+		exit 1
+	fi
+	;;
+
+  stop)
+	log_daemon_msg "Stopping $DESC instance '$ADS_INSTANCE'" "$NAME"
+
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$ADS_USER" --startas "$JAVA" > /dev/null; then
+		if [ -x "$PIDFILE" ]; then
+			log_warning_msg "(not running but $PIDFILE exists)."
+		else
+			log_warning_msg "(not running)."
+		fi
+	else
+		start-stop-daemon --quiet --stop \
+			--pidfile "$PIDFILE" --user "$ADS_USER" \
+			--startas "$JAVA" > /dev/null
+		while ! start-stop-daemon --quiet --test --start \
+			  --pidfile "$PIDFILE" --user "$ADS_USER" \
+			  --startas "$JAVA" > /dev/null; do
+			sleep 1
+			log_progress_msg "."
+			ADS_SHUTDOWN=`expr $ADS_SHUTDOWN - 1` || true
+			if [ $ADS_SHUTDOWN -ge 0 ]; then
+				start-stop-daemon --oknodo --quiet --stop \
+					--pidfile "$PIDFILE" --user "$ADS_USER" \
+					--startas "$JAVA"
+			else
+				log_progress_msg " (killing) "
+				start-stop-daemon --stop --signal 9 --oknodo \
+					--quiet --pidfile "$PIDFILE" \
+					--user "$ADS_USER"
+			fi
+		done
+		rm -f "$PIDFILE"
+		log_daemon_msg "$DESC stopped." "$NAME"
+		log_end_msg 0
+	fi
+	;;
+
+  status)
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$ADS_USER" --startas "$JAVA" > /dev/null; then
+
+		if [ -f "$PIDFILE" ]; then
+		    log_success_msg "$DESC is not running, but pid file exists."
+			exit 1
+		else
+		    log_success_msg "$DESC is not running."
+			exit 3
+		fi
+	else
+		log_success_msg "$DESC is running with pid `cat $PIDFILE`"
+	fi
+	;;
+
+  restart|force-reload)
+	if ! start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$ADS_USER" --startas "$JAVA" > /dev/null; then
+		$0 stop $*
+		sleep 1
+	fi
+	$0 start $*
+	;;
+
+  try-restart)
+	if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
+		--user "$ADS_USER" --startas "$JAVA" > /dev/null; then
+		$0 start $*
+	fi
+	;;
+
+  *)
+	log_success_msg "Usage: $0 {start|stop|restart|force-reload|try-restart|status}"
+	exit 1
+	;;
+esac
+
+exit 0
+
diff --git a/debian/apacheds.install b/debian/apacheds.install
new file mode 100644
index 0000000..baa97b1
--- /dev/null
+++ b/debian/apacheds.install
@@ -0,0 +1,2 @@
+server-config/src/main/resources/config.ldif /etc/apacheds
+service/log4j.properties                     /etc/apacheds
diff --git a/debian/apacheds.links b/debian/apacheds.links
new file mode 100644
index 0000000..87e48f8
--- /dev/null
+++ b/debian/apacheds.links
@@ -0,0 +1,65 @@
+usr/share/java/apacheds-core-annotations.jar            usr/share/apacheds/lib/apacheds-core-annotations.jar
+usr/share/java/apacheds-core-api.jar                    usr/share/apacheds/lib/apacheds-core-api.jar
+usr/share/java/apacheds-core-avl.jar                    usr/share/apacheds/lib/apacheds-core-avl.jar
+usr/share/java/apacheds-core-constants.jar              usr/share/apacheds/lib/apacheds-core-constants.jar
+usr/share/java/apacheds-core-jndi.jar                   usr/share/apacheds/lib/apacheds-core-jndi.jar
+usr/share/java/apacheds-core-shared.jar                 usr/share/apacheds/lib/apacheds-core-shared.jar
+usr/share/java/apacheds-core.jar                        usr/share/apacheds/lib/apacheds-core.jar
+usr/share/java/apacheds-http-directory-bridge.jar       usr/share/apacheds/lib/apacheds-http-directory-bridge.jar
+usr/share/java/apacheds-http-integration.jar            usr/share/apacheds/lib/apacheds-http-integration.jar
+usr/share/java/apacheds-i18n.jar                        usr/share/apacheds/lib/apacheds-i18n.jar
+usr/share/java/apacheds-interceptor-kerberos.jar        usr/share/apacheds/lib/apacheds-interceptor-kerberos.jar
+usr/share/java/apacheds-interceptors-admin.jar          usr/share/apacheds/lib/apacheds-interceptors-admin.jar
+usr/share/java/apacheds-interceptors-authn.jar          usr/share/apacheds/lib/apacheds-interceptors-authn.jar
+usr/share/java/apacheds-interceptors-authz.jar          usr/share/apacheds/lib/apacheds-interceptors-authz.jar
+usr/share/java/apacheds-interceptors-changelog.jar      usr/share/apacheds/lib/apacheds-interceptors-changelog.jar
+usr/share/java/apacheds-interceptors-collective.jar     usr/share/apacheds/lib/apacheds-interceptors-collective.jar
+usr/share/java/apacheds-interceptors-event.jar          usr/share/apacheds/lib/apacheds-interceptors-event.jar
+usr/share/java/apacheds-interceptors-exception.jar      usr/share/apacheds/lib/apacheds-interceptors-exception.jar
+usr/share/java/apacheds-interceptors-hash.jar           usr/share/apacheds/lib/apacheds-interceptors-hash.jar
+usr/share/java/apacheds-interceptors-journal.jar        usr/share/apacheds/lib/apacheds-interceptors-journal.jar
+usr/share/java/apacheds-interceptors-logger.jar         usr/share/apacheds/lib/apacheds-interceptors-logger.jar
+usr/share/java/apacheds-interceptors-normalization.jar  usr/share/apacheds/lib/apacheds-interceptors-normalization.jar
+usr/share/java/apacheds-interceptors-operational.jar    usr/share/apacheds/lib/apacheds-interceptors-operational.jar
+usr/share/java/apacheds-interceptors-referral.jar       usr/share/apacheds/lib/apacheds-interceptors-referral.jar
+usr/share/java/apacheds-interceptors-schema.jar         usr/share/apacheds/lib/apacheds-interceptors-schema.jar
+usr/share/java/apacheds-interceptors-subtree.jar        usr/share/apacheds/lib/apacheds-interceptors-subtree.jar
+usr/share/java/apacheds-interceptors-trigger.jar        usr/share/apacheds/lib/apacheds-interceptors-trigger.jar
+usr/share/java/apacheds-jdbm-partition.jar              usr/share/apacheds/lib/apacheds-jdbm-partition.jar
+usr/share/java/apacheds-kerberos-codec.jar              usr/share/apacheds/lib/apacheds-kerberos-codec.jar
+usr/share/java/apacheds-ldif-partition.jar              usr/share/apacheds/lib/apacheds-ldif-partition.jar
+usr/share/java/apacheds-mavibot-partition.jar           usr/share/apacheds/lib/apacheds-mavibot-partition.jar
+usr/share/java/apacheds-protocol-dhcp.jar               usr/share/apacheds/lib/apacheds-protocol-dhcp.jar
+usr/share/java/apacheds-protocol-dns.jar                usr/share/apacheds/lib/apacheds-protocol-dns.jar
+usr/share/java/apacheds-protocol-kerberos.jar           usr/share/apacheds/lib/apacheds-protocol-kerberos.jar
+usr/share/java/apacheds-protocol-ldap.jar               usr/share/apacheds/lib/apacheds-protocol-ldap.jar
+usr/share/java/apacheds-protocol-ntp.jar                usr/share/apacheds/lib/apacheds-protocol-ntp.jar
+usr/share/java/apacheds-protocol-shared.jar             usr/share/apacheds/lib/apacheds-protocol-shared.jar
+usr/share/java/apacheds-server-annotations.jar          usr/share/apacheds/lib/apacheds-server-annotations.jar
+usr/share/java/apacheds-server-config.jar               usr/share/apacheds/lib/apacheds-server-config.jar
+usr/share/java/apacheds-server-jndi.jar                 usr/share/apacheds/lib/apacheds-server-jndi.jar
+usr/share/java/apacheds-service.jar                     usr/share/apacheds/lib/apacheds-service.jar
+usr/share/java/apacheds-service-builder.jar             usr/share/apacheds/lib/apacheds-service-builder.jar
+usr/share/java/apacheds-xdbm-partition.jar              usr/share/apacheds/lib/apacheds-xdbm-partition.jar
+usr/share/java/kerberos-client.jar                      usr/share/apacheds/lib/kerberos-client.jar
+
+usr/share/java/antlr.jar                                usr/share/apacheds/lib/antlr.jar
+usr/share/java/apache-directory-api-all.jar             usr/share/apacheds/lib/apache-directory-api-all.jar
+usr/share/java/apacheds-jdbm1.jar                       usr/share/apacheds/lib/apacheds-jdbm1.jar
+usr/share/java/bcprov.jar                               usr/share/apacheds/lib/bcprov.jar
+usr/share/java/commons-collections3.jar                 usr/share/apacheds/lib/commons-collections3.jar
+usr/share/java/commons-io.jar                           usr/share/apacheds/lib/commons-io.jar
+usr/share/java/commons-lang.jar                         usr/share/apacheds/lib/commons-lang.jar
+usr/share/java/commons-pool.jar                         usr/share/apacheds/lib/commons-pool.jar
+usr/share/java/dom4j.jar                                usr/share/apacheds/lib/dom4j.jar
+usr/share/java/ehcache-core.jar                         usr/share/apacheds/lib/ehcache-core.jar
+usr/share/java/log4j-1.2.jar                            usr/share/apacheds/lib/log4j-1.2.jar
+usr/share/java/mavibot.jar                              usr/share/apacheds/lib/mavibot.jar
+usr/share/java/mina2-core.jar                           usr/share/apacheds/lib/mina2-core.jar
+usr/share/java/slf4j-api.jar                            usr/share/apacheds/lib/slf4j-api.jar
+usr/share/java/slf4j-log4j12.jar                        usr/share/apacheds/lib/slf4j-log4j12.jar
+usr/share/java/xpp3.jar                                 usr/share/apacheds/lib/xpp3.jar
+
+var/lib/apacheds/instances                              usr/share/apacheds/instances
+etc/apacheds                                            var/lib/apacheds/instances/default/conf
+var/log/apacheds                                        var/lib/apacheds/instances/default/log
diff --git a/debian/apacheds.postinst b/debian/apacheds.postinst
new file mode 100644
index 0000000..40d5136
--- /dev/null
+++ b/debian/apacheds.postinst
@@ -0,0 +1,54 @@
+#!/bin/sh
+# postinst script for apacheds
+#
+# see: dh_installdeb(1)
+
+set -e
+
+APACHEDS_USER=apacheds
+APACHEDS_GROUP=apacheds
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+        # Create apacheds user if it doesn't exist.
+        if ! id $APACHEDS_USER > /dev/null 2>&1 ; then
+            adduser --system --home /var/lib/apacheds --no-create-home \
+                --group --disabled-password --quiet --shell /bin/bash \
+                $APACHEDS_USER
+        fi
+
+        # Fix directory permissions
+        chown -R $APACHEDS_USER:$APACHEDS_GROUP /var/log/apacheds || true
+        chown -R $APACHEDS_USER:$APACHEDS_GROUP /var/lib/apacheds || true
+        chown $APACHEDS_USER:$APACHEDS_GROUP /etc/apacheds/*
+        chmod 640 /etc/apacheds/*
+    ;;
+
+    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/debian/apacheds.postrm b/debian/apacheds.postrm
new file mode 100644
index 0000000..496c0fa
--- /dev/null
+++ b/debian/apacheds.postrm
@@ -0,0 +1,43 @@
+#!/bin/sh
+# postrm script for apacheds
+#
+# 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 apacheds user
+        userdel apacheds || true
+        # Remove log files
+        rm -Rf /var/log/apacheds || true
+    ;;
+    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/apacheds.service b/debian/apacheds.service
new file mode 100644
index 0000000..e6de514
--- /dev/null
+++ b/debian/apacheds.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Apache Directory Server
+After=network.target
+ConditionPathExists=/etc/apacheds/config.ldif
+
+[Service]
+Type=simple
+User=apacheds
+Group=apacheds
+EnvironmentFile=/etc/default/apacheds
+ExecStart=${JAVA_HOME}/bin/java ${JAVA_OPTS} \
+            -Dapacheds.controls=${ADS_CONTROLS} \
+            -Dapacheds.extendedOperations=${ADS_EXTENDED_OPERATIONS} \
+            -Dlog4j.configuration=file:${ADS_INSTANCES}/${ADS_INSTANCE}/conf/log4j.properties \
+            -Dapacheds.log.dir=${ADS_INSTANCES}/${ADS_INSTANCE}/log \
+            -cp '${ADS_HOME}/lib/*' \
+            org.apache.directory.server.UberjarMain \
+            ${ADS_INSTANCES}/${ADS_INSTANCE}/
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..bf333b4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+apache-directory-server (2.0.0~M15-1) unstable; urgency=medium
+
+  * Initial release (Closes: #790648)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 01 Jul 2015 22:21:57 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..bd9f41e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,77 @@
+Source: apache-directory-server
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant,
+               cdbs (>= 0.4.123),
+               debhelper (>= 9),
+               default-jdk,
+               dh-systemd (>= 1.5),
+               junit4,
+               libapache-directory-api-java,
+               libapache-directory-jdbm-java,
+               libbcprov-java,
+               libcommons-collections3-java,
+               libehcache-java (>= 2.6.11-2~),
+               libjetty-java,
+               liblog4j1.2-java (>= 1.2.17),
+               libmaven-bundle-plugin-java,
+               libmaven-dependency-plugin-java,
+               libmaven2-core-java,
+               libmavibot-java,
+               libmina2-java,
+               libplexus-utils2-java (>= 2.x),
+               libslf4j-java,
+               maven-debian-helper (>= 1.5)
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/apache-directory-server.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/apache-directory-server.git
+Homepage: http://directory.apache.org
+
+Package: libapacheds-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}, libapacheds-i18n-java (= ${source:Version}), libapacheds-kerberos-codec-java (= ${source:Version})
+Suggests: ${maven:OptionalDepends}
+Description: Apache Directory Server (Libraries)
+ ApacheDS is an embbedable directory server entirely written in Java, which
+ has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
+ supports Kerberos 5 and the Change Password Protocol. It has been designed
+ to introduce triggers, stored procedures, queues and views to the world
+ of LDAP which has lacked these rich constructs.
+ .
+ This package contains the core libraries for ApacheDS.
+
+Package: libapacheds-kerberos-codec-java
+Architecture: all
+Depends: ${misc:Depends}, libapacheds-i18n-java (= ${source:Version}), libehcache-java (>= 2.6.11-2~)
+Description: Apache Directory Server (Kerberos Codec)
+ ApacheDS is an embbedable directory server entirely written in Java, which
+ has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
+ supports Kerberos 5 and the Change Password Protocol. It has been designed
+ to introduce triggers, stored procedures, queues and views to the world
+ of LDAP which has lacked these rich constructs.
+ .
+ This package contains the kerberos-codec module
+
+Package: libapacheds-i18n-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: Apache Directory Server (i18n)
+ ApacheDS is an embbedable directory server entirely written in Java, which
+ has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
+ supports Kerberos 5 and the Change Password Protocol. It has been designed
+ to introduce triggers, stored procedures, queues and views to the world
+ of LDAP which has lacked these rich constructs.
+ .
+ This package contains the i18n module.
+
+Package: apacheds
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, libapacheds-java (= ${source:Version}), adduser
+Description: Apache Directory Server
+ ApacheDS is an embbedable directory server entirely written in Java, which
+ has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
+ supports Kerberos 5 and the Change Password Protocol. It has been designed
+ to introduce triggers, stored procedures, queues and views to the world
+ of LDAP which has lacked these rich constructs.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..a1139f2
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,19 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Directory Server
+Source: http://svn.apache.org/repos/asf/directory/apacheds/
+
+Files: *
+Copyright: 2004-2013, The Apache Software Foundation
+License: Apache-2.0
+
+Files: core-avl/src/main/java/org/apache/directory/server/core/avltree/avl/*
+Copyright: 2001-2011, Vladimir Lysyy
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2015, Emmanuel Bourg <ebourg at apache.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
diff --git a/debian/libapacheds-java.poms b/debian/libapacheds-java.poms
new file mode 100644
index 0000000..9904d52
--- /dev/null
+++ b/debian/libapacheds-java.poms
@@ -0,0 +1,82 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version
+i18n/pom.xml --no-parent --has-package-version --package=libapacheds-i18n-java
+all/pom.xml --ignore
+jdbm-partition/pom.xml --has-package-version --java-lib
+mavibot-partition/pom.xml --has-package-version --java-lib
+xdbm-partition/pom.xml --has-package-version --java-lib
+core-shared/pom.xml --has-package-version --java-lib
+core-api/pom.xml --has-package-version --java-lib
+interceptors/pom.xml --has-package-version
+interceptors/normalization/pom.xml --has-package-version --java-lib
+interceptors/event/pom.xml --has-package-version --java-lib
+interceptors/subtree/pom.xml --has-package-version --java-lib
+interceptors/authz/pom.xml --has-package-version --java-lib
+interceptors/admin/pom.xml --has-package-version --java-lib
+interceptors/authn/pom.xml --has-package-version --java-lib
+interceptors/changelog/pom.xml --has-package-version --java-lib
+interceptors/journal/pom.xml --has-package-version --java-lib
+interceptors/referral/pom.xml --has-package-version --java-lib
+interceptors/operational/pom.xml --has-package-version --java-lib
+interceptors/collective/pom.xml --has-package-version --java-lib
+interceptors/logger/pom.xml --has-package-version --java-lib
+interceptors/exception/pom.xml --has-package-version --java-lib
+interceptors/hash/pom.xml --has-package-version --java-lib
+interceptors/schema/pom.xml --has-package-version --java-lib
+interceptors/trigger/pom.xml --has-package-version --java-lib
+core/pom.xml --has-package-version --java-lib
+core-annotations/pom.xml
+server-annotations/pom.xml --has-package-version --java-lib
+core-jndi/pom.xml --has-package-version --java-lib
+core-constants/pom.xml --has-package-version --java-lib
+core-integ/pom.xml --ignore
+core-avl/pom.xml --has-package-version --java-lib
+ldif-partition/pom.xml --has-package-version --java-lib
+protocol-shared/pom.xml --has-package-version --java-lib
+kerberos-codec/pom.xml --has-package-version --package=libapacheds-kerberos-codec-java --java-lib
+protocol-ntp/pom.xml --has-package-version --java-lib
+protocol-ldap/pom.xml --has-package-version --java-lib
+protocol-kerberos/pom.xml --has-package-version --java-lib
+protocol-dhcp/pom.xml --has-package-version --java-lib
+protocol-dns/pom.xml --has-package-version --java-lib
+server-integ/pom.xml --ignore
+server-config/pom.xml --has-package-version --java-lib
+service-builder/pom.xml --has-package-version --java-lib
+server-jndi/pom.xml --has-package-version --java-lib
+interceptor-kerberos/pom.xml --has-package-version --java-lib
+kerberos-test/pom.xml --ignore
+http-directory-bridge/pom.xml --has-package-version --java-lib
+http-integration/pom.xml --has-package-version --java-lib
+test-framework/pom.xml --ignore
+ldap-client-test/pom.xml --ignore
+kerberos-client/pom.xml --has-package-version --java-lib
+service/pom.xml --has-package-version --package=apacheds --java-lib
+wrapper/pom.xml --ignore
+installers-maven-plugin/pom.xml --ignore
+installers/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..22ce129
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,24 @@
+
+org.apache.directory.server apacheds-xdbm-partition jar * tests *
+org.apache.directory.server apacheds-core-api test-jar * * *
+org.apache.directory.server apacheds-xdbm-partition test-jar * * *
+commons-io commons-io * * * *
+commons-lang commons-lang * * * *
+commons-net commons-net * * * *
+findbugs annotations * * * *
+ldapsdk ldapsdk * * * *
+org.apache.directory.junit junit-addons * * * *
+org.apache.directory.server apacheds-kerberos-test * * * *
+org.apache.directory.server apacheds-test-framework * * * *
+org.apache.maven.plugins maven-eclipse-plugin * * * *
+org.apache.maven.plugins maven-jar-plugin * * * *
+org.apache.maven.plugins maven-shade-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.maven.wagon wagon-ssh-external * * * *
+org.apache.maven.wagon wagon-ssh * * * *
+org.apache.rat apache-rat-plugin * * * *
+org.mortbay.jetty servlet-api-2.5 * * * *
+org.slf4j slf4j-log4j12 * * * *
+tanukisoft wrapper * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..ad504cc
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,12 @@
+
+commons-collections commons-collections jar s/3\..*/3.x/ * *
+org.apache.maven maven-artifact jar s/.*/3.x/ * *
+org.apache.maven maven-plugin-api jar s/.*/3.x/ * *
+org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
+s/bouncycastle/org.bouncycastle/ s/bcprov-jdk15/bcprov/ * s/.*/debian/ * *
+junit junit * s/.*/4.x/ * *
+log4j log4j * s/1\.2\..*/1.2.x/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
+org.apache.directory.api s/api-.*/api-all/ * s/.*/debian/ * *
+org.apache.mina * s/.*/jar/ s/2\..*/2.x/ * *
+org.mortbay.jetty * * s/6\..*/6.x/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..2d4bb60
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+#
+# Removes unwanted content from the upstream sources.
+# Called by uscan with '--upstream-version' <version> <file>
+#
+
+VERSION=$2
+TAR=../apache-directory-server_$VERSION.orig.tar.xz
+DIR=apache-directory-server-$VERSION
+TAG=$(echo "$VERSION" | sed -re's/~(alpha|beta|rc|m)/-\1/i')
+
+svn export http://svn.apache.org/repos/asf/directory/apacheds/tags/${TAG}/ $DIR
+XZ_OPT=--best tar -c -J -f $TAR \
+    --exclude '*.jar' \
+    --exclude '*.class' \
+    --exclude '*.exe' \
+    --exclude 'installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper*' \
+    $DIR
+rm -rf $DIR ../$TAG
diff --git a/debian/patches/01-jar-packaging.patch b/debian/patches/01-jar-packaging.patch
new file mode 100644
index 0000000..00f8bea
--- /dev/null
+++ b/debian/patches/01-jar-packaging.patch
@@ -0,0 +1,628 @@
+Description: Change the packaging type from bundle to jar
+ (for some reason the resolution of the inter module dependencies doesn't work)
+Author: Emmanuel Bourg <ebourg at pache.org>
+Forwarded: not-needed
+diff --git a/component-hub/pom.xml b/component-hub/pom.xml
+index 6a10e63..7eab2af 100644
+--- a/component-hub/pom.xml
++++ b/component-hub/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-component-hub</artifactId>
+   <name>ApacheDS Component Hub</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   <description>Provides main plugin-layer for ApacheDS</description>
+ 
+   <dependencies>
+diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
+index f17edc7..dc8f7bf 100644
+--- a/core-annotations/pom.xml
++++ b/core-annotations/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-core-annotations</artifactId>
+   <name>ApacheDS Core Annotations</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <description>Annotations used to define a DirectoryService</description>
+   
+diff --git a/core-api/pom.xml b/core-api/pom.xml
+index 0619551..1f10534 100644
+--- a/core-api/pom.xml
++++ b/core-api/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-core-api</artifactId>
+   <name>ApacheDS Core API</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Contains interfaces and helper classes that are part of the ApacheDS Core API.
+diff --git a/core-avl/pom.xml b/core-avl/pom.xml
+index 459a1a1..43be871 100644
+--- a/core-avl/pom.xml
++++ b/core-avl/pom.xml
+@@ -25,7 +25,7 @@
+   
+   <artifactId>apacheds-core-avl</artifactId>
+   <name>ApacheDS Core AVL</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <description>A linked in memory AVL tree implementation with Cursor</description>
+ 
+diff --git a/core-constants/pom.xml b/core-constants/pom.xml
+index 17e17a6..39a5947 100644
+--- a/core-constants/pom.xml
++++ b/core-constants/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-core-constants</artifactId>
+   <name>ApacheDS Core Constants</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>Contains classes that store interfaces with various constants in ApacheDS.</description>
+   
+diff --git a/core-integ/pom.xml b/core-integ/pom.xml
+index 77e26bb..7e86ca1 100644
+--- a/core-integ/pom.xml
++++ b/core-integ/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-core-integ</artifactId>
+   <name>ApacheDS Core Integration</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>Integration testing framework for Apache Directory Server.</description>
+ 
+diff --git a/core-jndi/pom.xml b/core-jndi/pom.xml
+index 0ec3e57..c9e08ae 100644
+--- a/core-jndi/pom.xml
++++ b/core-jndi/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-core-jndi</artifactId>
+   <name>ApacheDS Core JNDI</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+      Contains a JNDI provider implementation which wraps the core so existing 
+diff --git a/core-shared/pom.xml b/core-shared/pom.xml
+index 5cb70a8..7234c33 100644
+--- a/core-shared/pom.xml
++++ b/core-shared/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-core-shared</artifactId>
+   <name>ApacheDS Core Shared</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Contains helper classes that are part of the ApacheDS Core.
+diff --git a/core/pom.xml b/core/pom.xml
+index 73f1f84..ee14bfc 100644
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-core</artifactId>
+   <name>ApacheDS Core</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+      Server's core contains the JNDI provider, interceptors, schema, and
+diff --git a/dependencies/pom.xml b/dependencies/pom.xml
+index 7ec6369..0ed77da 100644
+--- a/dependencies/pom.xml
++++ b/dependencies/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-dependencies</artifactId>
+   <name>ApacheDS NonOSGI Dependencies</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>Exports NonOSGI dependencies as bundle</description>
+ 
+diff --git a/http-directory-bridge/pom.xml b/http-directory-bridge/pom.xml
+index 0cf74bf..8f5cfba 100644
+--- a/http-directory-bridge/pom.xml
++++ b/http-directory-bridge/pom.xml
+@@ -27,7 +27,7 @@
+ 
+   <artifactId>apacheds-http-directory-bridge</artifactId>
+   <name>ApacheDS DirectoryService-WebApp bridge</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <dependencies>
+     
+diff --git a/http-integration/pom.xml b/http-integration/pom.xml
+index e5249ec..ce2844c 100644
+--- a/http-integration/pom.xml
++++ b/http-integration/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-http-integration</artifactId>
+   <name>ApacheDS Jetty HTTP Server Integration</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <dependencies>
+     <dependency>
+diff --git a/i18n/pom.xml b/i18n/pom.xml
+index 903191d..fc9a2c9 100644
+--- a/i18n/pom.xml
++++ b/i18n/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-i18n</artifactId>
+   <name>ApacheDS I18n</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <description>Internationalization of errors and other messages</description>
+   
+diff --git a/interceptor-kerberos/pom.xml b/interceptor-kerberos/pom.xml
+index 5621809..de058ea 100644
+--- a/interceptor-kerberos/pom.xml
++++ b/interceptor-kerberos/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-interceptor-kerberos</artifactId>
+   <name>ApacheDS Interceptors for Kerberos</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>Interceptors used by the ApacheDS kerberos service.</description>
+ 
+diff --git a/interceptors/admin/pom.xml b/interceptors/admin/pom.xml
+index 30d3f60..4a73c2c 100644
+--- a/interceptors/admin/pom.xml
++++ b/interceptors/admin/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-admin</artifactId>
+   <name>ApacheDS AdministrativePoint Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     AdministrativePoint interceptor
+diff --git a/interceptors/authn/pom.xml b/interceptors/authn/pom.xml
+index 8b99d0a..ba8d10a 100644
+--- a/interceptors/authn/pom.xml
++++ b/interceptors/authn/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-authn</artifactId>
+   <name>ApacheDS Authentication Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Authentication interceptor
+diff --git a/interceptors/authz/pom.xml b/interceptors/authz/pom.xml
+index fedfddc..0fa1059 100644
+--- a/interceptors/authz/pom.xml
++++ b/interceptors/authz/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-authz</artifactId>
+   <name>ApacheDS Authorization Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Authorization interceptor
+diff --git a/interceptors/changelog/pom.xml b/interceptors/changelog/pom.xml
+index dc487c5..b615dee 100644
+--- a/interceptors/changelog/pom.xml
++++ b/interceptors/changelog/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-changelog</artifactId>
+   <name>ApacheDS ChangeLog Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     ChangeLog interceptor
+diff --git a/interceptors/collective/pom.xml b/interceptors/collective/pom.xml
+index af9552f..e11f692 100644
+--- a/interceptors/collective/pom.xml
++++ b/interceptors/collective/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-collective</artifactId>
+   <name>ApacheDS Collective Attribute Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Collective Attribute interceptor
+diff --git a/interceptors/event/pom.xml b/interceptors/event/pom.xml
+index 7b22259..2f584c7 100644
+--- a/interceptors/event/pom.xml
++++ b/interceptors/event/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-event</artifactId>
+   <name>ApacheDS Event Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Event interceptor
+diff --git a/interceptors/exception/pom.xml b/interceptors/exception/pom.xml
+index 06c57c2..4ff0f00 100644
+--- a/interceptors/exception/pom.xml
++++ b/interceptors/exception/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-exception</artifactId>
+   <name>ApacheDS Exception Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Exception interceptor
+diff --git a/interceptors/hash/pom.xml b/interceptors/hash/pom.xml
+index 2426a49..449731d 100644
+--- a/interceptors/hash/pom.xml
++++ b/interceptors/hash/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-hash</artifactId>
+   <name>ApacheDS Password Hashing Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Password Hashing interceptor
+diff --git a/interceptors/journal/pom.xml b/interceptors/journal/pom.xml
+index d44c4cf..6c8533d 100644
+--- a/interceptors/journal/pom.xml
++++ b/interceptors/journal/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-journal</artifactId>
+   <name>ApacheDS Journal Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Journal interceptor
+diff --git a/interceptors/logger/pom.xml b/interceptors/logger/pom.xml
+index b2e8f61..0fab53d 100644
+--- a/interceptors/logger/pom.xml
++++ b/interceptors/logger/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-logger</artifactId>
+   <name>ApacheDS Logger Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Logger interceptor
+diff --git a/interceptors/normalization/pom.xml b/interceptors/normalization/pom.xml
+index 4e1127a..56afa0a 100644
+--- a/interceptors/normalization/pom.xml
++++ b/interceptors/normalization/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-normalization</artifactId>
+   <name>ApacheDS Normalization Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Normalization interceptor
+diff --git a/interceptors/operational/pom.xml b/interceptors/operational/pom.xml
+index 3c417cb..4192f13 100644
+--- a/interceptors/operational/pom.xml
++++ b/interceptors/operational/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-operational</artifactId>
+   <name>ApacheDS Operational Attribute Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Operational Attribute interceptor
+diff --git a/interceptors/referral/pom.xml b/interceptors/referral/pom.xml
+index c419b04..522c72a 100644
+--- a/interceptors/referral/pom.xml
++++ b/interceptors/referral/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-referral</artifactId>
+   <name>ApacheDS Referral Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Referral interceptor
+diff --git a/interceptors/schema/pom.xml b/interceptors/schema/pom.xml
+index e0a11ec..b2d953d 100644
+--- a/interceptors/schema/pom.xml
++++ b/interceptors/schema/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-schema</artifactId>
+   <name>ApacheDS Schema Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Schema interceptor
+diff --git a/interceptors/subtree/pom.xml b/interceptors/subtree/pom.xml
+index 72ec431..dc83dd5 100644
+--- a/interceptors/subtree/pom.xml
++++ b/interceptors/subtree/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-subtree</artifactId>
+   <name>ApacheDS Subtree Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Subtree interceptor
+diff --git a/interceptors/trigger/pom.xml b/interceptors/trigger/pom.xml
+index ae05bae..1e4c1c4 100644
+--- a/interceptors/trigger/pom.xml
++++ b/interceptors/trigger/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-interceptors-trigger</artifactId>
+   <name>ApacheDS Triggers Interceptor</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     Triggers interceptor
+diff --git a/jdbm-partition/pom.xml b/jdbm-partition/pom.xml
+index ecaeaf5..0a02c25 100644
+--- a/jdbm-partition/pom.xml
++++ b/jdbm-partition/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-jdbm-partition</artifactId>
+   <name>ApacheDS JDBM Partition</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     JDBM BTree backed partition implementation.
+diff --git a/kerberos-codec/pom.xml b/kerberos-codec/pom.xml
+index 984e030..9536a90 100644
+--- a/kerberos-codec/pom.xml
++++ b/kerberos-codec/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-kerberos-codec</artifactId>
+   <name>ApacheDS Protocol Kerberos Codec</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>The Kerberos protocol encoder/decoder module</description>
+ 
+diff --git a/ldif-partition/pom.xml b/ldif-partition/pom.xml
+index 52703b5..87b47e7 100644
+--- a/ldif-partition/pom.xml
++++ b/ldif-partition/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-ldif-partition</artifactId>
+   <name>ApacheDS LDIF Partition</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>A partition that backs it's entries and indices in AvlTrees within memory.</description>
+ 
+diff --git a/osgi/pom.xml b/osgi/pom.xml
+index 87abb91..8b898d8 100644
+--- a/osgi/pom.xml
++++ b/osgi/pom.xml
+@@ -28,7 +28,7 @@
+   </parent>
+   <artifactId>apacheds-osgi</artifactId>
+   <name>ApacheDS OSGi Bundle</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <properties>
+     <apache.directory.version>${project.version}</apache.directory.version>
+diff --git a/protocol-dhcp/pom.xml b/protocol-dhcp/pom.xml
+index 21f3f21..63bc500 100644
+--- a/protocol-dhcp/pom.xml
++++ b/protocol-dhcp/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-protocol-dhcp</artifactId>
+   <name>ApacheDS Protocol Dhcp</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>The DHCP protocol provider for ApacheDS</description>
+ 
+diff --git a/protocol-dns/pom.xml b/protocol-dns/pom.xml
+index a51377a..82e244a 100644
+--- a/protocol-dns/pom.xml
++++ b/protocol-dns/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-protocol-dns</artifactId>
+   <name>ApacheDS Protocol Dns</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>The DNS protocol provider for ApacheDS</description> 
+ 
+diff --git a/protocol-kerberos/pom.xml b/protocol-kerberos/pom.xml
+index 76f65a5..e50784d 100644
+--- a/protocol-kerberos/pom.xml
++++ b/protocol-kerberos/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-protocol-kerberos</artifactId>
+   <name>ApacheDS Protocol Kerberos</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>The Kerberos Protocol Provider for ApacheDS</description>
+ 
+diff --git a/protocol-ldap/pom.xml b/protocol-ldap/pom.xml
+index 5b0cfa2..a8c01ca 100644
+--- a/protocol-ldap/pom.xml
++++ b/protocol-ldap/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-protocol-ldap</artifactId>
+   <name>ApacheDS Protocol Ldap</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <description>The LDAPv3 protocol provider for ApacheDS</description>
+ 
+diff --git a/protocol-ntp/pom.xml b/protocol-ntp/pom.xml
+index 55f6e8c..daf9efa 100644
+--- a/protocol-ntp/pom.xml
++++ b/protocol-ntp/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-protocol-ntp</artifactId>
+   <name>ApacheDS Protocol Ntp</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>The NTP protocol provider for ApacheDS</description>
+ 
+diff --git a/protocol-shared/pom.xml b/protocol-shared/pom.xml
+index d6c0664..c5dc985 100644
+--- a/protocol-shared/pom.xml
++++ b/protocol-shared/pom.xml
+@@ -26,7 +26,7 @@
+   </parent>
+   
+   <name>ApacheDS Protocol Shared</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   <artifactId>apacheds-protocol-shared</artifactId>
+ 
+   <description>
+diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
+index f8f1510..9b59806 100644
+--- a/server-annotations/pom.xml
++++ b/server-annotations/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-server-annotations</artifactId>
+   <name>Apacheds Server Annotations</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>Annotations used to define a LdapServer</description>
+   
+diff --git a/server-config/pom.xml b/server-config/pom.xml
+index 7333d32..54686cd 100644
+--- a/server-config/pom.xml
++++ b/server-config/pom.xml
+@@ -27,7 +27,7 @@
+ 
+   <artifactId>apacheds-server-config</artifactId>
+   <name>ApacheDS Server Config</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <dependencies>
+     
+diff --git a/server-integ/pom.xml b/server-integ/pom.xml
+index 5f71d1a..4f24545 100644
+--- a/server-integ/pom.xml
++++ b/server-integ/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-server-integ</artifactId>
+   <name>ApacheDS Server Integration</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>Integration testing framework for Apache Directory Server.</description>
+ 
+diff --git a/server-jndi/pom.xml b/server-jndi/pom.xml
+index ee3b01a..19436d0 100644
+--- a/server-jndi/pom.xml
++++ b/server-jndi/pom.xml
+@@ -27,7 +27,7 @@
+   
+   <artifactId>apacheds-server-jndi</artifactId>
+   <name>ApacheDS Server JNDI</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description>
+     The JNDI provider which launches the core and associated network 
+diff --git a/service-builder/pom.xml b/service-builder/pom.xml
+index 0c0688a..11b753a 100644
+--- a/service-builder/pom.xml
++++ b/service-builder/pom.xml
+@@ -27,7 +27,7 @@
+ 
+   <artifactId>apacheds-service-builder</artifactId>
+   <name>ApacheDS Service Builder</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <dependencies>
+     <dependency>
+diff --git a/service-osgi/pom.xml b/service-osgi/pom.xml
+index 83e4226..6c4fcce 100644
+--- a/service-osgi/pom.xml
++++ b/service-osgi/pom.xml
+@@ -29,7 +29,7 @@
+   
+   <artifactId>apacheds-service-osgi</artifactId>
+   <name>ApacheDS OSGI Deployer</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+ 
+   <description />
+   <dependencies>
+diff --git a/test-framework/pom.xml b/test-framework/pom.xml
+index d199f2e..d4f0fe7 100644
+--- a/test-framework/pom.xml
++++ b/test-framework/pom.xml
+@@ -28,7 +28,7 @@
+   
+   <artifactId>apacheds-test-framework</artifactId>
+   <name>ApacheDS Test Framework</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <description>Test framework for integration tests without depending on the InheritableSettings</description>
+   
+diff --git a/xdbm-partition/pom.xml b/xdbm-partition/pom.xml
+index 20250db..c592e87 100644
+--- a/xdbm-partition/pom.xml
++++ b/xdbm-partition/pom.xml
+@@ -26,7 +26,7 @@
+   
+   <artifactId>apacheds-xdbm-partition</artifactId>
+   <name>ApacheDS Generalized (X) DBM Partition</name>
+-  <packaging>bundle</packaging>
++  <packaging>jar</packaging>
+   
+   <description>Partition with search engine implementation generalized for XDBM entry store scheme</description>
+   
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..da693f0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-jar-packaging.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4a061cf
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+	uscan --download-current-version --force-download --no-symlink
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..207141d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/-(alpha|beta|rc|m)(-)?/~$1$2/i" \
+  http://svn.apache.org/repos/asf/directory/apacheds/tags/ \
+  (\d.*)/ debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-directory-server.git



More information about the pkg-java-commits mailing list