java-sig-commits May 2011

java-sig-commits@lists.fedoraproject.org

10 participants
215 discussions

[tomcat: 45/66] Resolves: rhbz#66969 - tomcat-jdbc missing. Resolves problem running multiple instances of tomcat se
by Ivan Afonichev 25 May '11

25 May '11

commit 6b3301f8ed03fbf720655cf1bdb9ab81424e0c3e Author: david knox <dknox(a)78-97-42-72.skybeam.com> Date: Mon Jan 17 12:01:02 2011 -0700 Resolves: rhbz#66969 - tomcat-jdbc missing. Resolves problem running multiple instances of tomcat services. References to hardcoded directory locations in tomcat6-6.0.init have been changed to . tomcat6-6.0.init | 14 +++++++------- tomcat6.spec | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) --- diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init index 4123f1c..43f53a4 100644 --- a/tomcat6-6.0.init +++ b/tomcat6-6.0.init @@ -43,17 +43,17 @@ else SU="/bin/su -s /bin/sh" fi -# Get the tomcat config (use this for environment specific settings) -TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" -if [ -r "$TOMCAT_CFG" ]; then - . $TOMCAT_CFG -fi - # Get instance specific config file if [ -r "/etc/sysconfig/${NAME}" ]; then . /etc/sysconfig/${NAME} fi +# Get the tomcat config (use this for environment specific settings) +TOMCAT_CFG="${CATALINA_HOME}/conf/tomcat6.conf" +if [ -r "$TOMCAT_CFG" ]; then + . $TOMCAT_CFG +fi + # Define which connector port to use CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" @@ -67,7 +67,7 @@ TOMCAT_PROG="${NAME}" TOMCAT_USER="${TOMCAT_USER:-tomcat}" # Define the tomcat log file -TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}" +TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/catalina.out}" RETVAL="0" diff --git a/tomcat6.spec b/tomcat6.spec index f6eba5c..d7de59a 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -53,7 +53,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -560,6 +560,12 @@ fi %{appdir}/sample %changelog +* Mon Jan 17 2011 David Knox <dknox(a)redhat.com> 0:6.0.29-2 +- Resolves: rhbz# 669969 - tomcat-jdbc missing +- Resolves problem with multiple instances of tomcat services. References to +- hardcoded directory locations have been changed to ${CATALINA_HOME] +- to avoid confusion + * Mon Jan 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.29-1 - Update to new upstream. - Simplify buildroot.

1 0

[tomcat: 44/66] Update to new upstream.
by Ivan Afonichev 25 May '11

25 May '11

commit 7f5f5fa0ddf1ac6da2ed2b4ccba009515cea928a Author: Alexander Kurtakov <akurtako(a)redhat.com> Date: Mon Jan 3 10:54:46 2011 +0200 Update to new upstream. - Simplify buildroot. - Don't require files but packages. .gitignore | 1 + sources | 3 +- tomcat6-6.0-CVE-2010-2227.patch | 138 --------------------------------------- tomcat6.spec | 65 +++++++++---------- 4 files changed, 32 insertions(+), 175 deletions(-) --- diff --git a/.gitignore b/.gitignore index 15a50ac..6590968 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ apache-tomcat-6.0.18-src.tar.gz apache-tomcat-6.0.20-src.tar.gz apache-tomcat-6.0.24-src.tar.gz apache-tomcat-6.0.26-src.tar.gz +apache-tomcat-6.0.29-src.tar.gz diff --git a/sources b/sources index ddb95cc..8f99d1e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -543218290008e0dd6a329f69136973ca apache-tomcat-6.0.24-src.tar.gz -83b46d9346bcbc517dbf6f1cac9ef8b1 apache-tomcat-6.0.26-src.tar.gz +260de5ae62f415b9c085c5aeed4ef24c apache-tomcat-6.0.29-src.tar.gz diff --git a/tomcat6.spec b/tomcat6.spec index 2ffe8cd..f6eba5c 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -28,12 +28,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%global section free - %global jspspec 2.1 %global major_version 6 %global minor_version 0 -%global micro_version 26 +%global micro_version 29 %global packdname apache-tomcat-%{version}-src %global servletspec 2.5 %global elspec 2.1 @@ -55,7 +53,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 18%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -74,7 +72,6 @@ Source9: jsp-api-OSGi-MANIFEST.MF Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -Patch2: %{name}-%{major_version}.%{minor_version}-CVE-2010-2227.patch BuildArch: noarch @@ -99,10 +96,10 @@ Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils Requires(pre): shadow-utils -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(post): /lib/lsb/init-functions -Requires(preun): /lib/lsb/init-functions +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(post): redhat-lsb +Requires(preun): redhat-lsb Requires(post): jpackage-utils Requires(postun): jpackage-utils @@ -148,8 +145,8 @@ Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp21 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): chkconfig +Requires(postun): chkconfig %description jsp-%{jspspec}-api Apache Tomcat JSP API implementation classes. @@ -176,8 +173,8 @@ Summary: Apache Tomcat Servlet API implementation classes Provides: servlet = %{servletspec} Provides: servlet6 Provides: servlet25 -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): chkconfig +Requires(postun): chkconfig %description servlet-%{servletspec}-api Apache Tomcat Servlet API implementation classes. @@ -187,8 +184,8 @@ Group: Development/Libraries/Java Summary: Expression Language v1.0 API Provides: el_1_0_api = %{epoch}:%{version}-%{release} Provides: el_api = %{elspec} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): chkconfig +Requires(postun): chkconfig %description el-%{elspec}-api Expression Language 1.0. @@ -203,23 +200,18 @@ Requires: jakarta-taglibs-standard >= 0:1.1 The ROOT and examples web applications for Apache Tomcat. %prep -%setup -q -c -T -a 0 +%setup -q -n %{packdname} # remove pre-built binaries and windows files find . -type f $ -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ -name "*.jar" -o -name "*.war" -o -name "*.zip" $ -delete -pushd %{packdname} %patch0 -p0 %patch1 -p0 -%patch2 -p0 %{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar -popd %build -export CLASSPATH= -export OPT_JAR_LIST="ant/ant-nodeps" -pushd %{packdname} +export OPT_JAR_LIST="xalan-j2-serializer" # we don't care about the tarballs and we're going to replace # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal @@ -229,7 +221,7 @@ pushd %{packdname} -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ - -Dcommons-daemon.jsvc.tar.gz="HACK" \ + -Dcommons-daemon.native.src.tgz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \ @@ -241,13 +233,11 @@ pushd %{packdname} %{ant} -f dist.xml dist-source %{ant} -f dist.xml dist-javadoc # remove some jars that we'll replace with symlinks later - %{__rm} output/build/bin/apache-commons-daemon.jar \ + %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar # remove the cruft we created - %{__rm} output/build/bin/HACK \ - output/build/bin/tomcat-native.tar.gz -popd -pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src + %{__rm} output/build/bin/tomcat-native.tar.gz +pushd output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes %{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java pushd ../web @@ -259,10 +249,10 @@ popd mkdir -p META-INF cp -p %{SOURCE8} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF +zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF cp -p %{SOURCE9} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF -zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF +zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF %install # build initial path structure @@ -284,7 +274,7 @@ zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF # move things into place # First copy supporting libs to tomcat lib -pushd %{packdname}/output/build +pushd output/build %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} %{__cp} %{SOURCE10} conf/log4j.properties %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} @@ -292,7 +282,7 @@ pushd %{packdname}/output/build %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd # javadoc -%{__cp} -a %{packdname}/output/dist/webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +%{__cp} -a output/dist/webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ @@ -327,7 +317,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir} %{__ln_s} %{name}-el-%{elspec}-api.jar %{name}-el-api.jar popd -pushd %{packdname}/output/build +pushd output/build %{_bindir}/build-jar-repository lib apache-commons-collections \ apache-commons-dbcp apache-commons-pool ecj 2>&1 # need to use -p here with b-j-r otherwise the examples webapp fails to @@ -377,7 +367,7 @@ mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir} # Install the maven metadata %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} -pushd %{packdname}/output/dist/src/res/maven +pushd output/dist/src/res/maven for pom in *.pom; do # fix-up version in all pom files sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom @@ -486,7 +476,7 @@ fi %files %defattr(-,root,tomcat,-) -%doc %{packdname}/{LICENSE,NOTICE,RELEASE*} +%doc {LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper %attr(0755,root,root) %{_sbindir}/d%{name} @@ -570,6 +560,11 @@ fi %{appdir}/sample %changelog +* Mon Jan 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.29-1 +- Update to new upstream. +- Simplify buildroot. +- Don't require files but packages. + * Wed Dec 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-18 - Add api jars without spec version symlinks - Remove clean section

1 0

[tomcat: 43/66] Add api jars without spec version symlinks
by Ivan Afonichev 25 May '11

25 May '11

commit fb3cd5e3cea29c30110bd687e4fef9fee6bae195 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Dec 8 10:41:11 2010 +0100 Add api jars without spec version symlinks - Remove clean section - Remove whitespaces at the EOLs tomcat6.spec | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index d9a2c5c..2ffe8cd 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -55,7 +55,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 17%{?dist} +Release: 18%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -245,7 +245,7 @@ pushd %{packdname} output/build/lib/ecj.jar # remove the cruft we created %{__rm} output/build/bin/HACK \ - output/build/bin/tomcat-native.tar.gz + output/build/bin/tomcat-native.tar.gz popd pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src %{__mkdir_p} ../web/WEB-INF/classes @@ -265,7 +265,6 @@ touch META-INF/MANIFEST.MF zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF %install -%{__rm} -rf $RPM_BUILD_ROOT # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} @@ -321,8 +320,11 @@ popd # create jsp and servlet API symlinks pushd ${RPM_BUILD_ROOT}%{_javadir} %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar + %{__ln_s} %{name}-jsp-%{jspspec}-api.jar %{name}-jsp-api.jar %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar + %{__ln_s} %{name}-servlet-%{servletspec}-api.jar %{name}-servlet-api.jar %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar + %{__ln_s} %{name}-el-%{elspec}-api.jar %{name}-el-api.jar popd pushd %{packdname}/output/build @@ -338,7 +340,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} # symlink JSP and servlet API jars %{__ln_s} ../%{name}-jsp-%{jspspec}-api.jar . %{__ln_s} ../%{name}-servlet-%{servletspec}-api.jar . - %{__ln_s} ../%{name}-el-%{elspec}-api.jar + %{__ln_s} ../%{name}-el-%{elspec}-api.jar . %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath log4j) log4j.jar @@ -366,7 +368,7 @@ popd %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war -# Generate a depmap fragment javax.servlet:servlet-api pointing to +# Generate a depmap fragment javax.servlet:servlet-api pointing to # tomcat6-servlet-2.5-api for backwards compatibility %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api # also provide jetty depmap (originally in jetty package, but it's cleaner to have it here) @@ -404,17 +406,13 @@ done %add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli -%clean -%{__rm} -rf $RPM_BUILD_ROOT - - %pre # add the tomcat user and group %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || : %{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \ -s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || : # Save the conf, app, and lib dirs -# due to rbgz 640686. Copy them to the _tmppath so we don't pollute +# due to rbgz 640686. Copy them to the _tmppath so we don't pollute # the tomcat file structure [ -d %{appdir} ] && %{__cp} -rp %{appdir} %{_tmppath}/%{name}-webapps.bak || : [ -d %{confdir} ] && %{__cp} -rp %{confdir} %{_tmppath}/%{name}-confdir.bak || : @@ -544,6 +542,7 @@ fi %files jsp-%{jspspec}-api %defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%{_javadir}/%{name}-jsp-api.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom %files lib @@ -553,13 +552,14 @@ fi %files servlet-%{servletspec}-api %defattr(-,root,root,-) %{_javadir}/%{name}-servlet-%{servletspec}*.jar +%{_javadir}/%{name}-servlet-api.jar %{_mavendepmapfragdir}/%{name}-servlet-api %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files el-%{elspec}-api %defattr(-,root,root,-) %{_javadir}/%{name}-el-%{elspec}-api.jar -%{_javadir}/%{name}-el-%{elspec}-api.jar +%{_javadir}/%{name}-el-api.jar %{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar %{_mavenpomdir}/JPP-%{name}-el-api.pom @@ -570,6 +570,11 @@ fi %{appdir}/sample %changelog +* Wed Dec 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-18 +- Add api jars without spec version symlinks +- Remove clean section +- Remove whitespaces at the EOLs + * Mon Dec 6 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-17 - Add jetty to servlet-api depmap @@ -585,7 +590,7 @@ fi * Mon Nov 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-14 - Resolving rhbz 640686: save appdir, confdir, and libdir during - pre and copy them back during posttrans. The directories are -- copied to /var/tmp. They are copied back during posttrans and +- copied to /var/tmp. They are copied back during posttrans and - removed from /var/tmp. * Tue Nov 9 2010 Chris Spike <chris.spike(a)arcor.de> 0:6.0.26-13 @@ -593,7 +598,7 @@ fi * Thu Oct 14 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-12 - Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories -- WARNING - Back up all files that need to be preserved before +- WARNING - Back up all files that need to be preserved before - package update or uninstall - WARNING - Resolves: rhbz#638914 - update versions of commons-collections, - commons-dbcp, and commons-pool @@ -602,15 +607,15 @@ fi - resolves rhbz#640837 - tomcat user requires login shell * Mon Oct 04 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-10 -- ant-nodeps is breaking the build. Put ant-nodeps on the +- ant-nodeps is breaking the build. Put ant-nodeps on the - OPT_JAR_LIST * Fri Oct 01 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-9 -- Resolves rhbz#575341 - Additionally created instances of Tomcat +- Resolves rhbz#575341 - Additionally created instances of Tomcat - are broken * Fri Jul 02 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-8 -- LSB initscript compliance +- LSB initscript compliance * Thu Jul 01 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-7 - Made elspec the standard for elspec %post and %postun. @@ -623,7 +628,7 @@ fi - Working on 589145. Tomcat can't find java compiler for java. * Tue Apr 08 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-4 -- Moved build-jar-repository to later in the install process. +- Moved build-jar-repository to later in the install process. * Tue Apr 06 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-3 - Incremented the Release tag to 3 to avoid any confusion about which @@ -636,7 +641,7 @@ fi * Mon Mar 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-2 - Update source to tomcat6.0.26 -- Bugzilla 572357 - Please retest. +- Bugzilla 572357 - Please retest. - OSGi manifests for servlet-api and jsp-api @@ -651,7 +656,7 @@ fi - Drop file requires on /usr/share/java/ecj.jar. * Mon Nov 9 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.20-1 -- Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580. +- Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580. * Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-10.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

1 0

[tomcat: 42/66] Add jetty to servlet-api depmap
by Ivan Afonichev 25 May '11

25 May '11

commit 3c9662b6608d548d4e0ed4d191211f5cb44f8b70 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Mon Dec 6 10:24:18 2010 +0100 Add jetty to servlet-api depmap tomcat6.spec | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 700f85d..d9a2c5c 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -55,7 +55,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 16%{?dist} +Release: 17%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -369,7 +369,9 @@ popd # Generate a depmap fragment javax.servlet:servlet-api pointing to # tomcat6-servlet-2.5-api for backwards compatibility %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api -mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api +# also provide jetty depmap (originally in jetty package, but it's cleaner to have it here) +%add_to_maven_depmap org.mortbay.jetty servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api +mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api # Install the maven metadata %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} @@ -568,6 +570,9 @@ fi %{appdir}/sample %changelog +* Mon Dec 6 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-17 +- Add jetty to servlet-api depmap + * Thu Dec 2 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-16 - Fixes according to guidelines (versionless jars, no random defattrs) - Simplify pom installation by splitting to more steps

1 0

[tomcat: 41/66] Add changelog entry for past changes
by Ivan Afonichev 25 May '11

25 May '11

commit 9f57789c2fa99fd99a1efae6017086db1be26265 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Dec 2 17:18:47 2010 +0100 Add changelog entry for past changes tomcat6.spec | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 0a66a04..700f85d 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -568,6 +568,12 @@ fi %{appdir}/sample %changelog +* Thu Dec 2 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-16 +- Fixes according to guidelines (versionless jars, no random defattrs) +- Simplify pom installation by splitting to more steps +- Formatting cleanups +- Removed log4j subpackage (used bundled log4j, replaced by symlink) + * Thu Dec 2 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-15 - Fix log4j symlink (Resolves rhbz#654660)

1 0

[tomcat: 40/66] Fixes according to guidelines
by Ivan Afonichev 25 May '11

25 May '11

commit 89cd8cabea43b22f4efd84e7e0fa320cbeadc646 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Dec 2 17:15:01 2010 +0100 Fixes according to guidelines - versionless jars - no defattrs with random permissions tomcat6.spec | 85 ++++++++++++++++++++------------------------------------- 1 files changed, 30 insertions(+), 55 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 666ca62..0a66a04 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -206,7 +206,8 @@ The ROOT and examples web applications for Apache Tomcat. %setup -q -c -T -a 0 # remove pre-built binaries and windows files find . -type f $ -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ - -name "*.jar" -o -name "*.war" -o -name "*.zip" $ | xargs -t %{__rm} + -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete + pushd %{packdname} %patch0 -p0 %patch1 -p0 @@ -240,8 +241,8 @@ pushd %{packdname} %{ant} -f dist.xml dist-source %{ant} -f dist.xml dist-javadoc # remove some jars that we'll replace with symlinks later - %{__rm} output/build/bin/commons-daemon.jar \ - output/build/lib/ecj.jar + %{__rm} output/build/bin/apache-commons-daemon.jar \ + output/build/lib/ecj.jar # remove the cruft we created %{__rm} output/build/bin/HACK \ output/build/bin/tomcat-native.tar.gz @@ -292,9 +293,8 @@ pushd %{packdname}/output/build %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd # javadoc -pushd %{packdname}/output/dist/webapps - %{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} -popd +%{__cp} -a %{packdname}/output/dist/webapps/docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} + %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \ @@ -320,15 +320,9 @@ popd > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper # create jsp and servlet API symlinks pushd ${RPM_BUILD_ROOT}%{_javadir} - %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar - %{__mv} %{name}/servlet-api.jar \ - %{name}-servlet-%{servletspec}-api-%{version}.jar - %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api-%{version}.jar - %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar \ - %{name}-jsp-%{jspspec}-api.jar - %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \ - %{name}-servlet-%{servletspec}-api.jar - %{__ln_s} %{name}-el-%{elspec}-api-%{version}.jar %{name}-el-%{elspec}-api.jar + %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar + %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar + %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar popd pushd %{packdname}/output/build @@ -341,31 +335,19 @@ pushd %{packdname}/output/build popd pushd ${RPM_BUILD_ROOT}%{libdir} - # fix up jars to include version number - for i in *.jar; do - j="$(echo $i | %{__sed} -e 's,\.jar$,,')" - %{__mv} ${j}.jar ${j}-%{version}.jar - %{__ln_s} ${j}-%{version}.jar ${j}.jar - done # symlink JSP and servlet API jars - %{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar . - %{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar . - %{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar - %{__cp} -p $(build-classpath commons-collections) . - %{__cp} -p $(build-classpath log4j) . - %{__ln_s} log4j.jar log4j-%{version}.jar -# %{__ln_s} $(build-classpath commons-dbcp) . -# %{__ln_s} $(build-classpath commons-pool) . + %{__ln_s} ../%{name}-jsp-%{jspspec}-api.jar . + %{__ln_s} ../%{name}-servlet-%{servletspec}-api.jar . + %{__ln_s} ../%{name}-el-%{elspec}-api.jar + %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar + %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar + %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar + + # Link the juli jar into /usr/share/java/tomcat6 + %{__ln_s} %{bindir}/tomcat-juli.jar . popd -pushd ${RPM_BUILD_ROOT}%{bindir} - # fix up jars to include version number - for i in *.jar; do - j="$(echo $i | %{__sed} -e 's,\.jar$,,')" - %{__mv} ${j}.jar ${j}-%{version}.jar - %{__ln_s} ${j}-%{version}.jar ${j}.jar - done -popd + # symlink to the FHS locations where we've installed things pushd ${RPM_BUILD_ROOT}%{homedir} %{__ln_s} %{appdir} webapps @@ -383,10 +365,6 @@ pushd ${RPM_BUILD_ROOT}%{appdir}/sample popd %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war -# Link the juli jars into /usr/share/java/tomcat6 -pushd ${RPM_BUILD_ROOT}%{libdir} -%{__ln_s} %{bindir}/tomcat-juli* . -popd # Generate a depmap fragment javax.servlet:servlet-api pointing to # tomcat6-servlet-2.5-api for backwards compatibility @@ -507,7 +485,7 @@ if [ "$1" = "0" ]; then fi %files -%defattr(0644,root,tomcat,0775) +%defattr(-,root,tomcat,-) %doc %{packdname}/{LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper @@ -534,11 +512,8 @@ fi %attr(0765,tomcat,root) %dir %{workdir} %attr(0765,root,tomcat) %dir %{logdir} %dir %{homedir} -#%attr(0765,root,tomcat) %{homedir}/conf -%{bindir}/bootstrap-%{version}.jar %{bindir}/bootstrap.jar %{bindir}/catalina-tasks.xml -%{bindir}/tomcat-juli-%{version}.jar %{bindir}/tomcat-juli.jar %{homedir}/lib %{homedir}/temp @@ -552,42 +527,42 @@ fi %exclude %{_mavenpomdir}/*api* %files admin-webapps -%defattr(0644,root,root,0775) +%defattr(-,root,root,-) %{appdir}/host-manager %{appdir}/manager %files docs-webapp -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{appdir}/docs %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadocdir}/%{name} %files jsp-%{jspspec}-api -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom %files lib -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{libdir} %files servlet-%{servletspec}-api -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}-servlet-%{servletspec}*.jar %{_mavendepmapfragdir}/%{name}-servlet-api %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files el-%{elspec}-api -%defattr(0665,root,root,0755) -%{_javadir}/%{name}-el-%{elspec}-api-%{version}.jar +%defattr(-,root,root,-) +%{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-%{elspec}-api.jar -%{_javadir}/%{name}/%{name}-el-%{elspec}-api-%{version}.jar +%{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar %{_mavenpomdir}/JPP-%{name}-el-api.pom %files webapps -%defattr(0644,root,tomcat,0775) +%defattr(-,root,tomcat,-) %{appdir}/ROOT %{appdir}/examples %{appdir}/sample

1 0

[tomcat: 39/66] Removed log4j sub-package with bundled log4j (replaced by system symlink)
by Ivan Afonichev 25 May '11

25 May '11

commit 5746174c039169deb2a1032b2b03bada4dc77f75 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Dec 2 17:13:44 2010 +0100 Removed log4j sub-package with bundled log4j (replaced by system symlink) tomcat6.spec | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 969b8b4..666ca62 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -106,6 +106,9 @@ Requires(preun): /lib/lsb/init-functions Requires(post): jpackage-utils Requires(postun): jpackage-utils +# added after log4j sub-package was removed +Provides: %{name}-log4j = %{epoch}:%{version}-%{release} + %description Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. @@ -152,14 +155,6 @@ Requires(postun): %{_sbindir}/update-alternatives Apache Tomcat JSP API implementation classes. -%package log4j -Group: Internet/WWW/Dynamic Content -Summary: Log4j support for Apache Tomcat -Requires: jakarta-commons-logging - -%description log4j -Log4j support for Apache Tomcat - %package lib Group: Development/Compilers Summary: Libraries needed to run the Tomcat Web container @@ -531,6 +526,7 @@ fi %config(noreplace) %{confdir}/*.properties %config(noreplace) %{confdir}/context.xml %config(noreplace) %{confdir}/server.xml +%config(noreplace) %{confdir}/log4j.properties %attr(0664,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %config(noreplace) %{confdir}/web.xml %attr(0765,tomcat,root) %dir %{cachedir} @@ -573,12 +569,6 @@ fi %{_javadir}/%{name}-jsp-%{jspspec}*.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom -%files log4j -%defattr(0644,root,tomcat,0775) -%config(noreplace) %{confdir}/log4j.properties -%{libdir}/log4j.jar -%{libdir}/log4j-%{version}.jar - %files lib %defattr(0644,root,root,0755) %{libdir}

1 0

[tomcat: 38/66] Formatting cleanups and jakarta-commons->apache-commons rename
by Ivan Afonichev 25 May '11

25 May '11

commit 8ebe6511f36b6c411540c607be1ed33378ff8d21 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Dec 2 17:10:02 2010 +0100 Formatting cleanups and jakarta-commons->apache-commons rename - Removed comments (no need for them, we have git history) - Indentation tomcat6.spec | 131 ++++++++++++++++++++++++---------------------------------- 1 files changed, 54 insertions(+), 77 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 2f3f8f3..969b8b4 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -52,60 +52,58 @@ %global workdir %{cachedir}/work %global _initrddir %{_sysconfdir}/init.d -Name: tomcat6 -Epoch: 0 -Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 15%{?dist} -Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API - -Group: Networking/Daemons -License: ASL 2.0 -URL: http://tomcat.apache.org/ -Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar… -Source1: %{name}-%{major_version}.%{minor_version}.conf -Source2: %{name}-%{major_version}.%{minor_version}.init -Source3: %{name}-%{major_version}.%{minor_version}.sysconfig -Source4: %{name}-%{major_version}.%{minor_version}.wrapper -Source5: %{name}-%{major_version}.%{minor_version}.logrotate -Source6: %{name}-%{major_version}.%{minor_version}-digest.script -Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script -Source8: servlet-api-OSGi-MANIFEST.MF -Source9: jsp-api-OSGi-MANIFEST.MF -Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties -Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch -Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -Patch2: %{name}-%{major_version}.%{minor_version}-CVE-2010-2227.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch +Name: tomcat6 +Epoch: 0 +Version: %{major_version}.%{minor_version}.%{micro_version} +Release: 16%{?dist} +Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API + +Group: Networking/Daemons +License: ASL 2.0 +URL: http://tomcat.apache.org/ +Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar… +Source1: %{name}-%{major_version}.%{minor_version}.conf +Source2: %{name}-%{major_version}.%{minor_version}.init +Source3: %{name}-%{major_version}.%{minor_version}.sysconfig +Source4: %{name}-%{major_version}.%{minor_version}.wrapper +Source5: %{name}-%{major_version}.%{minor_version}.logrotate +Source6: %{name}-%{major_version}.%{minor_version}-digest.script +Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script +Source8: servlet-api-OSGi-MANIFEST.MF +Source9: jsp-api-OSGi-MANIFEST.MF +Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties +Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch +Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch +Patch2: %{name}-%{major_version}.%{minor_version}-CVE-2010-2227.patch + +BuildArch: noarch + BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ecj BuildRequires: findutils BuildRequires: jakarta-commons-collections -#BuildRequires: jakarta-commons-collections-tomcat5 -BuildRequires: jakarta-commons-daemon -#BuildRequires: jakarta-commons-dbcp-tomcat5 -#BuildRequires: jakarta-commons-pool-tomcat5 -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-pool +BuildRequires: apache-commons-daemon +BuildRequires: apache-commons-dbcp +BuildRequires: apache-commons-pool BuildRequires: jakarta-taglibs-standard BuildRequires: java-1.6.0-devel BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j -Requires(pre): shadow-utils -Requires(pre): shadow-utils -Requires: jakarta-commons-daemon -Requires: jakarta-commons-logging -Requires: jakarta-commons-collections -Requires: java-1.6.0 -Requires: procps -Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(post): /lib/lsb/init-functions -Requires(preun): /lib/lsb/init-functions -Requires(post): jpackage-utils +Requires: apache-commons-daemon +Requires: apache-commons-logging +Requires: apache-commons-collections +Requires: java-1.6.0 +Requires: procps +Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Requires(pre): shadow-utils +Requires(pre): shadow-utils +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(post): /lib/lsb/init-functions +Requires(preun): /lib/lsb/init-functions +Requires(post): jpackage-utils Requires(postun): jpackage-utils %description @@ -169,9 +167,9 @@ Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: ecj -Requires: jakarta-commons-collections -Requires: jakarta-commons-dbcp -Requires: jakarta-commons-pool +Requires: apache-commons-collections +Requires: apache-commons-dbcp +Requires: apache-commons-pool Requires(preun): coreutils %description lib @@ -227,18 +225,18 @@ export CLASSPATH= export OPT_JAR_LIST="ant/ant-nodeps" pushd %{packdname} # we don't care about the tarballs and we're going to replace - # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar + # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ - -Dcommons-collections.jar="$(build-classpath jakarata-commons-collections)" \ - -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ + -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ + -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dcommons-daemon.jsvc.tar.gz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ - -Dtomcat-dbcp.jar="$(build-classpath commons-dbcp)" \ + -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \ -Dtomcat-native.tar.gz="HACK" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" @@ -339,11 +337,11 @@ pushd ${RPM_BUILD_ROOT}%{_javadir} popd pushd %{packdname}/output/build - %{_bindir}/build-jar-repository lib commons-collections \ - commons-dbcp commons-pool ecj 2>&1 -# need to use -p here with b-j-r otherwise the examples webapp fails to -# load with a java.io.IOException - %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ + %{_bindir}/build-jar-repository lib apache-commons-collections \ + apache-commons-dbcp apache-commons-pool ecj 2>&1 + # need to use -p here with b-j-r otherwise the examples webapp fails to + # load with a java.io.IOException + %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ taglibs-core.jar taglibs-standard.jar 2>&1 popd @@ -456,10 +454,6 @@ done %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 -#%post lib -#%{_bindir}/build-jar-repository %{libdir} commons-collections-tomcat5 \ -# commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1 - %post servlet-%{servletspec}-api %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 @@ -469,11 +463,6 @@ done %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ %{_javadir}/%{name}-el-%{elspec}-api.jar 20250 -#%post webapps -# need to use -p here with b-j-r otherwise the examples webapp fails to -# load with a java.io.IOException -#%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \ -# taglibs-core.jar taglibs-standard.jar 2>&1 # move the temporary backups to the correct tomcat directory # due to rhbz 640686 @@ -499,19 +488,9 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del %{name} fi -#%preun lib -#if [ "$1" = "0" ]; then -# %{__rm} -f %{libdir}/\[commons-collections-tomcat5\].jar \ -# %{libdir}/\[commons-dbcp-tomcat5\].jar \ -# %{libdir}/\[commons-pool-tomcat5\].jar \ -# %{libdir}/\[ecj\].jar >/dev/null 2>&1 -#fi %postun %update_maven_depmap -#%{__rm} -rf %{appdir} -#%{__rm} -rf %{confdir} -#%{__rm} -rf %{libdir} %postun jsp-%{jspspec}-api if [ "$1" = "0" ]; then @@ -546,8 +525,6 @@ fi %attr(0765,root,tomcat) %dir %{appdir} %attr(0765,root,tomcat) %dir %{confdir} %attr(0765,root,tomcat) %dir %{confdir}/Catalina -#%dir %{confdir} -#%dir %{confdir}/Catalina %attr(0765,root,tomcat) %dir %{confdir}/Catalina/localhost %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy

1 0

[tomcat: 37/66] Simplify pom installation by splitting to more steps
by Ivan Afonichev 25 May '11

25 May '11

commit 02259b07eac2259ee623661a49592861cf09fa83 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Dec 2 17:04:52 2010 +0100 Simplify pom installation by splitting to more steps Originally 'coyote' pom was in 2 different if branches, only first could ever be reached. There were also problems with pom names being different than suggested by add_to_maven_depmap calls tomcat6.spec | 55 +++++++++++++++++++++++++------------------------------ 1 files changed, 25 insertions(+), 30 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 8eb219e..2f3f8f3 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -403,38 +403,33 @@ mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir} # Install the maven metadata %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} pushd %{packdname}/output/dist/src/res/maven -for file in *.pom; do - base=`basename $file .pom` - # Some POMs don't actually have corresponding jar files in the current RPM - if [ $base != 'dbcp' -a $base != 'juli-adapters' -a $base != 'juli-extras' ]; then - sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $file - %{__cp} -a $file ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$file - # Some jar files have tomcat6 prepended and some don't, and some have their - # canonical home outside of the tomcat6 subdirectory - jppdir="JPP/%{name}" - if [ $base = 'coyote' -o $base = 'jsp-api' -o $base = 'servlet-api' ]; then - jpp="%{name}-$base" - jppdir="JPP" - else - if [ $base = 'tribes' ]; then - jpp=catalina-$base - else - if [ $base = 'juli' -o $base = 'coyote' ]; then - jpp=tomcat-$base - else - jpp=$base - fi - fi - fi - - if [ $base = 'jasper-jdt' ]; then - %add_to_maven_depmap org.apache.tomcat $base %{version} JPP ecj 3.4.2 - else - %add_to_maven_depmap org.apache.tomcat $base %{version} $jppdir $jpp %{version} - fi - fi +for pom in *.pom; do + # fix-up version in all pom files + sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom done +# we won't install dbcp, juli-adapters and juli-extras pom files +for pom in annotations-api.pom catalina.pom jasper-el.pom jasper.pom \ + catalina-ha.pom el-api.pom jasper-jdt.pom; do + %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom + base=`basename $pom .pom` + %add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base +done + +# servlet-api jsp-api and el-api are not in tomcat6 subdir, since they are widely re-used elsewhere +for pom in jsp-api.pom servlet-api.pom el-api.pom;do + %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$pom + base=`basename $pom .pom` + %add_to_maven_depmap org.apache.tomcat $base %{version} JPP %{name}-$base +done + +# two special pom where jar files have different names +%{__cp} -a tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom +%add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes + +%{__cp} -a juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom +%add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli + %clean %{__rm} -rf $RPM_BUILD_ROOT

1 0

[tomcat: 36/66] Fix log4j symlink (Resolves rhbz#654660)
by Ivan Afonichev 25 May '11

25 May '11

commit 980e758c3200a2317d455a83595646c43de533c7 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Dec 2 15:04:43 2010 +0100 Fix log4j symlink (Resolves rhbz#654660) tomcat6.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index fa2fbbf..8eb219e 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -55,7 +55,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 14%{?dist} +Release: 15%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -360,7 +360,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar %{__cp} -p $(build-classpath commons-collections) . %{__cp} -p $(build-classpath log4j) . - %{__ln_s} log4j log4j-%{version}.jar + %{__ln_s} log4j.jar log4j-%{version}.jar # %{__ln_s} $(build-classpath commons-dbcp) . # %{__ln_s} $(build-classpath commons-pool) . %{__ln_s} $(build-classpath ecj) jasper-jdt.jar @@ -631,6 +631,9 @@ fi %{appdir}/sample %changelog +* Thu Dec 2 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:6.0.26-15 +- Fix log4j symlink (Resolves rhbz#654660) + * Mon Nov 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-14 - Resolving rhbz 640686: save appdir, confdir, and libdir during - pre and copy them back during posttrans. The directories are

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits May 2011