Accepting request 247973 from home:dmacvicar:branches:Java:packages
- include the tomcat websocket implementation (tomcat7-websocket)
- Update to 7.0.55
* Update to the Eclipse JDT Compiler 4.4
* Better error handling when the error occurs after the response
has been committed
* Various improvements to the Mapper including fixing some
concurrency bugs
* See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
- build tomcat-embed as a subpackage
OBS-URL: https://build.opensuse.org/request/show/247973
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=58
This commit is contained in:
Darin Perusich
Git OBS Bridge
parent
5d26c6aeb1
commit
dd18bdfe7a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a3dcdd1ee9c8f0bf84839048e6bbd928d1cccb2c93edf31a5c9eed1dfe2fb960
|
||||
size 4641885
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (MingW32)
|
||||
|
||||
iQIcBAABCgAGBQJTemA7AAoJECCLCrHWMBHHlEsP/1Ge2IkkjfmX7jAZ0Le+SxB/
|
||||
ujbs34sTGDA1EwbaCInxxQ95yV+z5NbSEiJNN/8v3SSugghwSy5luR8jRKkgfFuq
|
||||
ACvg0AC4vErFXJoL0GeyyJgB89vvPyFlRUMBujvoRIRuXHVNVdAL3iOpMZWskJAE
|
||||
Wt9Kq3jbFL1ytHcAFwZjhchzEnmFkR8iIV5lHDGeAf1u2n5YsLjBzGBDdWWeJZ1n
|
||||
Qo6JuH2MnMoyR8+AwBxLjerOzbx76XvAefyaW+ZetZGwacdZ20PWEzlzHSD3HLj/
|
||||
c2JqRZJ7aT9UOkI1TpmIaWI6ouSIe9mDgDVDSQz3VE5JgZx1ebik71nmh2DRihTt
|
||||
WbH88vLdYSeB4MiL8Hl8e0ddvcoK5JFdvUAv6ZE87WXo6wwxN1LH5bO0PULLgxGC
|
||||
b2uDGeGbsDyV3HJzCDY5Pdkgs/S448fpxfFOjn209EW8kSVNJ4lVfPoYvigtlVX1
|
||||
ux5GeI84rEWZ6wn0h4k/Zi01gn++VMCbi0w34junww+jk1qkPArWnpk4Kio2CdcV
|
||||
TfOsCYtoAiwMs547i7OJr5pNu50lA19KdvXLjwYl64G/ai2cL5MSANd3SNS4RRz6
|
||||
3LHl2oOZ8Y7BZb0q+zdLSuPoEigod3TZ2d6MAXIO8U7Dt7aOrgho7xi/m9wMJmyU
|
||||
cav1RRwDbuVtivzweNPc
|
||||
=xJmh
|
||||
-----END PGP SIGNATURE-----
|
||||
3
apache-tomcat-7.0.55-src.tar.gz
Normal file
3
apache-tomcat-7.0.55-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b7eadd1268f8d48603f300c2f4b3e566410f5373ad33cf870320ef8b57f1b81c
|
||||
size 4663483
|
||||
17
apache-tomcat-7.0.55-src.tar.gz.asc
Normal file
17
apache-tomcat-7.0.55-src.tar.gz.asc
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (MingW32)
|
||||
|
||||
iQIcBAABCgAGBQJTyTQ3AAoJECCLCrHWMBHHxD0P/1r+dwBIpXCP2qEwadWkBseo
|
||||
o4xK4X13LEpBMDnA3hKwuGP+oBF6sjUKYvOkkku9/tnZyeJEs8QasdsaRLM97ADl
|
||||
IkyeBoyQRtw5FIhrtPodse8NAXCTYx4F5YgrNxacnisn1pSBCO0nYPUQHL/dYugE
|
||||
7EOlH8UpEXfYIKgJXvp9ZtNO0aJEKHKgWy2Cpz+UKM1N12SyENDL5Kl5sbVo0fiu
|
||||
+/TtqnX/G4nmPWr/IiOUWA7ReISsmH/SIKk703LP/T0z3VpmCWz6f2UCjOGRwrP5
|
||||
xj1G9ZQ1EYZuhATX17ma+eSFxEWIhvjcdtRZyvvJmX2KqBFSUZviYchX93/Kj4l1
|
||||
9y0uz6KJoroNzvANV4KSM+8lG0oezFVAgEJUBQZgAUtRp0iaLtMdbspOHtjcOz1F
|
||||
gmVXcywVyGI/0gaZ1FM9HWkgNZD3eSX5O1zraz/09Yapx7LSFSaOFIMpxcWKWv5H
|
||||
zBxljqw6vJfiVAao2rG2hqfu34EVcWaJgY+vFJ/nA87EvV8Uw0qj05jQGwt0Ozv8
|
||||
NyceYQL3JQslPIK4Mbn2F05caO4ARE4Pg6AtfVP6l6lwcPJn+AYS9AYh/xGQ5hWb
|
||||
G4RUq4hvEb78SaidotvrM9fGo3rSwUfUPCtA/E22b+SFirvvek/YB5DDfgN9oZoD
|
||||
WV5nm8wZsS5hlbpI/O8Q
|
||||
=/8pH
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 8 09:01:13 UTC 2014 - dmacvicar@suse.de
|
||||
|
||||
- include the tomcat websocket implementation (tomcat7-websocket)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 8 08:23:28 UTC 2014 - dmacvicar@suse.de
|
||||
|
||||
- Update to 7.0.55
|
||||
* Update to the Eclipse JDT Compiler 4.4
|
||||
* Better error handling when the error occurs after the response
|
||||
has been committed
|
||||
* Various improvements to the Mapper including fixing some
|
||||
concurrency bugs
|
||||
* See http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 8 07:44:28 UTC 2014 - dmacvicar@suse.de
|
||||
|
||||
- build tomcat-embed as a subpackage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 3 14:43:12 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
|
||||
57
tomcat.spec
57
tomcat.spec
@ -23,7 +23,7 @@
|
||||
%define elspec 2.2
|
||||
%define major_version 7
|
||||
%define minor_version 0
|
||||
%define micro_version 54
|
||||
%define micro_version 55
|
||||
%define packdname apache-tomcat-%{version}-src
|
||||
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
|
||||
%define appdir /srv/%{name}/webapps
|
||||
@ -138,6 +138,13 @@ Requires: %{name} = %{version}-%{release}
|
||||
%description admin-webapps
|
||||
The host-manager and manager web based applications for Apache Tomcat.
|
||||
|
||||
%package embed
|
||||
Summary: Libraries for Embedding Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
|
||||
%description embed
|
||||
Embedded support for Tomcat
|
||||
|
||||
%package docs-webapp
|
||||
Summary: The docs web application for Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
@ -292,7 +299,7 @@ ant -Dbase.path="." \
|
||||
-Dno.build.dbcp=true \
|
||||
-Dversion="%{version}" \
|
||||
-Dversion.build="%{micro_version}" \
|
||||
deploy dist-prepare dist-source javadoc package-java7
|
||||
deploy dist-prepare dist-source javadoc package-java7 embed-jars
|
||||
|
||||
# remove some jars that we'll replace with symlinks later
|
||||
rm output/build/bin/commons-daemon.jar \
|
||||
@ -370,6 +377,11 @@ pushd output/build
|
||||
cp -a lib/*.jar %{buildroot}%{libdir}
|
||||
cp -a webapps/* %{buildroot}%{appdir}
|
||||
popd
|
||||
# tomcat embedded
|
||||
pushd output/embed
|
||||
cp -a *.jar %{buildroot}%{libdir}
|
||||
popd
|
||||
|
||||
# bnc#847505: add missing tomcat-dbcp.jar
|
||||
cp -a commons/dbcp/dbcp-tomcat5/commons-dbcp-tomcat5.jar %{buildroot}/%{libdir}/tomcat-dbcp.jar
|
||||
|
||||
@ -438,6 +450,7 @@ pushd %{buildroot}%{libdir}
|
||||
ln -s ../%{name}-servlet-%{servletspec}-api.jar .
|
||||
ln -s ../%{name}-el-%{elspec}-api.jar .
|
||||
ln -s $(build-classpath commons-collections) commons-collections.jar
|
||||
rm -f commons-dbcp.jar
|
||||
ln -s $(build-classpath commons-dbcp) commons-dbcp.jar
|
||||
ln -s $(build-classpath commons-pool) commons-pool.jar
|
||||
ln -s $(build-classpath commons-pool-tomcat5) commons-pool-tomcat5.jar
|
||||
@ -521,6 +534,33 @@ cp -a tomcat-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
|
||||
cp -a tomcat-util.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar
|
||||
|
||||
cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
|
||||
|
||||
cp -a tomcat7-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat7-websocket.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat7-websocket.pom %{name}/tomcat7-websocket.jar
|
||||
|
||||
cp -a tomcat7-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat7-embed-websocket.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat7-embed-websocket.pom %{name}/tomcat7-embed-websocket.jar
|
||||
|
||||
cp -a tomcat-embed-core.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-core.pom %{name}/tomcat-embed-core.jar
|
||||
|
||||
cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar
|
||||
|
||||
cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar
|
||||
|
||||
cp -a tomcat-embed-logging-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-logging-juli.pom %{name}/tomcat-embed-logging-juli.jar
|
||||
|
||||
cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
|
||||
|
||||
cp -a tomcat7-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat7-embed-websocket.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat7-embed-websocket.pom %{name}/tomcat7-embed-websocket.jar
|
||||
|
||||
# replace temporary copy with link
|
||||
ln -s -f %{bindir}/tomcat-juli.jar %{buildroot}%{libdir}/
|
||||
|
||||
@ -727,11 +767,24 @@ rm -f \
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat7-websocket.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
|
||||
%exclude %{libdir}/%{name}*-embed-*.jar
|
||||
# bnc#418664
|
||||
%dir %{_sysconfdir}/ant.d
|
||||
%config(noreplace) %{_sysconfdir}/ant.d/catalina-ant
|
||||
|
||||
%files embed
|
||||
%defattr(-,root,root)
|
||||
%dir %{libdir}
|
||||
%{libdir}/%{name}*-embed-*.jar
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat7-embed-websocket.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
|
||||
|
||||
%files servlet-3_0-api
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user