forked from pool/tomcat
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
committed by
Git OBS Bridge
Git OBS Bridge
parent
5d26c6aeb1
commit
dd18bdfe7a
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
|
||||
|
||||
Reference in New Issue
Block a user