Index: server-installers/src/main/installers/rpm-apacheds.spec
===================================================================
--- server-installers/src/main/installers/rpm-apacheds.spec	(revision 448907)
+++ server-installers/src/main/installers/rpm-apacheds.spec	(working copy)
@@ -1,3 +1,7 @@
+%define with_docs ${with.docs}
+%define with_sources ${with.sources}
+%define apacheds_user ${app.user}
+
 Summary: ${app.display.name} Server 
 Name: ${app}
 Version: ${app.version}
@@ -7,83 +11,113 @@
 URL: ${app.url}
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: java
 
+%define topdir ${app.install.base}
+
 %description
 ${app.description}
 
+%if %{with_sources}
+%package sources
+Summary: sources for %{name}
+Group: System Environment/Daemons
+
+%description sources
+The %{name}-sources package contains the source code for %{name}
+%endif
+
+%if %{with_docs}
+%package docs
+Summary: documentation for %{name}
+Group: System Environment/Daemons
+
+%description docs
+The %{name}-docs package contains the maven generated documentation for %{name}
+%endif
+
 %prep
-echo $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-cp -rf ${image.basedir} $RPM_BUILD_ROOT/%{name}-%{version}
-cd $RPM_BUILD_ROOT
-tar -zcvf /usr/src/redhat/SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}
-
 %setup -q
 
 %build
-cd $RPM_BUILD_ROOT/%{name}-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin
-mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf
-mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/lib/ext
-mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/log
-mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/run
-mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/partitions
-touch $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/log/${app}-stderr.log
-touch $RPM_BUILD_ROOT/usr/local/${app}-%{version}/var/log/${app}-stdout.log
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-${mk.docs.dirs}
-${mk.sources.dirs}
+install -d $RPM_BUILD_ROOT%{topdir}
+cp -a . $RPM_BUILD_ROOT%{topdir}
+touch $RPM_BUILD_ROOT%{topdir}/var/log/${app}-stderr.log
+touch $RPM_BUILD_ROOT%{topdir}/var/log/${app}-stdout.log
+install -d  $RPM_BUILD_ROOT/etc/init.d
+mv $RPM_BUILD_ROOT%{topdir}/bin/${server.init} $RPM_BUILD_ROOT/etc/init.d/${app}
+cd $RPM_BUILD_ROOT%{topdir}
+rm README.txt LICENSE.txt NOTICE.txt
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+cat << EOF > $RPM_BUILD_ROOT/etc/sysconfig/apacheds
+JAVA_HOME=/usr/lib/jvm/java
+APACHEDS_USER=%{apacheds_user}
+EOF
 
-pwd
-install -m 755 ${image.basedir}/bin/${app} $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/${app}
-install -m 644 ${image.basedir}/bin/bootstrapper.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/bootstrapper.jar
-install -m 644 ${image.basedir}/bin/apacheds-tools.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/apacheds-tools.jar
-install -m 755 ${image.basedir}/bin/apacheds-tools.sh $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/apacheds-tools.sh
-install -m 644 ${image.basedir}/bin/logger.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/logger.jar
-install -m 644 ${image.basedir}/bin/daemon.jar $RPM_BUILD_ROOT/usr/local/${app}-%{version}/bin/daemon.jar
-install -m 600 ${image.basedir}/conf/server.xml $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/server.xml
-install -m 644 ${image.basedir}/conf/bootstrapper.properties $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/bootstrapper.properties
-install -m 644 ${image.basedir}/conf/log4j.properties $RPM_BUILD_ROOT/usr/local/${app}-%{version}/conf/log4j.properties
-install -m 744 ${image.basedir}/bin/${server.init} $RPM_BUILD_ROOT/etc/init.d/${app}
-install -m 644 ${image.basedir}/${app.license.name} $RPM_BUILD_ROOT/usr/local/${app}-%{version}
-install -m 644 ${image.basedir}/${app.readme.name} $RPM_BUILD_ROOT/usr/local/${app}-%{version}
-install -m 644 ${image.basedir}/${app.icon} $RPM_BUILD_ROOT/usr/local/${app}-%{version}
-${install.append.libs}
-${install.docs}
-${install.sources}
-${install.notice.file}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if "%{apacheds_user}" != "root"
+%pre
+# create apacheds user if it does not exist yet
+if ! id %{apacheds_user} > /dev/null 2>&1 ; then
+    echo Adding user %{apacheds_user}
+    useradd -d %{topdir}/var/partitions -r %{apacheds_user}
+fi
+%endif
+
+%post
+if [ "$1" = "1" ] ; then  # first install
+    /usr/lib/lsb/install_initd /etc/init.d/${app}
+fi
+
+%preun
+if [ "$1" = "0" ] ; then # last uninstall
+    /etc/init.d/${app} stop &>/dev/null
+    /usr/lib/lsb/remove_initd /etc/init.d/${app}   
+fi
+
 %files
-%defattr(-,root,root,-)
-%doc ${app.license.name} ${app.readme.name}
+%defattr(755,root,root,-)
+%dir %{topdir}
+%dir %{topdir}/bin
+%dir %{topdir}/conf
+%dir %{topdir}/lib
+%dir %{topdir}/lib/ext
+%dir %{topdir}/var
 
+%defattr(755,%{apacheds_user},%{apacheds_user},-)
+%dir %{topdir}/var/log
+%dir %{topdir}/var/run
+%dir %{topdir}/var/partitions
+
+%defattr(755,root,root,-)
 /etc/init.d/${app}
-/usr/local/${app}-%{version}/bin/${app}
-/usr/local/${app}-%{version}/bin/bootstrapper.jar
-/usr/local/${app}-%{version}/bin/apacheds-tools.jar
-/usr/local/${app}-%{version}/bin/apacheds-tools.sh
-/usr/local/${app}-%{version}/bin/logger.jar
-/usr/local/${app}-%{version}/bin/daemon.jar
-/usr/local/${app}-%{version}/conf/log4j.properties
-/usr/local/${app}-%{version}/conf/bootstrapper.properties
-/usr/local/${app}-%{version}/conf/server.xml
-/usr/local/${app}-%{version}/lib/ext
-/usr/local/${app}-%{version}/var/run
-/usr/local/${app}-%{version}/var/log
-/usr/local/${app}-%{version}/var/partitions
-/usr/local/${app}-%{version}/var/log/${app}-stderr.log
-/usr/local/${app}-%{version}/var/log/${app}-stdout.log
-/usr/local/${app}-%{version}/${app.readme.name}
-/usr/local/${app}-%{version}/${app.license.name}
-/usr/local/${app}-%{version}/${app.icon}
-${verify.append.libs}
-${verify.docs}
-${verify.sources}
-${verify.notice.file}
+%{topdir}/bin/${app}
+%{topdir}/bin/apacheds-tools.sh
+
+%defattr(644,root,root,-)
+%{topdir}/${app.icon}
+%{topdir}/bin/*.jar
+%{topdir}/lib/*.jar
+%attr(644,%{apacheds_user},%{apacheds_user})%{topdir}/var/log/*.log
+
+%config(noreplace) %{topdir}/conf/log4j.properties
+%config(noreplace) %{topdir}/conf/server.xml
+%config(noreplace) /etc/sysconfig/apacheds
+%config %{topdir}/conf/bootstrapper.properties
+
+%doc README.txt LICENSE.txt NOTICE.txt
+
+%if %{with_sources}
+%files sources
+%{topdir}/src
+%endif
+
+%if %{with_docs}
+%files docs
+%{topdir}/docs
+%endif
Index: server-installers/pom.xml
===================================================================
--- server-installers/pom.xml	(revision 448907)
+++ server-installers/pom.xml	(working copy)
@@ -151,13 +151,12 @@
               </packagedFiles>
               <id>linux-jsvc-rpm</id>
               <rpmSpecificationFile>src/main/installers/rpm-apacheds.spec</rpmSpecificationFile>
-              <finalName>
-                apacheds-${pom.version}-linux-i386.rpm
-              </finalName>
               <osName>Linux</osName>
               <osFamily>unix</osFamily>
               <osArch>i386</osArch>
               <daemonFramework>jsvc</daemonFramework>
+              <daemonUser>apacheds</daemonUser>
+              <installBase>/opt/apacheds</installBase>
             </rpmTarget>
           </rpmTargets>
           <innoTargets>