Hello community, here is the log from the commit of package geronimo checked in at Mon Oct 9 17:36:28 CEST 2006. -------- --- geronimo/geronimo.changes 2006-09-14 20:54:42.000000000 +0200 +++ /mounts/work_src_done/NOARCH/geronimo/geronimo.changes 2006-10-04 11:09:42.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 4 11:08:42 CEST 2006 - dbornkessel@suse.de + +- changed persmissions of deploy directory +- cleaned up geronimo start script and sysconfig file: + - introduced GERONIMO_USER and GERONIMO_GROUP variables + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geronimo.spec ++++++ --- /var/tmp/diff_new_pack.tYptSu/_old 2006-10-09 17:35:14.000000000 +0200 +++ /var/tmp/diff_new_pack.tYptSu/_new 2006-10-09 17:35:14.000000000 +0200 @@ -33,12 +33,13 @@ %define dif_file_list %{_builddir}/diff.files %define diff_dirs var/config %define tmp_dir %{_builddir}/tmp_dir +%define deploy_dir %{_localstatedir}/cache/%{name}-%{version} #<<< #>>> packages properties #>>> main BuildRequires: ant-trax diffutils jaf java2-devel-packages Version: 1.1 -Release: 1 +Release: 2 Summary: Geronimo is Apache's ASF-licensed J2EE server project URL: http://geronimo.apache.org/ Source0: http://www.apache.org/dyn/closer.cgi/geronimo/1.1/geronimo-tomcat-j2ee-%{version}.tar.gz @@ -258,6 +259,7 @@ popd #<<< extract end sed -i -e 's|@@GERONIMO_HOME@@|%{geronimo_home}|g' %{SOURCE3} +sed -i -e 's|@@DEPLOY_DIR@@|%{deploy_dir}|g' %{SOURCE3} sed -i -e 's|@@NAME@@|%{name}-%{version}|g' %{SOURCE2} #>>> update start pages # this is some very static (and horrible) code, which has to be adjusted in each version: @@ -366,6 +368,7 @@ %install rm -rf $RPM_BUILD_ROOT +export NO_BRP_CHECK_BYTECODE_VERSION="true" #>>> sysv init and logging install -d -m 755 $RPM_BUILD_ROOT/{%{_sbindir},%{_sysconfdir}/init.d} install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} @@ -408,8 +411,8 @@ mv $RPM_BUILD_ROOT/%{geronimo_home}/RELEASE-NOTES-%{version}.txt $RPM_BUILD_ROOT%{_docdir}/%{full_name} # delete RELEASE-NOTES from file list sed -i -e "s|.*%{geronimo_home}[/]*/RELEASE-NOTES-%{version}.txt||g" %{commons_file_list} -install -m 1777 -d $RPM_BUILD_ROOT/%{_localstatedir}/cache/%{name}-%{version} -ln -sf %{_localstatedir}/cache/%{name}-%{version} $RPM_BUILD_ROOT/%{geronimo_home}/deploy +install -m 644 -d $RPM_BUILD_ROOT/%{deploy_dir} +ln -sf %{deploy_dir} $RPM_BUILD_ROOT/%{geronimo_home}/deploy # create a geronimo base install -d -m 755 $RPM_BUILD_ROOT/srv/www/geronimo/base pushd $RPM_BUILD_ROOT/srv/www/geronimo/base @@ -486,8 +489,8 @@ %{_sysconfdir}/init.d/%{name} %{_localstatedir}/log/%{name} /usr/sbin/rc%{name} -%{geronimo_home}/deploy -%attr(1777,root,root) %{_localstatedir}/cache/%{name}-%{version} +%attr(755,root,root) %{geronimo_home}/deploy +%attr(755,root,root) %{deploy_dir} #<<< main end #>>> tomcat @@ -503,9 +506,13 @@ %{_sysconfdir}/%{name}/config%{jetty_suffix} #<<< jetty #<<< files end -# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: +# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42: %changelog -n geronimo +* Wed Oct 04 2006 - dbornkessel@suse.de +- changed persmissions of deploy directory +- cleaned up geronimo start script and sysconfig file: +- introduced GERONIMO_USER and GERONIMO_GROUP variables * Thu Sep 14 2006 - dbornkessel@suse.de - update to version 1.1 - cleaned up build process (use original tgz's ... not prepared ones) ++++++ rcgeronimo ++++++ --- geronimo/rcgeronimo 2006-09-14 11:47:30.000000000 +0200 +++ /mounts/work_src_done/NOARCH/geronimo/rcgeronimo 2006-10-02 18:36:40.000000000 +0200 @@ -53,6 +53,9 @@ # Read config . "$GERONIMO_CONFIG" +test -n "$GERONIMO_USER" || GERONIMO_USER="geronimo" +test -n "$GERONIMO_GROUP" || GERONIMO_GROUP="geronimo" + if [ ${#JRE_HOME} -eq 0 ] then JRE_HOME=$(dirname `dirname \`readlink -f /etc/alternatives/java\``) @@ -110,8 +113,6 @@ ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - chown -R -L geronimo:geronimo $GERONIMO_BASE/var - #startproc -p $GERONIMO_PID -u geronimo -g geronimo -l $GERONIMO_OUT $JAVA_HOME/bin/java -jar $GERONIMO_BIN export GERONIMO_HOME=$GERONIMO_HOME export GERONIMO_BASE=$GERONIMO_BASE export GERONIMO_OPTS=$GERONIMO_OPTS @@ -126,13 +127,23 @@ export JPDA_TRANSPORT=$JPDA_TRANSPORT export JPDA_ADDRESS=$JPDA_ADDRESS export START_OS_CMD=$START_OS_CMD + export GERONIMO_GROUP=$GERONIMO_GROUP + export GERONIMO_USER=$GERONIMO_USER + export GERONIMO_DEPLOY=$GERONIMO_DEPLOY + + chown -R -L --dereference $GERONIMO_USER:$GERONIMO_GROUP $GERONIMO_BASE/var + chown -R -L --dereference $GERONIMO_USER:$GERONIMO_GROUP $GERONIMO_DEPLOY/ # make pid file writeable to user 'geronimo' - touch $GERONIMO_PID - chown geronimo:geronimo $GERONIMO_PID + if [ ! -e $GERONIMO_PID ] + then + echo 42 > $GERONIMO_PID + fi + + chown $GERONIMO_USER:$GERONIMO_GROUP $GERONIMO_PID - su geronimo -m -c "cd $GERONIMO_BASE; $GERONIMO_HOME/bin/startup.sh &" + startproc -u $GERONIMO_USER -g $GERONIMO_GROUP -l $GERONIMO_OUT -p $GERONIMO_PID $GERONIMO_HOME/bin/startup.sh echo see $GERONIMO_OUT for log messages ++++++ sysconfig.geronimo ++++++ --- geronimo/sysconfig.geronimo 2006-09-14 11:44:25.000000000 +0200 +++ /mounts/work_src_done/NOARCH/geronimo/sysconfig.geronimo 2006-10-02 18:37:01.000000000 +0200 @@ -139,3 +139,31 @@ # with in a specified CPU or priority. # START_OS_CMD="" + +## Path: Network/WWW/J2EE/Geronimo +## Type: string +## Default: "geronimo" +# +# Defines which user the geronimo base directory should belong to and +# with which user tomcat gets started +# +GERONIMO_USER="geronimo" + +## Path: Network/WWW/J2EE/Geronimo +## Type: string +## Default: "geronimo" +# +# Defines which group the tomcat base directory should belong to and +# with which group tomcat gets started +# +GERONIMO_GROUP="geronimo" + + +## Path: Network/WWW/J2EE/Geronimo +## Type: string +## Default: "@@DEPLOY_DIR@@" +# +# Defines which group the tomcat base directory should belong to and +# with which group tomcat gets started +# +GERONIMO_DEPLOY="@@DEPLOY_DIR@@" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org