java-sig-commits May 2011

java-sig-commits@lists.fedoraproject.org

10 participants
215 discussions

[tomcat: 65/66] universify .gitignore
by Ivan Afonichev 25 May '11

25 May '11

commit 8b8a735314873268e9f2074710ef024e320268cb Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Thu May 26 01:27:09 2011 +0400 universify .gitignore .gitignore | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3cd0629..fd61fdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ -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 -apache-tomcat-6.0.30-src.tar.gz -apache-tomcat-6.0.32-src.tar.gz -apache-tomcat-7.0.12-src.tar.gz +apache-tomcat-*-src.tar.gz

1 0

[tomcat: 64/66] - Fixed http source link - Securify some permissions - Added licenses for el-api and servlet-api - A
by Ivan Afonichev 25 May '11

25 May '11

commit 5f0fcd834e180def4fb5701be5667a68509b5511 Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Sat May 21 01:44:00 2011 +0400 - Fixed http source link - Securify some permissions - Added licenses for el-api and servlet-api - Added dependency on jpackage-utils for the javadoc subpackage tomcat.spec | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) --- diff --git a/tomcat.spec b/tomcat.spec index ca1ad5c..0e81705 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,13 +53,13 @@ Name: tomcat 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: System Environment/Daemons License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar… +Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%… Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig @@ -135,6 +135,7 @@ The docs web application for Apache Tomcat. %package javadoc Group: Documentation Summary: Javadoc generated documentation for Apache Tomcat +Requires: jpackage-utils %description javadoc Javadoc generated documentation for Apache Tomcat. @@ -475,9 +476,15 @@ fi %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(0765,root,tomcat) %dir %{basedir} +%attr(0755,root,tomcat) %dir %{confdir} +%defattr(0664,root,tomcat,0770) +%attr(0770,root,tomcat) %dir %{logdir} +%attr(0660,tomcat,tomcat) %{logdir}/catalina.out +%attr(0770,root,tomcat) %dir %{cachedir} +%attr(0770,root,tomcat) %dir %{tempdir} +%attr(0770,root,tomcat) %dir %{workdir} %defattr(0664,root,tomcat,0775) %attr(0775,root,tomcat) %dir %{appdir} -%attr(0755,root,tomcat) %dir %{confdir} %attr(0775,root,tomcat) %dir %{confdir}/Catalina %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf @@ -488,11 +495,6 @@ fi %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/log4j.properties %attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml -%attr(0775,root,tomcat) %dir %{cachedir} -%attr(0775,root,tomcat) %dir %{tempdir} -%attr(0775,root,tomcat) %dir %{workdir} -%attr(0775,root,tomcat) %dir %{logdir} -%attr(0664,tomcat,tomcat) %{logdir}/catalina.out %dir %{homedir} %{bindir}/bootstrap.jar %{bindir}/catalina-tasks.xml @@ -510,7 +512,7 @@ fi %exclude %{_mavenpomdir}/*api* %files admin-webapps -%defattr(0664,root,tomcat,0775) +%defattr(0664,root,tomcat,0755) %{appdir}/host-manager %{appdir}/manager @@ -536,6 +538,7 @@ fi %files servlet-%{servletspec}-api %defattr(-,root,root,-) +%doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-api.jar %{_mavendepmapfragdir}/%{name}-servlet-api @@ -543,6 +546,7 @@ fi %files el-%{elspec}-api %defattr(-,root,root,-) +%doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-api.jar %{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar @@ -555,10 +559,16 @@ fi %{appdir}/sample %changelog -* Mon May 14 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.14-1 +* Sat May 21 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.14-2 +- Fixed http source link +- Securify some permissions +- Added licenses for el-api and servlet-api +- Added dependency on jpackage-utils for the javadoc subpackage + +* Sat May 14 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.14-1 - Updated to 7.0.14 -* Mon May 5 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-4 +* Thu May 5 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-4 - Provided local paths for libs - Fixed dependencies - Fixed update temp/work cleanup

1 0

[tomcat: 63/66] Switched to 7.0.14
by Ivan Afonichev 25 May '11

25 May '11

commit b44b78b8a334c4b1a69c8010f93a255ca6bf4f6a Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Sat May 14 17:49:50 2011 +0400 Switched to 7.0.14 sources | 1 + tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/sources b/sources index 99e67fa..bd4b8fc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ edfd253c21b51ccadce8ec05be5e61fb apache-tomcat-7.0.12-src.tar.gz +b6bfcf22694a548fad877de7d606e7ff apache-tomcat-7.0.14-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 52f4bd1..ca1ad5c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 12 +%global micro_version 14 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -555,6 +555,9 @@ fi %{appdir}/sample %changelog +* Mon May 14 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.14-1 +- Updated to 7.0.14 + * Mon May 5 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-4 - Provided local paths for libs - Fixed dependencies

1 0

[tomcat: 62/66] - Provided local paths for libs - Fixed dependencies - Fixed update temp/work cleanup
by Ivan Afonichev 25 May '11

25 May '11

commit 31d304e3da16f0e72812acfe9caa3be1bf5a774f Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Thu May 5 01:42:20 2011 +0400 - Provided local paths for libs - Fixed dependencies - Fixed update temp/work cleanup tomcat.spec | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) --- diff --git a/tomcat.spec b/tomcat.spec index 5e20be1..52f4bd1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -88,6 +88,8 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j +BuildRequires: geronimo-jaxrpc +BuildRequires: wsdl4j Requires: apache-commons-daemon Requires: apache-commons-logging Requires: apache-commons-collections @@ -97,7 +99,6 @@ Requires: java >= 1:1.6.0 Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils -Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig Requires(post): redhat-lsb @@ -216,6 +217,8 @@ export OPT_JAR_LIST="xalan-j2-serializer" # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK + %{__mkdir_p} HACKDIR + touch HACKDIR/build.xml # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ @@ -224,20 +227,21 @@ export OPT_JAR_LIST="xalan-j2-serializer" -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)" \ -Dtomcat-native.tar.gz="HACK" \ - -Dversion="%{version}" \ - -Dversion.build="%{micro_version}" - # javadoc generation - %{ant} -Dbase.path="." \ - -Dbuild.compiler="modern" \ - -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ - -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ - -Dcommons-daemon.native.src.tgz="HACK" \ - -Djasper-jdt.jar="$(build-classpath ecj)" \ - -Djdt.jar="$(build-classpath ecj)" \ + -Dtomcat-native.dll.win32="HACK" \ + -Dtomcat-native.dll.x64="HACK" \ + -Dtomcat-native.dll.i64="HACK" \ + -Dcommons-daemon.native.win.mgr.exe="HACK" \ + -Dnsis.exe="HACK" \ + -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ + -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dcommons-pool.home="HACKDIR" \ + -Dcommons-dbcp.home="HACKDIR" \ + -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - dist-prepare dist-source javadoc + deploy dist-prepare dist-source javadoc # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ @@ -431,7 +435,7 @@ done %preun # clean tempdir and workdir on removal or upgrade -%{__rm} -rf %{workdir} %{tempdir} +%{__rm} -rf %{workdir}/* %{tempdir}/* if [ "$1" = "0" ]; then %{_initrddir}/%{name} stop >/dev/null 2>&1 /sbin/chkconfig --del %{name} @@ -551,13 +555,17 @@ fi %{appdir}/sample %changelog +* Mon May 5 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-4 +- Provided local paths for libs +- Fixed dependencies +- Fixed update temp/work cleanup + * Mon May 2 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-3 - Fixed package groups - Fixed some permissions - Fixed some links - Removed old tomcat6 crap -%changelog * Thu Apr 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-2 - Package now named just tomcat instead of tomcat7 - Removed Provides: %{name}-log4j

1 0

[tomcat: 61/66] - Fixed package groups - Fixed some permissions - Fixed some links - Removed old tomcat6 crap
by Ivan Afonichev 25 May '11

25 May '11

commit 468fdbab7feddd284d195f102d44e17621a3c444 Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Mon May 2 02:09:32 2011 +0400 - Fixed package groups - Fixed some permissions - Fixed some links - Removed old tomcat6 crap tomcat.spec | 61 +++++++++++++++++++++++++++------------------------------- 1 files changed, 28 insertions(+), 33 deletions(-) --- diff --git a/tomcat.spec b/tomcat.spec index 67a2994..5e20be1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,10 +53,10 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API -Group: Networking/Daemons +Group: System Environment/Daemons License: ASL 2.0 URL: http://tomcat.apache.org/ Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar… @@ -116,7 +116,7 @@ released under the Apache Software License version 2.0. Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. %package admin-webapps -Group: System Environment/Applications +Group: Applications/System Summary: The host-manager and manager web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} @@ -124,7 +124,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} The host-manager and manager web applications for Apache Tomcat. %package docs-webapp -Group: System Environment/Applications +Group: Applications/Text Summary: The docs web application for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} @@ -139,7 +139,7 @@ Summary: Javadoc generated documentation for Apache Tomcat Javadoc generated documentation for Apache Tomcat. %package jsp-%{jspspec}-api -Group: Internet/WWW/Dynamic Content +Group: Development/Libraries Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} Provides: jsp22 @@ -152,7 +152,7 @@ Apache Tomcat JSP API implementation classes. %package lib -Group: Development/Compilers +Group: Development/Libraries Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} @@ -167,7 +167,7 @@ Requires(preun): coreutils Libraries needed to run the Tomcat Web container. %package servlet-%{servletspec}-api -Group: Internet/WWW/Dynamic Content +Group: Development/Libraries Summary: Apache Tomcat Servlet API implementation classes Provides: servlet = %{servletspec} Provides: servlet6 @@ -179,7 +179,7 @@ Requires(postun): chkconfig Apache Tomcat Servlet API implementation classes. %package el-%{elspec}-api -Group: Development/Libraries/Java +Group: Development/Libraries Summary: Expression Language v1.0 API Provides: el_1_0_api = %{epoch}:%{version}-%{release} Provides: el_api = %{elspec} @@ -190,7 +190,7 @@ Requires(postun): chkconfig Expression Language 1.0. %package webapps -Group: System Environment/Applications +Group: Applications/Internet Summary: The ROOT and examples web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} Requires: jakarta-taglibs-standard >= 0:1.1 @@ -276,6 +276,7 @@ zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir} /bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out +/bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> ${RPM_BUILD_ROOT}%{logdir}/catalina.out %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir} %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir} @@ -344,7 +345,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar - # Link the juli jar into /usr/share/java/tomcat + # Link the juli jar here from /usr/share/java/tomcat %{__ln_s} %{bindir}/tomcat-juli.jar . popd @@ -428,23 +429,6 @@ done %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ %{_javadir}/%{name}-el-%{elspec}-api.jar 20250 - -# move the temporary backups to the correct tomcat directory -# due to rhbz 640686 -%posttrans -if [ -d %{_tmppath}/%{name}-webapps.bak ]; then - %{__cp} -rp %{_tmppath}/%{name}-webapps.bak/* %{appdir} - %{__rm} -rf %{_tmppath}/%{name}-webapps.bak -fi -if [ -d %{_tmppath}/%{name}-libdir.bak ]; then - %{__cp} -rp %{_tmppath}/%{name}-libdir.bak/* %{libdir} - %{__rm} -rf %{_tmppath}/%{name}-libdir.bak -fi -if [ -d %{_tmppath}/%{name}-confdir.bak ]; then - %{__cp} -rp %{_tmppath}/%{name}-confdir.bak/* %{confdir} - %{__rm} -rf %{_tmppath}/%{name}-confdir.bak -fi - %preun # clean tempdir and workdir on removal or upgrade %{__rm} -rf %{workdir} %{tempdir} @@ -477,7 +461,7 @@ if [ "$1" = "0" ]; then fi %files -%defattr(0664,root,tomcat,0775) +%defattr(0664,root,tomcat,0755) %doc {LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper @@ -487,8 +471,9 @@ fi %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(0765,root,tomcat) %dir %{basedir} +%defattr(0664,root,tomcat,0775) %attr(0775,root,tomcat) %dir %{appdir} -%attr(0775,root,tomcat) %dir %{confdir} +%attr(0755,root,tomcat) %dir %{confdir} %attr(0775,root,tomcat) %dir %{confdir}/Catalina %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf @@ -497,8 +482,8 @@ fi %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/log4j.properties -%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml -%attr(0666,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml +%attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml %attr(0775,root,tomcat) %dir %{cachedir} %attr(0775,root,tomcat) %dir %{tempdir} %attr(0775,root,tomcat) %dir %{workdir} @@ -508,6 +493,7 @@ fi %{bindir}/bootstrap.jar %{bindir}/catalina-tasks.xml %{bindir}/tomcat-juli.jar +%{libdir}/tomcat-juli.jar %{homedir}/lib %{homedir}/temp %{homedir}/webapps @@ -541,6 +527,8 @@ fi %files lib %defattr(-,root,root,-) %{libdir} +%exclude %{libdir}/tomcat-juli.jar +%exclude %{libdir}/%{name}-el-%{elspec}-api.jar %files servlet-%{servletspec}-api %defattr(-,root,root,-) @@ -557,13 +545,20 @@ fi %{_mavenpomdir}/JPP-%{name}-tomcat-el-api.pom %files webapps -%defattr(0664,root,tomcat,0775) +%defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT %{appdir}/examples %{appdir}/sample %changelog -* Wed Apr 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-1 +* Mon May 2 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-3 +- Fixed package groups +- Fixed some permissions +- Fixed some links +- Removed old tomcat6 crap + +%changelog +* Thu Apr 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-2 - Package now named just tomcat instead of tomcat7 - Removed Provides: %{name}-log4j - Switched to apache-commons-* names instead of jakarta-commons-* .

1 0

[tomcat: 60/66] - Package now named just tomcat instead of tomcat7 - Removed Provides: %{name}-log4j - Switched to
by Ivan Afonichev 25 May '11

25 May '11

commit 5b34837704327ce2de929eff3002bc627f1b9f1c Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Thu Apr 28 09:35:45 2011 +0400 - Package now named just tomcat instead of tomcat7 - Removed Provides: %{name}-log4j - Switched to apache-commons-* names instead of jakarta-commons-* . - Remove the old changelog - BR/R java >= 1:1.6.0 , same for java-devel - Removed old tomcat6 crap ...patch => tomcat-7.0-bootstrap-MANIFEST.MF.patch | 0 ...7-7.0-digest.script => tomcat-7.0-digest.script | 6 +- ...log4j.properties => tomcat-7.0-log4j.properties | 0 tomcat-7.0-tomcat-users-webapp.patch | 17 + ...rapper.script => tomcat-7.0-tool-wrapper.script | 6 +- tomcat7-7.0.conf => tomcat-7.0.conf | 10 +- tomcat7-7.0.init => tomcat-7.0.init | 18 +- tomcat7-7.0.logrotate => tomcat-7.0.logrotate | 0 tomcat7-7.0.sysconfig => tomcat-7.0.sysconfig | 14 +- tomcat7-7.0.wrapper => tomcat-7.0.wrapper | 2 +- tomcat7.spec => tomcat.spec | 307 ++------------------ tomcat7-7.0-tomcat-users-webapp.patch | 12 - 12 files changed, 72 insertions(+), 320 deletions(-) --- diff --git a/tomcat7-7.0-bootstrap-MANIFEST.MF.patch b/tomcat-7.0-bootstrap-MANIFEST.MF.patch similarity index 100% rename from tomcat7-7.0-bootstrap-MANIFEST.MF.patch rename to tomcat-7.0-bootstrap-MANIFEST.MF.patch diff --git a/tomcat7-7.0-digest.script b/tomcat-7.0-digest.script similarity index 89% rename from tomcat7-7.0-digest.script rename to tomcat-7.0-digest.script index 409dc86..2ff7e64 100644 --- a/tomcat7-7.0-digest.script +++ b/tomcat-7.0-digest.script @@ -1,6 +1,6 @@ #!/bin/sh # -# tomcat7-digest script +# tomcat-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library @@ -13,7 +13,7 @@ fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" + TOMCAT_CFG="/etc/tomcat/tomcat.conf" fi if [ -r "$TOMCAT_CFG" ]; then @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" -BASE_JARS="commons-daemon tomcat7/catalina servlet" +BASE_JARS="commons-daemon tomcat/catalina servlet" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat7-7.0-log4j.properties b/tomcat-7.0-log4j.properties similarity index 100% rename from tomcat7-7.0-log4j.properties rename to tomcat-7.0-log4j.properties diff --git a/tomcat-7.0-tomcat-users-webapp.patch b/tomcat-7.0-tomcat-users-webapp.patch new file mode 100644 index 0000000..9f05e37 --- /dev/null +++ b/tomcat-7.0-tomcat-users-webapp.patch @@ -0,0 +1,17 @@ +--- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 ++++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 +@@ -23,4 +23,14 @@ + <user username="both" password="tomcat" roles="tomcat,role1"/> + <user username="role1" password="tomcat" roles="role1"/> + --> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + </tomcat-users> diff --git a/tomcat7-7.0-tool-wrapper.script b/tomcat-7.0-tool-wrapper.script similarity index 88% rename from tomcat7-7.0-tool-wrapper.script rename to tomcat-7.0-tool-wrapper.script index ad75a09..2640ce2 100644 --- a/tomcat7-7.0-tool-wrapper.script +++ b/tomcat-7.0-tool-wrapper.script @@ -1,6 +1,6 @@ #!/bin/sh # -# tomcat7-digest script +# tomcat-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library @@ -13,7 +13,7 @@ fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" + TOMCAT_CFG="/etc/tomcat/tomcat.conf" fi if [ -r "$TOMCAT_CFG" ]; then @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_OPTIONS="" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" -BASE_JARS="commons-daemon tomcat7/catalina servlet" +BASE_JARS="commons-daemon tomcat/catalina servlet" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat7-7.0.conf b/tomcat-7.0.conf similarity index 82% rename from tomcat7-7.0.conf rename to tomcat-7.0.conf index 3ac47d9..a500479 100644 --- a/tomcat7-7.0.conf +++ b/tomcat-7.0.conf @@ -1,11 +1,11 @@ -# System-wide configuration file for tomcat7 services -# This will be sourced by tomcat7 and any secondary service +# System-wide configuration file for tomcat services +# This will be sourced by tomcat and any secondary service # Values will be overridden by service-specific configuration # files in /etc/sysconfig # # Use this one to change default values for all services # Change the service specific ones to affect only one service -# (see, for instance, /etc/sysconfig/tomcat7) +# (see, for instance, /etc/sysconfig/tomcat) # # Where your java installation lives @@ -39,9 +39,9 @@ SHUTDOWN_WAIT="30" SHUTDOWN_VERBOSE="false" # Set the TOMCAT_PID location -CATALINA_PID="/var/run/tomcat7.pid" +CATALINA_PID="/var/run/tomcat.pid" -# Connector port is 8080 for this tomcat7 instance +# Connector port is 8080 for this tomcat instance #CONNECTOR_PORT="8080" # If you wish to further customize your tomcat environment, diff --git a/tomcat7-7.0.init b/tomcat-7.0.init similarity index 94% rename from tomcat7-7.0.init rename to tomcat-7.0.init index e3887d4..7808d23 100644 --- a/tomcat7-7.0.init +++ b/tomcat-7.0.init @@ -1,11 +1,11 @@ #!/bin/bash # -# tomcat7 This shell script takes care of starting and stopping Tomcat +# tomcat This shell script takes care of starting and stopping Tomcat # # chkconfig: - 80 20 # ### BEGIN INIT INFO -# Provides: tomcat7 +# Provides: tomcat # Required-Start: $network $syslog # Required-Stop: $network $syslog # Default-Start: @@ -44,7 +44,7 @@ else fi # Get the tomcat config (use this for environment specific settings) -TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" +TOMCAT_CFG="/etc/tomcat/tomcat.conf" if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi @@ -58,7 +58,7 @@ fi CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat7" +TOMCAT_SCRIPT="/usr/sbin/tomcat" # Tomcat program name TOMCAT_PROG="${NAME}" @@ -67,7 +67,7 @@ TOMCAT_PROG="${NAME}" TOMCAT_USER="${TOMCAT_USER:-tomcat}" # Define the tomcat log file -TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat7/catalina.out}" +TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat/catalina.out}" RETVAL="0" @@ -109,7 +109,7 @@ function makeHomeDir() { echo "$CATALINA_HOME does not exist, creating" if [ ! -d "/usr/share/${NAME}" ]; then mkdir /usr/share/${NAME} - cp -pLR /usr/share/tomcat7/* /usr/share/${NAME} + cp -pLR /usr/share/tomcat/* /usr/share/${NAME} fi mkdir -p /var/log/${NAME} \ /var/cache/${NAME} \ @@ -118,8 +118,8 @@ function makeHomeDir() { ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME - ln -fs /usr/share/java/tomcat7 ${CATALINA_HOME}/lib - ln -fs /usr/share/tomcat7/webapps ${CATALINA_HOME}/webapps + ln -fs /usr/share/java/tomcat ${CATALINA_HOME}/lib + ln -fs /usr/share/tomcat/webapps ${CATALINA_HOME}/webapps chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME} fi } @@ -171,7 +171,7 @@ function start() { if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG fi - if [ "$CATALINA_HOME" != "/usr/share/tomcat7" -a "$RETVAL" -eq "0" ]; then + if [ "$CATALINA_HOME" != "/usr/share/tomcat" -a "$RETVAL" -eq "0" ]; then # Create a tomcat directory if it doesn't exist makeHomeDir # If CATALINA_HOME doesn't exist modify port number so that diff --git a/tomcat7-7.0.logrotate b/tomcat-7.0.logrotate similarity index 100% rename from tomcat7-7.0.logrotate rename to tomcat-7.0.logrotate diff --git a/tomcat7-7.0.sysconfig b/tomcat-7.0.sysconfig similarity index 76% rename from tomcat7-7.0.sysconfig rename to tomcat-7.0.sysconfig index 69cd0a1..c1337e8 100644 --- a/tomcat7-7.0.sysconfig +++ b/tomcat-7.0.sysconfig @@ -1,15 +1,15 @@ -# Service-specific configuration file for tomcat7. This will be sourced by +# Service-specific configuration file for tomcat. This will be sourced by # the SysV init script after the global configuration file -# /etc/tomcat7/tomcat7.conf, thus allowing values to be overridden in +# /etc/tomcat/tomcat.conf, thus allowing values to be overridden in # a per-service manner. # # NEVER change the init script itself. To change values for all services make -# your changes in /etc/tomcat7/tomcat7.conf +# your changes in /etc/tomcat/tomcat.conf # # To change values for a specific service make your edits here. # To create a new service create a link from /etc/init.d/<your new service> to -# /etc/init.d/tomcat7 (do not copy the init script) and make a copy of the -# /etc/sysconfig/tomcat7 file to /etc/sysconfig/<your new service> and change +# /etc/init.d/tomcat (do not copy the init script) and make a copy of the +# /etc/sysconfig/tomcat file to /etc/sysconfig/<your new service> and change # the property values so the two services won't conflict. Register the new # service in the system as usual (see chkconfig and similars). # @@ -45,9 +45,9 @@ #SHUTDOWN_VERBOSE="false" # Set the TOMCAT_PID location -#CATALINA_PID="/var/run/tomcat7.pid" +#CATALINA_PID="/var/run/tomcat.pid" -# Connector port is 8080 for this tomcat7 instance +# Connector port is 8080 for this tomcat instance #CONNECTOR_PORT="8080" # If you wish to further customize your tomcat environment, diff --git a/tomcat7-7.0.wrapper b/tomcat-7.0.wrapper similarity index 98% rename from tomcat7-7.0.wrapper rename to tomcat-7.0.wrapper index dc3a6f1..ad3091b 100644 --- a/tomcat7-7.0.wrapper +++ b/tomcat-7.0.wrapper @@ -9,7 +9,7 @@ fi # Get the tomcat config (use this for environment specific settings) #if [ -z "${TOMCAT_CFG}" ]; then -# TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" +# TOMCAT_CFG="/etc/tomcat/tomcat.conf" #fi #if [ -r "$TOMCAT_CFG" ]; then diff --git a/tomcat7.spec b/tomcat.spec similarity index 64% rename from tomcat7.spec rename to tomcat.spec index 2a850b5..67a2994 100644 --- a/tomcat7.spec +++ b/tomcat.spec @@ -50,10 +50,10 @@ %global workdir %{cachedir}/work %global _initrddir %{_sysconfdir}/init.d -Name: tomcat7 +Name: tomcat 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 @@ -79,21 +79,21 @@ BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: ecj BuildRequires: findutils -BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-daemon -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-pool +BuildRequires: apache-commons-collections +BuildRequires: apache-commons-daemon +BuildRequires: apache-commons-dbcp +BuildRequires: apache-commons-pool BuildRequires: jakarta-taglibs-standard -BuildRequires: java-1.6.0-devel +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j -Requires: jakarta-commons-daemon -Requires: jakarta-commons-logging -Requires: jakarta-commons-collections -Requires: jakarta-commons-dbcp -Requires: jakarta-commons-pool -Requires: java-1.6.0 +Requires: apache-commons-daemon +Requires: apache-commons-logging +Requires: apache-commons-collections +Requires: apache-commons-dbcp +Requires: apache-commons-pool +Requires: java >= 1:1.6.0 Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils @@ -105,9 +105,6 @@ Requires(preun): redhat-lsb 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. @@ -161,9 +158,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 @@ -238,7 +235,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dcommons-daemon.native.src.tgz="HACK" \ -Djasper-jdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \ - -Dtomcat-native.tar.gz="HACK" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ dist-prepare dist-source javadoc @@ -348,7 +344,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar - # Link the juli jar into /usr/share/java/tomcat7 + # Link the juli jar into /usr/share/java/tomcat %{__ln_s} %{bindir}/tomcat-juli.jar . popd @@ -371,7 +367,7 @@ popd # Generate a depmap fragment javax.servlet:servlet-api pointing to -# tomcat7-servlet-3.0-api for backwards compatibility +# tomcat-servlet-3.0-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) %add_to_maven_depmap org.mortbay.jetty servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api @@ -393,7 +389,7 @@ for pom in tomcat-annotations-api.pom tomcat-catalina.pom tomcat-jasper-el.pom t %add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base done -# servlet-api jsp-api and el-api are not in tomcat7 subdir, since they are widely re-used elsewhere +# servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere for pom in tomcat-jsp-api.pom tomcat-servlet-api.pom tomcat-el-api.pom;do %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$pom base=`basename $pom .pom` @@ -413,12 +409,6 @@ done %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || : %{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \ -s /bin/nologin -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 -# the tomcat file structure -[ -d %{appdir} ] && %{__cp} -rp %{appdir} %{_tmppath}/%{name}-webapps.bak || : -[ -d %{confdir} ] && %{__cp} -rp %{confdir} %{_tmppath}/%{name}-confdir.bak || : -[ -d %{libdir} ] && %{__cp} -rp %{libdir} %{_tmppath}/%{name}-libdir.bak || : %post # install but don't activate @@ -573,256 +563,13 @@ fi %{appdir}/sample %changelog +* Wed Apr 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-1 +- Package now named just tomcat instead of tomcat7 +- Removed Provides: %{name}-log4j +- Switched to apache-commons-* names instead of jakarta-commons-* . +- Remove the old changelog +- BR/R java >= 1:1.6.0 , same for java-devel +- Removed old tomcat6 crap + * Wed Apr 27 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-1 - Tomcat7 - -* Wed Apr 13 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-7 -- Resolve: rhbz 693292 - manager app doesn't work (directory permissions) -- Resolve: rhbz 677414 - incorrect directory permissions -- Init scripts log to $logdir/initd.log versus catalina.out - -* Fri Mar 04 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-6 -- In useradd, set tomcat user shell to /sbin/nologin - -* Fri Mar 04 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-5 -- Fixed typo in tomcat6 init - -* Wed Mar 02 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-4 -- Resolves rhbz 681677 - -* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-3 -- Resolves rhbz 640134 - setting JAVA_HOME - -* Mon Feb 28 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-1 -- Rebase on 6.0.32 with several bug fixes and security fixes -- changed apache-commons to jakarta-commons to fix missing -- dependencies during install. Adjusted permissions on logs and -- conf dirs so init worked. Reversed order of reading conf files - -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.30-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Feb 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.30-1 -- Update to 6.0.30. -- Drop jdt-core.pom which is gone upstream now. - -* Wed Feb 2 2011 David Knox <dknox(a)redhat.com> 0:6.0.29-3 -- Resolves rhbz# 674601 - JDK Double.parseDouble DoS - -* 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. -- 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 -- 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 - -* 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) - -* 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 -- removed from /var/tmp. - -* Tue Nov 9 2010 Chris Spike <chris.spike(a)arcor.de> 0:6.0.26-13 -- Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage - -* 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 -- package update or uninstall - WARNING -- Resolves: rhbz#638914 - update versions of commons-collections, -- commons-dbcp, and commons-pool - -* Thu Oct 07 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-11 -- 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 -- 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 -- are broken - -* Fri Jul 02 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-8 -- 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. - -* Tue Jun 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-6 -- Completed package and file sections. Added el-spec. Fixed -- directory permission problems. - -* Thu May 6 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-5 -- 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. - -* 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 -- is the most recent - -* Tue Apr 06 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-1 -- Solved packaging problems involving taglibs-standard -- Solved packaging problems involving jakarta-commons -- Corrected Requires(post) to Requires and checked companion BuildRequires - -* 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. -- OSGi manifests for servlet-api and jsp-api - - -* Fri Mar 26 2010 Mary Ellen Foster <mefoster(a)gmail.com> 0:6.0.24-2 -- Add maven POMs and metadata -- Link tomcat6-juli into /usr/share/java/tomcat6 - -* Mon Mar 1 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.24-1 -- Update to 6.0.24. - -* Tue Dec 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.20-2 -- 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. - -* 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 - -* Wed Apr 1 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.18-9.2 -- Add OSGi manifest for servlet-api. - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-9.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-8.1 -- build for Fedora - -* Tue Dec 02 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-8 -- fix directory ownership - -* Thu Nov 13 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-7 -- add Requires for update-alternatives - -* Tue Oct 07 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-6 -- use lsb_release instead of lsb-release to get the distributor - -* Tue Oct 07 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-5 -- fix initscript messages on Mandriva Linux -- fix help message in initscript - -* Wed Oct 01 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-4 -- redefine %%_initrddir for FHS-compliance -- make initscript LSB-complaint - -* Fri Sep 26 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-3 -- fix status in initscript - -* Thu Sep 25 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-2 -- remove initscripts and /sbin/service requirement -- call initscript directly without using /sbin/service -- require /sbin/chkconfig instead of chkconfig -- remove chkconfig requirement from packages that don't require it - -* Tue Aug 26 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-1 -- 6.0.18 -- Resolves: CVE-2008-1232, CVE-2008-1947, CVE-2008-2370, CVE-2008-2938 -- fix definition of java.security.policy with d%%{name} start-security -- don't pass $CATALINA_OPTS with d%%{name} stop -- redefine tempdir and workdir for tmpwatch workaround -- change eclipse-ecj references to ecj - -* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0:6.0.16-1.8 -- drop repotag - -* Fri Apr 04 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.7.fc9 -- version jsp and servlet Provides with their spec versions -- remove Obsoletes/Provides for servletapi6 package as it can co-exist -- check for java-functions existence in wrapper script -- move d%%{name} to %%{name} and create symlink for d%%{name} -- improve status function in initscript -- change license to ASL 2.0 again as per Fedora guidelines - -* Mon Mar 24 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.6.fc9 -- remove Requires: tomcat-native -- put back original JPackage Group (except javadoc) and License tags -- add Provides for jsp and servlet -- use ant macro -- build and install sample webapp -- call /sbin/service to stop service on uninstall -- remove references to $RPM_BUILD_DIR -- use copy instead of move to fix short-circuit install build -- remove prebuilt sample.war -- remove Thumbs.db files -- add Requires: java >= 0:1.6.0 - -* Wed Mar 19 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.5.fc9 -- explicitly unset CLASSPATH -- explicitly set OPT_JAR_LIST to include ant/ant-trax - -* Tue Mar 18 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.4.fc9 -- remove BuildRequires: sed -- remove specific references to icedtea - -* Mon Mar 17 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.3.fc9 -- add digest and tool-wrapper scripts -- Requires: tomcat-native - -* Fri Mar 7 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.2.fc9 -- use %%{_var} for appdir instead of /srv -- use ${JAVACMD} for java executable in wrapper script -- use built-in status function in initscript where possible -- add missing require on procps for status function -- fix java.library.path setting in %%{_sysconfdir}/sysconfig/%%{name} -- add patch to document webapps in %%{_sysconfdir}/%%{name}/tomcat-users.xml -- remove %%{appdir}/ROOT/admin -- move %%{_bindir}/d%%{name} to %%{_sbindir}/d%%{name} - -* Mon Mar 3 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.16-1jpp.1.fc9 -- use %%{_initrddir} macro instead of %%{_sysconfdir}/init.d (rhbz #153187) -- fix java.library.path setting in %%{name}.conf (rhbz #253605) -- fix incorrect initscript output (rhbz #380921) -- update initscript (rhbz #247077) -- add logrotate support -- fix strange-permission -- fix %%prep -- replace /var with %%{_var} -- replace %%{_localstatedir} with %%{_var} -- use %%{logdir} where possible -- call build-jar-repository with full path in scriptlets -- remove file-based requires -- build with icedtea and set as the default JAVA_HOME in %%{name}.conf -- fix non-standard-group -- change ecj references to eclipse-ecj -- change Apache Software License 2.0 to ASL 2.0 for rpmlint - -* Fri Feb 8 2008 Jason Corley <jason.corley(a)gmail.com> - 0:6.0.16-1jpp -- update to 6.0.16 - -* Sun Dec 2 2007 Jason Corley <jason.corley(a)gmail.com> - 0:6.0.14-2jpp -- add /etc/tomcat6/Catalina/localhost (Alexander Kurtakov) - -* Tue Aug 14 2007 Jason Corley <jason.corley(a)gmail.com> 0:6.0.14-1jpp -- first JPackage release

1 0

[tomcat: 59/66] Tomcat 7
by Ivan Afonichev 25 May '11

25 May '11

commit 167370bb1553653d4badbe6b94aea42efe3b9f8f Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Wed Apr 27 09:54:04 2011 +0400 Tomcat 7 .gitignore | 4 +- jsp-api-OSGi-MANIFEST.MF | 12 ++-- servlet-api-OSGi-MANIFEST.MF | 6 +- sources | 3 +- tomcat6-6.0-rhbz-674601.patch | 18 ------ ...atch => tomcat7-7.0-bootstrap-MANIFEST.MF.patch | 2 +- ...-6.0-digest.script => tomcat7-7.0-digest.script | 6 +- ...og4j.properties => tomcat7-7.0-log4j.properties | 0 ....patch => tomcat7-7.0-tomcat-users-webapp.patch | 0 ...apper.script => tomcat7-7.0-tool-wrapper.script | 6 +- tomcat6-6.0.conf => tomcat7-7.0.conf | 10 ++-- tomcat6-6.0.init => tomcat7-7.0.init | 20 +++--- tomcat6-6.0.logrotate => tomcat7-7.0.logrotate | 0 tomcat6-6.0.sysconfig => tomcat7-7.0.sysconfig | 14 ++-- tomcat6-6.0.wrapper => tomcat7-7.0.wrapper | 2 +- tomcat6.spec => tomcat7.spec | 62 +++++++++++-------- 16 files changed, 79 insertions(+), 86 deletions(-) --- diff --git a/.gitignore b/.gitignore index 5ff9c77..3cd0629 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ apache-tomcat-6.0.24-src.tar.gz apache-tomcat-6.0.26-src.tar.gz apache-tomcat-6.0.29-src.tar.gz apache-tomcat-6.0.30-src.tar.gz -/apache-tomcat-6.0.32-src.tar.gz +apache-tomcat-6.0.32-src.tar.gz +apache-tomcat-7.0.12-src.tar.gz + diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF index d5ecf7e..6470b0d 100644 --- a/jsp-api-OSGi-MANIFEST.MF +++ b/jsp-api-OSGi-MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 Bundle-Name: %bundleName Bundle-SymbolicName: javax.servlet.jsp -Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v - ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp - .tagext; version=2.0 -Bundle-Version: 2.0.0.v200806031607 +Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v + ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp + .tagext; version=2.2 +Bundle-Version: 2.2.0.v200806031607 Bundle-ManifestVersion: 2 -Import-Package: javax.servlet; version=2.4,javax.servlet.http; version - =2.4,javax.servlet.resources; version=2.4 +Import-Package: javax.servlet; version=3.0,javax.servlet.http; version + =3.0,javax.servlet.resources; version=3.0 diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF index 957cb38..67c80b8 100644 --- a/servlet-api-OSGi-MANIFEST.MF +++ b/servlet-api-OSGi-MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: javax.servlet Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-Localization: plugin -Bundle-Version: 2.5.0.v200806031605 +Bundle-Version: 3.0.0 Bundle-Vendor: %bundleProvider -Export-Package: javax.servlet;version="2.5",javax.servlet.http;version - ="2.5",javax.servlet.resources;version="2.5" +Export-Package: javax.servlet;version="3.0",javax.servlet.http;version + ="3.0",javax.servlet.resources;version="3.0" diff --git a/sources b/sources index f1dcb10..99e67fa 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -7b811c9092bcb7779bd8df772744ac15 apache-tomcat-6.0.30-src.tar.gz -19a1eaa9c9938b520d3c360d8cf4af22 apache-tomcat-6.0.32-src.tar.gz +edfd253c21b51ccadce8ec05be5e61fb apache-tomcat-7.0.12-src.tar.gz diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch b/tomcat7-7.0-bootstrap-MANIFEST.MF.patch similarity index 89% rename from tomcat6-6.0-bootstrap-MANIFEST.MF.patch rename to tomcat7-7.0-bootstrap-MANIFEST.MF.patch index ac94aac..e2ee93e 100644 --- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch +++ b/tomcat7-7.0-bootstrap-MANIFEST.MF.patch @@ -3,7 +3,7 @@ @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap --Class-Path: commons-daemon.jar tomcat-juli.jar +-Class-Path: commons-daemon.jar Specification-Title: Apache Tomcat Bootstrap Specification-Version: @VERSION_MAJOR_MINOR@ Specification-Vendor: Apache Software Foundation diff --git a/tomcat6-6.0-digest.script b/tomcat7-7.0-digest.script similarity index 89% rename from tomcat6-6.0-digest.script rename to tomcat7-7.0-digest.script index 41ef58e..409dc86 100644 --- a/tomcat6-6.0-digest.script +++ b/tomcat7-7.0-digest.script @@ -1,6 +1,6 @@ #!/bin/sh # -# tomcat6-digest script +# tomcat7-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library @@ -13,7 +13,7 @@ fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" + TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" fi if [ -r "$TOMCAT_CFG" ]; then @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" -BASE_JARS="commons-daemon tomcat6/catalina servlet" +BASE_JARS="commons-daemon tomcat7/catalina servlet" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat6-6.0-log4j.properties b/tomcat7-7.0-log4j.properties similarity index 100% rename from tomcat6-6.0-log4j.properties rename to tomcat7-7.0-log4j.properties diff --git a/tomcat6-6.0-tomcat-users-webapp.patch b/tomcat7-7.0-tomcat-users-webapp.patch similarity index 100% rename from tomcat6-6.0-tomcat-users-webapp.patch rename to tomcat7-7.0-tomcat-users-webapp.patch diff --git a/tomcat6-6.0-tool-wrapper.script b/tomcat7-7.0-tool-wrapper.script similarity index 88% rename from tomcat6-6.0-tool-wrapper.script rename to tomcat7-7.0-tool-wrapper.script index bcd7561..ad75a09 100644 --- a/tomcat6-6.0-tool-wrapper.script +++ b/tomcat7-7.0-tool-wrapper.script @@ -1,6 +1,6 @@ #!/bin/sh # -# tomcat6-digest script +# tomcat7-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library @@ -13,7 +13,7 @@ fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then - TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" + TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" fi if [ -r "$TOMCAT_CFG" ]; then @@ -34,7 +34,7 @@ export CLASSPATH MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_OPTIONS="" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" -BASE_JARS="commons-daemon tomcat6/catalina servlet" +BASE_JARS="commons-daemon tomcat7/catalina servlet" # Set parameters set_classpath $BASE_JARS diff --git a/tomcat6-6.0.conf b/tomcat7-7.0.conf similarity index 82% rename from tomcat6-6.0.conf rename to tomcat7-7.0.conf index f2fe56e..3ac47d9 100644 --- a/tomcat6-6.0.conf +++ b/tomcat7-7.0.conf @@ -1,11 +1,11 @@ -# System-wide configuration file for tomcat6 services -# This will be sourced by tomcat6 and any secondary service +# System-wide configuration file for tomcat7 services +# This will be sourced by tomcat7 and any secondary service # Values will be overridden by service-specific configuration # files in /etc/sysconfig # # Use this one to change default values for all services # Change the service specific ones to affect only one service -# (see, for instance, /etc/sysconfig/tomcat6) +# (see, for instance, /etc/sysconfig/tomcat7) # # Where your java installation lives @@ -39,9 +39,9 @@ SHUTDOWN_WAIT="30" SHUTDOWN_VERBOSE="false" # Set the TOMCAT_PID location -CATALINA_PID="/var/run/tomcat6.pid" +CATALINA_PID="/var/run/tomcat7.pid" -# Connector port is 8080 for this tomcat6 instance +# Connector port is 8080 for this tomcat7 instance #CONNECTOR_PORT="8080" # If you wish to further customize your tomcat environment, diff --git a/tomcat6-6.0.init b/tomcat7-7.0.init similarity index 94% rename from tomcat6-6.0.init rename to tomcat7-7.0.init index ad81343..e3887d4 100644 --- a/tomcat6-6.0.init +++ b/tomcat7-7.0.init @@ -1,16 +1,16 @@ #!/bin/bash # -# tomcat6 This shell script takes care of starting and stopping Tomcat +# tomcat7 This shell script takes care of starting and stopping Tomcat # # chkconfig: - 80 20 # ### BEGIN INIT INFO -# Provides: tomcat6 +# Provides: tomcat7 # Required-Start: $network $syslog # Required-Stop: $network $syslog # Default-Start: # Default-Stop: -# Description: Release implementation for Servlet 2.5 and JSP 2.1 +# Description: Release implementation for Servlet 3.0 and JSP 2.2 # Short-Description: start and stop tomcat ### END INIT INFO # @@ -44,7 +44,7 @@ else fi # Get the tomcat config (use this for environment specific settings) -TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" +TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi @@ -58,7 +58,7 @@ fi CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat6" +TOMCAT_SCRIPT="/usr/sbin/tomcat7" # Tomcat program name TOMCAT_PROG="${NAME}" @@ -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:-/var/log/tomcat7/catalina.out}" RETVAL="0" @@ -109,7 +109,7 @@ function makeHomeDir() { echo "$CATALINA_HOME does not exist, creating" if [ ! -d "/usr/share/${NAME}" ]; then mkdir /usr/share/${NAME} - cp -pLR /usr/share/tomcat6/* /usr/share/${NAME} + cp -pLR /usr/share/tomcat7/* /usr/share/${NAME} fi mkdir -p /var/log/${NAME} \ /var/cache/${NAME} \ @@ -118,8 +118,8 @@ function makeHomeDir() { ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME - ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib - ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps + ln -fs /usr/share/java/tomcat7 ${CATALINA_HOME}/lib + ln -fs /usr/share/tomcat7/webapps ${CATALINA_HOME}/webapps chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME} fi } @@ -171,7 +171,7 @@ function start() { if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG fi - if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a "$RETVAL" -eq "0" ]; then + if [ "$CATALINA_HOME" != "/usr/share/tomcat7" -a "$RETVAL" -eq "0" ]; then # Create a tomcat directory if it doesn't exist makeHomeDir # If CATALINA_HOME doesn't exist modify port number so that diff --git a/tomcat6-6.0.logrotate b/tomcat7-7.0.logrotate similarity index 100% rename from tomcat6-6.0.logrotate rename to tomcat7-7.0.logrotate diff --git a/tomcat6-6.0.sysconfig b/tomcat7-7.0.sysconfig similarity index 79% rename from tomcat6-6.0.sysconfig rename to tomcat7-7.0.sysconfig index caefeed..69cd0a1 100644 --- a/tomcat6-6.0.sysconfig +++ b/tomcat7-7.0.sysconfig @@ -1,15 +1,15 @@ -# Service-specific configuration file for tomcat6. This will be sourced by +# Service-specific configuration file for tomcat7. This will be sourced by # the SysV init script after the global configuration file -# /etc/tomcat6/tomcat6.conf, thus allowing values to be overridden in +# /etc/tomcat7/tomcat7.conf, thus allowing values to be overridden in # a per-service manner. # # NEVER change the init script itself. To change values for all services make -# your changes in /etc/tomcat6/tomcat6.conf +# your changes in /etc/tomcat7/tomcat7.conf # # To change values for a specific service make your edits here. # To create a new service create a link from /etc/init.d/<your new service> to -# /etc/init.d/tomcat6 (do not copy the init script) and make a copy of the -# /etc/sysconfig/tomcat6 file to /etc/sysconfig/<your new service> and change +# /etc/init.d/tomcat7 (do not copy the init script) and make a copy of the +# /etc/sysconfig/tomcat7 file to /etc/sysconfig/<your new service> and change # the property values so the two services won't conflict. Register the new # service in the system as usual (see chkconfig and similars). # @@ -45,9 +45,9 @@ #SHUTDOWN_VERBOSE="false" # Set the TOMCAT_PID location -#CATALINA_PID="/var/run/tomcat6.pid" +#CATALINA_PID="/var/run/tomcat7.pid" -# Connector port is 8080 for this tomcat6 instance +# Connector port is 8080 for this tomcat7 instance #CONNECTOR_PORT="8080" # If you wish to further customize your tomcat environment, diff --git a/tomcat6-6.0.wrapper b/tomcat7-7.0.wrapper similarity index 98% rename from tomcat6-6.0.wrapper rename to tomcat7-7.0.wrapper index 0e95331..dc3a6f1 100644 --- a/tomcat6-6.0.wrapper +++ b/tomcat7-7.0.wrapper @@ -9,7 +9,7 @@ fi # Get the tomcat config (use this for environment specific settings) #if [ -z "${TOMCAT_CFG}" ]; then -# TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" +# TOMCAT_CFG="/etc/tomcat7/tomcat7.conf" #fi #if [ -r "$TOMCAT_CFG" ]; then diff --git a/tomcat6.spec b/tomcat7.spec similarity index 95% rename from tomcat6.spec rename to tomcat7.spec index da3c337..2a850b5 100644 --- a/tomcat6.spec +++ b/tomcat7.spec @@ -28,13 +28,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%global jspspec 2.1 -%global major_version 6 +%global jspspec 2.2 +%global major_version 7 %global minor_version 0 -%global micro_version 32 +%global micro_version 12 %global packdname apache-tomcat-%{version}-src -%global servletspec 2.5 -%global elspec 2.1 +%global servletspec 3.0 +%global elspec 2.2 %global tcuid 91 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -50,10 +50,10 @@ %global workdir %{cachedir}/work %global _initrddir %{_sysconfdir}/init.d -Name: tomcat6 +Name: tomcat7 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 7%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -72,8 +72,7 @@ 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 -# In 6.0.32 source -#Patch2: %{name}-%{major_version}.%{minor_version}-rhbz-674601.patch + BuildArch: noarch BuildRequires: ant @@ -146,7 +145,7 @@ Javadoc generated documentation for Apache Tomcat. Group: Internet/WWW/Dynamic Content Summary: Apache Tomcat JSP API implementation classes Provides: jsp = %{jspspec} -Provides: jsp21 +Provides: jsp22 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires(post): chkconfig Requires(postun): chkconfig @@ -175,7 +174,7 @@ Group: Internet/WWW/Dynamic Content Summary: Apache Tomcat Servlet API implementation classes Provides: servlet = %{servletspec} Provides: servlet6 -Provides: servlet25 +Provides: servlet3 Requires(post): chkconfig Requires(postun): chkconfig @@ -228,14 +227,22 @@ export OPT_JAR_LIST="xalan-j2-serializer" -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)" \ -Dtomcat-native.tar.gz="HACK" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" # javadoc generation - %{ant} -f dist.xml dist-prepare - %{ant} -f dist.xml dist-source - %{ant} -f dist.xml dist-javadoc + %{ant} -Dbase.path="." \ + -Dbuild.compiler="modern" \ + -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ + -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ + -Dcommons-daemon.native.src.tgz="HACK" \ + -Djasper-jdt.jar="$(build-classpath ecj)" \ + -Djdt.jar="$(build-classpath ecj)" \ + -Dtomcat-native.tar.gz="HACK" \ + -Dversion="%{version}" \ + -Dversion.build="%{micro_version}" \ + dist-prepare dist-source javadoc + # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar @@ -341,7 +348,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar - # Link the juli jar into /usr/share/java/tomcat6 + # Link the juli jar into /usr/share/java/tomcat7 %{__ln_s} %{bindir}/tomcat-juli.jar . popd @@ -364,7 +371,7 @@ popd # Generate a depmap fragment javax.servlet:servlet-api pointing to -# tomcat6-servlet-2.5-api for backwards compatibility +# tomcat7-servlet-3.0-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) %add_to_maven_depmap org.mortbay.jetty servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api @@ -379,25 +386,25 @@ for pom in *.pom; do 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; do +for pom in tomcat-annotations-api.pom tomcat-catalina.pom tomcat-jasper-el.pom tomcat-jasper.pom \ + tomcat-catalina-ha.pom tomcat-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 -# 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 +# servlet-api jsp-api and el-api are not in tomcat7 subdir, since they are widely re-used elsewhere +for pom in tomcat-jsp-api.pom tomcat-servlet-api.pom tomcat-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 +%{__cp} -a tomcat-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 +%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom %add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli @@ -539,7 +546,7 @@ fi %defattr(-,root,root,-) %{_javadir}/%{name}-jsp-%{jspspec}*.jar %{_javadir}/%{name}-jsp-api.jar -%{_mavenpomdir}/JPP-%{name}-jsp-api.pom +%{_mavenpomdir}/JPP-%{name}-tomcat-jsp-api.pom %files lib %defattr(-,root,root,-) @@ -550,14 +557,14 @@ fi %{_javadir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-api.jar %{_mavendepmapfragdir}/%{name}-servlet-api -%{_mavenpomdir}/JPP-%{name}-servlet-api.pom +%{_mavenpomdir}/JPP-%{name}-tomcat-servlet-api.pom %files el-%{elspec}-api %defattr(-,root,root,-) %{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-api.jar %{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar -%{_mavenpomdir}/JPP-%{name}-el-api.pom +%{_mavenpomdir}/JPP-%{name}-tomcat-el-api.pom %files webapps %defattr(0664,root,tomcat,0775) @@ -566,6 +573,9 @@ fi %{appdir}/sample %changelog +* Wed Apr 27 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-1 +- Tomcat7 + * Wed Apr 13 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-7 - Resolve: rhbz 693292 - manager app doesn't work (directory permissions) - Resolve: rhbz 677414 - incorrect directory permissions

1 0

[tomcat: 58/66] rhbz 693292:manager app doesn't work (directory permissions); rhbz 677414: incorrect directory permi
by Ivan Afonichev 25 May '11

25 May '11

commit 74a4175fca98889952b7b10aa3af939ec92a1946 Author: David Knox <dknox(a)dknox.(none)> Date: Wed Apr 13 13:15:12 2011 -0600 rhbz 693292:manager app doesn't work (directory permissions); rhbz 677414: incorrect directory permissions; Init scripts log to /initd.log versus catalina.out tomcat6-6.0.init | 6 +++--- tomcat6.spec | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 23 deletions(-) --- diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init index 919ddd1..ad81343 100644 --- a/tomcat6-6.0.init +++ b/tomcat6-6.0.init @@ -184,10 +184,10 @@ function start() { parseOptions if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \ - >> $TOMCAT_LOG 2>&1 || RETVAL="4" + >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4" else - [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 || RETVAL="4" + [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4" fi if [ "$RETVAL" -eq "0" ]; then log_success_msg @@ -206,7 +206,7 @@ function stop() { parseOptions if [ "$RETVAL" -eq "0" ]; then touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4" - [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 || RETVAL="4" + [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4" fi if [ "$RETVAL" -eq "0" ]; then count="0" diff --git a/tomcat6.spec b/tomcat6.spec index a9ce551..da3c337 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -53,7 +53,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -480,7 +480,7 @@ if [ "$1" = "0" ]; then fi %files -%defattr(-,root,tomcat,0775) +%defattr(0664,root,tomcat,0775) %doc {LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper @@ -490,22 +490,22 @@ fi %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(0765,root,tomcat) %dir %{basedir} -%attr(0775,tomcat,root) %dir %{appdir} -%attr(0775,tomcat,root) %dir %{confdir} -%attr(0775,tomcat,root) %dir %{confdir}/Catalina -%attr(0775,tomcat,root) %dir %{confdir}/Catalina/localhost -%config(noreplace) %{confdir}/%{name}.conf -%config(noreplace) %{confdir}/*.policy -%config(noreplace) %{confdir}/*.properties -%config(noreplace) %{confdir}/context.xml -%config(noreplace) %{confdir}/server.xml -%config(noreplace) %{confdir}/log4j.properties -%attr(0664,tomcat,root) %config(noreplace) %{confdir}/tomcat-users.xml -%config(noreplace) %{confdir}/web.xml -%attr(0765,tomcat,root) %dir %{cachedir} -%attr(0765,tomcat,root) %dir %{tempdir} -%attr(0765,tomcat,root) %dir %{workdir} -%attr(0775,tomcat,root) %dir %{logdir} +%attr(0775,root,tomcat) %dir %{appdir} +%attr(0775,root,tomcat) %dir %{confdir} +%attr(0775,root,tomcat) %dir %{confdir}/Catalina +%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/%{name}.conf +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.policy +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/log4j.properties +%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml +%attr(0666,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml +%attr(0775,root,tomcat) %dir %{cachedir} +%attr(0775,root,tomcat) %dir %{tempdir} +%attr(0775,root,tomcat) %dir %{workdir} +%attr(0775,root,tomcat) %dir %{logdir} %attr(0664,tomcat,tomcat) %{logdir}/catalina.out %dir %{homedir} %{bindir}/bootstrap.jar @@ -523,7 +523,7 @@ fi %exclude %{_mavenpomdir}/*api* %files admin-webapps -%defattr(-,root,root,-) +%defattr(0664,root,tomcat,0775) %{appdir}/host-manager %{appdir}/manager @@ -560,12 +560,17 @@ fi %{_mavenpomdir}/JPP-%{name}-el-api.pom %files webapps -%defattr(-,root,tomcat,-) +%defattr(0664,root,tomcat,0775) %{appdir}/ROOT %{appdir}/examples %{appdir}/sample %changelog +* Wed Apr 13 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-7 +- Resolve: rhbz 693292 - manager app doesn't work (directory permissions) +- Resolve: rhbz 677414 - incorrect directory permissions +- Init scripts log to $logdir/initd.log versus catalina.out + * Fri Mar 04 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-6 - In useradd, set tomcat user shell to /sbin/nologin

1 0

[tomcat: 57/66] In useradd, set daemon shell to nologin
by Ivan Afonichev 25 May '11

25 May '11

commit 8ee466247f9a8302e0047b11014324d1b3d589d1 Author: david knox <dknox(a)78-97-42-72.skybeam.com> Date: Fri Mar 4 14:09:28 2011 -0700 In useradd, set daemon shell to nologin tomcat6.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/tomcat6.spec b/tomcat6.spec index 4e00a8c..a9ce551 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -53,7 +53,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -405,7 +405,7 @@ done # 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 || : + -s /bin/nologin -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 # the tomcat file structure @@ -566,6 +566,9 @@ fi %{appdir}/sample %changelog +* Fri Mar 04 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-6 +- In useradd, set tomcat user shell to /sbin/nologin + * Fri Mar 04 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-5 - Fixed typo in tomcat6 init

1 0

[tomcat: 56/66] Fixed typo in init
by Ivan Afonichev 25 May '11

25 May '11

commit 6a7af86dadcf65752e06fd624d6f67a35209b901 Author: david knox <dknox(a)78-97-42-72.skybeam.com> Date: Fri Mar 4 07:07:36 2011 -0700 Fixed typo in init tomcat6-6.0.init | 2 +- tomcat6.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init index dd12ef6..919ddd1 100644 --- a/tomcat6-6.0.init +++ b/tomcat6-6.0.init @@ -58,7 +58,7 @@ fi CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/sbin/tomcat6 +TOMCAT_SCRIPT="/usr/sbin/tomcat6" # Tomcat program name TOMCAT_PROG="${NAME}" diff --git a/tomcat6.spec b/tomcat6.spec index cb5605b..4e00a8c 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -53,7 +53,7 @@ Name: tomcat6 Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: Networking/Daemons @@ -566,6 +566,9 @@ fi %{appdir}/sample %changelog +* Fri Mar 04 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-5 +- Fixed typo in tomcat6 init + * Wed Mar 02 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-4 - Resolves rhbz 681677

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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