From a84f62ace4f3ba44611b9df57657bc7a1d575992 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Apr 25 2012 14:20:37 +0000 Subject: Split into number of subpackages --- diff --git a/0007-disable-jetty-osgi.patch b/0007-disable-jetty-osgi.patch new file mode 100644 index 0000000..ab7a0ae --- /dev/null +++ b/0007-disable-jetty-osgi.patch @@ -0,0 +1,48 @@ +From 7960d310a66c37b676b1fd03baae019530ccae79 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 24 Apr 2012 11:22:42 +0200 +Subject: [PATCH 7/7] disable jetty-osgi + +--- + pom.xml | 18 ------------------ + 1 files changed, 0 insertions(+), 18 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 6d778cc..f0ed5eb 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -322,7 +322,6 @@ + jetty-start + jetty-nested + jetty-overlay-deployer +- jetty-osgi + jetty-distribution + test-jetty-webapp + jetty-nosql +@@ -417,23 +416,6 @@ + + + +- +- osgi +- +- true +- +- ${basedir}/pom.xml +- +- +- +- jetty-osgi +- +- +- + update-version + + +-- +1.7.7.6 + diff --git a/jetty.spec b/jetty.spec index 06f868a..090b3cd 100644 --- a/jetty.spec +++ b/jetty.spec @@ -44,10 +44,11 @@ Name: jetty Version: 8.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet +# TODO: fix the license tag License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-%{version}.%{addver}.tar.bz2 @@ -55,33 +56,37 @@ Source1: djetty.script Source3: jetty.logrotate Source4: %{name}-depmap.xml Source5: %{name}.service -Patch0: 0001-Remove-javadoc-execution.patch -Patch1: 0002-Cleaup-distribution-generation.patch -Patch2: 0003-Disable-test-artifacts.patch -Patch3: 0004-Change-servelt-groupId-to-javax.servlet.patch -Patch4: 0005-Modify-dependencies.patch -Patch5: 0006-Remove-pmd-plugin.patch +Patch1: 0001-Remove-javadoc-execution.patch +Patch2: 0002-Cleaup-distribution-generation.patch +Patch3: 0003-Disable-test-artifacts.patch +Patch4: 0004-Change-servelt-groupId-to-javax.servlet.patch +Patch5: 0005-Modify-dependencies.patch +Patch6: 0006-Remove-pmd-plugin.patch +Patch8: 0007-disable-jetty-osgi.patch -BuildRequires: eclipse-platform BuildRequires: fedora-usermgmt-devel -BuildRequires: felix-framework -BuildRequires: geronimo-annotation BuildRequires: geronimo-jaspic-spec -BuildRequires: geronimo-jta -BuildRequires: jakarta-taglibs-standard BuildRequires: java-devel >= 1:1.7.0 +BuildRequires: jpackage-utils BuildRequires: maven BuildRequires: maven-dependency-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-war-plugin BuildRequires: mongo-java-driver >= 2.6.5-4 BuildRequires: objectweb-asm +BuildRequires: slf4j BuildRequires: systemd-units -BuildRequires: tomcat-el-2.2-api -BuildRequires: tomcat-jsp-2.2-api BuildRequires: tomcat-lib BuildRequires: tomcat-servlet-3.0-api -BuildRequires: tomcat-servlet-3.0-api +%if 0%{?rhel} <= 0 +BuildRequires: eclipse-platform +BuildRequires: eclipse-rcp +%endif +BuildRequires: geronimo-annotation +BuildRequires: geronimo-jta +BuildRequires: jakarta-taglibs-standard +BuildRequires: tomcat-el-2.2-api +BuildRequires: tomcat-jsp-2.2-api # we want javamail not classpathx-javamail BuildRequires: %{_javadir}/javamail/mail.jar @@ -93,27 +98,40 @@ BuildRequires: jetty-toolchain BuildRequires: jetty-assembly-descriptors BuildRequires: jetty-test-policy BuildRequires: jetty-artifact-remote-resources - +#FIXME: the JSP is probably broken, eclipse-ecj et al. need to be R and BR BuildArch: noarch -Requires: chkconfig -Requires: felix-framework -Requires: geronimo-annotation -Requires: geronimo-jta -Requires: jakarta-taglibs-standard -Requires: javamail -Requires: jpackage-utils >= 0:1.6 -Requires: jsp22 -Requires: objectweb-asm -Requires: slf4j -Requires: tomcat-el-2.2-api -Requires: tomcat-jsp-2.2-api -Requires: tomcat-lib -Requires: tomcat-servlet-3.0-api -Requires: tomcat-servlet-3.0-api -Requires: xerces-j2 >= 0:2.7 -Requires: xml-commons-apis +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-ajp = %{epoch}:%{version}-%{release} +Requires: jetty-annotations = %{epoch}:%{version}-%{release} +Requires: jetty-client = %{epoch}:%{version}-%{release} +Requires: jetty-continuation = %{epoch}:%{version}-%{release} +Requires: jetty-deploy = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-http-spi = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-jaspi = %{epoch}:%{version}-%{release} +Requires: jetty-jmx = %{epoch}:%{version}-%{release} +Requires: jetty-jndi = %{epoch}:%{version}-%{release} +Requires: jetty-nested = %{epoch}:%{version}-%{release} +Requires: jetty-nosql = %{epoch}:%{version}-%{release} +Requires: jetty-overlay-deployer = %{epoch}:%{version}-%{release} +Requires: jetty-plus = %{epoch}:%{version}-%{release} +Requires: jetty-policy = %{epoch}:%{version}-%{release} +Requires: jetty-rewrite = %{epoch}:%{version}-%{release} +Requires: jetty-security = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-servlet = %{epoch}:%{version}-%{release} +Requires: jetty-servlets = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: jetty-websocket = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} +%if 0%{?rhel} <= 0 +Requires: jetty-osgi = %{epoch}:%{version}-%{release} +%endif %{?FE_USERADD_REQ} Requires(post): systemd-units, systemd-sysv @@ -121,42 +139,439 @@ Requires(preun): systemd-units Requires(postun): systemd-units Provides: group(%username) = %jtuid -Provides: user(%username) = %jtuid +Provides: user(%username) = %jtuid Obsoletes: %{name}-manual < %{version}-%{release} %description -Jetty is a 100% Java HTTP Server and Servlet Container. -This means that you do not need to configure and run a -separate web server (like Apache) in order to use java, -servlets and JSPs to generate dynamic content. Jetty is -a fully featured web server for static and dynamic content. -Unlike separate server/container solutions, this means -that your web server and web application run in the same -process, without interconnection overheads and complications. -Furthermore, as a pure java component, Jetty can be simply -included in your application for demonstration, distribution -or deployment. Jetty is available on all Java supported -platforms. +%global desc \ +Jetty is a 100% Java HTTP Server and Servlet Container. This means that you\ +do not need to configure and run a separate web server (like Apache) in order\ +to use Java, servlets and JSPs to generate dynamic content. Jetty is a fully\ +featured web server for static and dynamic content. Unlike separate\ +server/container solutions, this means that your web server and web\ +application run in the same process, without interconnection overheads\ +and complications. Furthermore, as a pure java component, Jetty can be simply\ +included in your application for demonstration, distribution or deployment.\ +Jetty is available on all Java supported platforms. +%{desc} +%global extdesc %{desc}\ +\ +This package contains + +%package project +Summary: POM files for Jetty +Group: Development/Libraries +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-parent + +%description project +%{extdesc} %{summary}. + +%package ajp +Summary: ajp module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description ajp +%{extdesc} %{summary}. + +%package annotations +Summary: annotations module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-plus = %{epoch}:%{version}-%{release} +Requires: jetty-security = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-servlet = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: objectweb-asm +Requires: geronimo-annotation +Requires: tomcat-lib + +%description annotations +%{extdesc} %{summary}. + +%package client +Summary: client module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} + +%description client +%{extdesc} %{summary}. + +%package continuation +Summary: continuation module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description continuation +%{extdesc} %{summary}. + +%package deploy +Summary: deploy module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-jmx = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} + +%description deploy +%{extdesc} %{summary}. + +%package http +Summary: http module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description http +%{extdesc} %{summary}. + +%package http-spi +Summary: http-spi module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description http-spi +%{extdesc} %{summary}. + +%package io +Summary: io module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} + +%description io +%{extdesc} %{summary}. + +%package jaspi +Summary: jaspi module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-security = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: geronimo-jaspic-spec +Requires: tomcat-servlet-3.0-api + +%description jaspi +%{extdesc} %{summary}. + +%package jmx +Summary: jmx module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} + +%description jmx +%{extdesc} %{summary}. + +%package jndi +Summary: jndi module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: %{_javadir}/javamail/mail.jar + +%description jndi +%{extdesc} %{summary}. + +%package monitor +Summary: monitor module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-client = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} + +%description monitor +%{extdesc} %{summary}. + +%package nested +Summary: nested module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description nested +%{extdesc} %{summary}. + +%package nosql +Summary: nosql module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: mongo-java-driver >= 2.6.5-4 +Requires: tomcat-servlet-3.0-api + +%description nosql +%{extdesc} %{summary}. + +%package overlay-deployer +Summary: overlay-deployer module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-deploy = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-jndi = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-servlet = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} +Requires: geronimo-jta +Requires: tomcat-servlet-3.0-api + +%description overlay-deployer +%{extdesc} %{summary}. + +%package plus +Summary: plus module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-jndi = %{epoch}:%{version}-%{release} +Requires: jetty-security = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-servlet = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description plus +%{extdesc} %{summary}. + +%package policy +Summary: policy module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} + +%description policy +%{extdesc} %{summary}. + +%package rewrite +Summary: rewrite module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-client = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description rewrite +%{extdesc} %{summary}. + +%package security +Summary: security module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description security +%{extdesc} %{summary}. + +%package server +Summary: server module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils = %{epoch}:%{version}-%{release} +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-continuation = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-jmx = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description server +%{extdesc} %{summary}. + +%package servlet +Summary: servlet module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-continuation = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-jmx = %{epoch}:%{version}-%{release} +Requires: jetty-security = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description servlet +%{extdesc} %{summary}. + +%package servlets +Summary: servlets module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-client = %{epoch}:%{version}-%{release} +Requires: jetty-continuation = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description servlets +%{extdesc} %{summary}. + +%package util +Summary: util module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api +Requires: slf4j + +%description util +%{extdesc} %{summary}. + +%package webapp +Summary: webapp module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-security = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-servlet = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} +Requires: jakarta-taglibs-standard +Requires: tomcat-servlet-3.0-api + +%description webapp +%{extdesc} %{summary}. + +%package websocket +Summary: websocket module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-http = %{epoch}:%{version}-%{release} +Requires: jetty-io = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: tomcat-servlet-3.0-api + +%description websocket +%{extdesc} %{summary}. + +%package xml +Summary: xml module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} + +%description xml +%{extdesc} %{summary}. + +%if 0%{?rhel} <= 0 +%package osgi +Summary: OSGi module for Jetty +Requires: java >= 1:1.7.0 +Requires: jpackage-utils +Requires: jetty-project = %{epoch}:%{version}-%{release} +Requires: jetty-annotations = %{epoch}:%{version}-%{release} +Requires: jetty-deploy = %{epoch}:%{version}-%{release} +Requires: jetty-nested = %{epoch}:%{version}-%{release} +Requires: jetty-server = %{epoch}:%{version}-%{release} +Requires: jetty-servlet = %{epoch}:%{version}-%{release} +Requires: jetty-util = %{epoch}:%{version}-%{release} +Requires: jetty-webapp = %{epoch}:%{version}-%{release} +Requires: jetty-xml = %{epoch}:%{version}-%{release} +Requires: eclipse-platform +Requires: eclipse-rcp +Requires: tomcat-servlet-3.0-api +Requires: tomcat-el-2.2-api +Requires: tomcat-jsp-2.2-api +Requires: tomcat-lib + +%description osgi +%{extdesc} %{summary}. +%endif %package javadoc Summary: Javadoc for %{name} Group: Documentation +Requires: jpackage-utils %description javadoc -%{summary}. +%{extdesc} %{summary}. %prep %setup -q -n %{jettyname}-%{version}.%{addver} for f in $(find . -name "*.?ar"); do rm $f; done find . -name "*.class" -exec rm {} \; -%patch0 -p1 -b .sav %patch1 -p1 -b .sav %patch2 -p1 -b .sav %patch3 -p1 -b .sav %patch4 -p1 -b .sav %patch5 -p1 -b .sav +%patch6 -p1 -b .sav +%if 0%{?rhel} > 0 +%patch8 -p1 -b .sav +%endif cp %{SOURCE1} djetty @@ -169,10 +584,6 @@ iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,} %build -#rm -rf ./* -#ln -sf ~/temp/jetty/jetty-8.1.0.%{addver}.copy/* . -#exit 0 -# remove previous lines! sed -i -e "s|/usr/share|%{_datadir}|g" djetty mvn-rpmbuild -X \ @@ -225,40 +636,42 @@ for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \ ln -s %{_javadir}/%{name}/$module.jar \ %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom - %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module done # modules used during build and other jars not included in the # distribution tarball for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do - install $module/target/$module-%{version}.%{addver}.jar \ + install -m 644 $module/target/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom - %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module done +%if 0%{?rhel} <= 0 pushd jetty-osgi install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-osgi.pom - %add_maven_depmap JPP.%{name}-jetty-osgi.pom + %add_maven_depmap JPP.%{name}-jetty-osgi.pom -f jetty-osgi for submod in boot boot-jsp boot-warurl;do module=jetty-osgi-$submod - install $module/target/$module-%{version}.%{addver}.jar \ + install -m 644 $module/target/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom - %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f jetty-osgi done #httpservice is a bit special (for no good reason) module=jetty-httpservice - install jetty-osgi-httpservice/target/$module-%{version}.%{addver}.jar \ + install -m 644 jetty-osgi-httpservice/target/$module-%{version}.%{addver}.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 jetty-osgi-httpservice/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom - %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f jetty-osgi popd +%endif install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom -%add_maven_depmap JPP.%{name}-project.pom +%add_maven_depmap JPP.%{name}-project.pom -f project # recreat tarball structure in lib ln -sf $(build-classpath tomcat-servlet-3.0-api) \ @@ -283,7 +696,7 @@ mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.%{addver}.jar \ ln -s %{_javadir}/%{name}/jetty-monitor.jar \ %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.%{addver}.jar install -pm 644 jetty-monitor/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-monitor.pom -%add_maven_depmap JPP.%{name}-jetty-monitor.pom %{name}/jetty-monitor.jar +%add_maven_depmap JPP.%{name}-jetty-monitor.pom %{name}/jetty-monitor.jar -f jetty-monitor mv %{buildroot}%{homedir}/start.jar \ %{buildroot}%{_javadir}/%{name}/jetty-start.jar @@ -391,10 +804,6 @@ fi %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} %{_bindir}/* -%dir %{_javadir}/%{name} -%{_javadir}/%{name} -%{_mavenpomdir}/JPP*pom -%{_mavendepmapfragdir}/%{name} %config(noreplace) %{confdir} %dir %{jettylibdir} %dir %{jettycachedir} @@ -404,12 +813,190 @@ fi %ghost %dir %attr(755, jetty, jetty) %{rundir} %{appdir} %{_unitdir}/%{name}.service +%{_javadir}/%{name}/%{name}-start.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-start.pom +%{_mavendepmapfragdir}/%{name} + +%files project +%doc NOTICE.txt LICENSE* +%dir %{_javadir}/%{name} +%{_mavenpomdir}/JPP.%{name}-project.pom +%{_mavendepmapfragdir}/%{name}-project + +%files ajp +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-ajp.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-ajp.pom +%{_mavendepmapfragdir}/%{name}-%{name}-ajp + +%files annotations +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-annotations.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-annotations.pom +%{_mavendepmapfragdir}/%{name}-%{name}-annotations + +%files client +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-client.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-client.pom +%{_mavendepmapfragdir}/%{name}-%{name}-client + +%files continuation +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-continuation.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-continuation.pom +%{_mavendepmapfragdir}/%{name}-%{name}-continuation + +%files deploy +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-deploy.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-deploy.pom +%{_mavendepmapfragdir}/%{name}-%{name}-deploy + +%files http +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-http.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-http.pom +%{_mavendepmapfragdir}/%{name}-%{name}-http + +%files http-spi +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-http-spi.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-http-spi.pom +%{_mavendepmapfragdir}/%{name}-%{name}-http-spi + +%files io +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-io.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-io.pom +%{_mavendepmapfragdir}/%{name}-%{name}-io + +%files jaspi +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-jaspi.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-jaspi.pom +%{_mavendepmapfragdir}/%{name}-%{name}-jaspi + +%files jmx +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-jmx.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-jmx.pom +%{_mavendepmapfragdir}/%{name}-%{name}-jmx + +%files jndi +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-jndi.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-jndi.pom +%{_mavendepmapfragdir}/%{name}-%{name}-jndi + +%files monitor +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-monitor.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-monitor.pom +%{_mavendepmapfragdir}/%{name}-%{name}-monitor + +%files nested +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-nested.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-nested.pom +%{_mavendepmapfragdir}/%{name}-%{name}-nested + +%files nosql +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-nosql.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-nosql.pom +%{_mavendepmapfragdir}/%{name}-%{name}-nosql + +%files overlay-deployer +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-overlay-deployer.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-overlay-deployer.pom +%{_mavendepmapfragdir}/%{name}-%{name}-overlay-deployer + +%files plus +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-plus.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-plus.pom +%{_mavendepmapfragdir}/%{name}-%{name}-plus + +%files policy +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-policy.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-policy.pom +%{_mavendepmapfragdir}/%{name}-%{name}-policy + +%files rewrite +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-rewrite.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-rewrite.pom +%{_mavendepmapfragdir}/%{name}-%{name}-rewrite + +%files security +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-security.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-security.pom +%{_mavendepmapfragdir}/%{name}-%{name}-security + +%files server +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-server.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-server.pom +%{_mavendepmapfragdir}/%{name}-%{name}-server + +%files servlet +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-servlet.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-servlet.pom +%{_mavendepmapfragdir}/%{name}-%{name}-servlet + +%files servlets +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-servlets.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-servlets.pom +%{_mavendepmapfragdir}/%{name}-%{name}-servlets + +%files util +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-util.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-util.pom +%{_mavendepmapfragdir}/%{name}-%{name}-util + +%files webapp +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-webapp.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-webapp.pom +%{_mavendepmapfragdir}/%{name}-%{name}-webapp + +%files websocket +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-websocket.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-websocket.pom +%{_mavendepmapfragdir}/%{name}-%{name}-websocket + +%files xml +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-xml.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-xml.pom +%{_mavendepmapfragdir}/%{name}-%{name}-xml + +%if 0%{?rhel} <= 0 +%files osgi +%doc NOTICE.txt LICENSE* +%{_javadir}/%{name}/%{name}-osgi*.jar +%{_javadir}/%{name}/%{name}-httpservice.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-osgi*.pom +%{_mavenpomdir}/JPP.%{name}-%{name}-httpservice.pom +%{_mavendepmapfragdir}/%{name}-%{name}-osgi +%endif %files javadoc -%doc LICENSE* +%doc NOTICE.txt LICENSE* %doc %{_javadocdir}/%{name} %changelog +* Wed Apr 25 2012 Mikolaj Izdebski - 8.1.0-7 +- Split into number of subpackages + * Mon Apr 23 2012 Mikolaj Izdebski - 8.1.0-6 - Drop init script, resolves #814788 - Remove jetty.script from SCM