From 76c5d6a141787ee39bda8364619d307c0610c56e Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Feb 20 2013 16:06:47 +0000 Subject: Update to upstream version 9.0.0.RC0 - Build with xmvn --- diff --git a/0001-Use-standard-java.utils-package.patch b/0001-Use-standard-java.utils-package.patch new file mode 100644 index 0000000..2674019 --- /dev/null +++ b/0001-Use-standard-java.utils-package.patch @@ -0,0 +1,30 @@ +From 00589384974dc728f9b6a05251f6c2d6ccf831a4 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 15 Feb 2013 10:47:52 +0100 +Subject: [PATCH] Use standard java.utils package + +--- + .../src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java +index d7ce310..0b8aa41 100644 +--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java ++++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java +@@ -20,12 +20,12 @@ + package org.eclipse.jetty.maven.plugin; + + import java.util.ArrayList; ++import java.util.Arrays; + import java.util.Iterator; + import java.util.List; + + import org.codehaus.plexus.util.xml.Xpp3Dom; + +-import edu.emory.mathcs.backport.java.util.Arrays; + + /** + * OverlayConfig +-- +1.8.1.2 + diff --git a/jetty-depmap.xml b/jetty-depmap.xml index c6160fa..878ed70 100644 --- a/jetty-depmap.xml +++ b/jetty-depmap.xml @@ -5,10 +5,10 @@ ecj 2.2 - + JPP ecj - 7.0.23 + 7.0.23 diff --git a/jetty.spec b/jetty.spec index 4f93457..fc3a12d 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,8 @@ %global jettylibdir %{_localstatedir}/lib/%{name} %global appdir %{jettylibdir}/webapps -%global addver v20130131 + +%global addver RC0 # Conditionals to help breaking eclipse <-> jetty dependency cycle # when bootstrapping for new architectures @@ -50,20 +51,21 @@ %endif Name: jetty -Version: 8.1.9 -Release: 3%{?dist} +Version: 9.0.0 +Release: 0.1.%{addver}%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt License: ASL 2.0 or EPL URL: http://www.eclipse.org/jetty/ -Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-%{version}.%{addver}.tar.bz2 +Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-%{version}.%{addver}.tar.gz Source1: djetty.script Source3: jetty.logrotate Source4: %{name}-depmap.xml Source5: %{name}.service Patch0: %{name}-create-work-dir.patch +Patch1: 0001-Use-standard-java.utils-package.patch Patch4: 0004-Modify-dependencies.patch BuildRequires: geronimo-annotation @@ -76,6 +78,7 @@ BuildRequires: java-devel >= 1:1.7.0 BuildRequires: jpackage-utils BuildRequires: javapackages-tools >= 0.7.0 BuildRequires: jvnet-parent +BuildRequires: ant BuildRequires: maven-local BuildRequires: maven-dependency-plugin BuildRequires: maven-enforcer-plugin @@ -88,6 +91,9 @@ BuildRequires: tomcat-el-2.2-api BuildRequires: tomcat-jsp-2.2-api BuildRequires: tomcat-lib BuildRequires: tomcat-servlet-3.0-api +BuildRequires: maven-license-plugin +BuildRequires: springframework-beans +BuildRequires: geronimo-parent-poms %if %{with osgi} BuildRequires: eclipse-platform @@ -97,8 +103,7 @@ BuildRequires: eclipse-rcp BuildRequires: mongo-java-driver >= 2.6.5-4 %endif -# we want javamail not classpathx-javamail -BuildRequires: %{_javadir}/javamail/mail.jar +BuildRequires: javamail BuildRequires: jetty-parent BuildRequires: jetty-distribution-remote-resources BuildRequires: jetty-build-support @@ -108,50 +113,52 @@ BuildRequires: jetty-assembly-descriptors BuildRequires: jetty-test-policy BuildRequires: jetty-artifact-remote-resources - BuildArch: noarch Requires: java >= 1:1.7.0 Requires: jpackage-utils -Requires: jetty-ajp = %{version}-%{release} -Requires: jetty-annotations = %{version}-%{release} -Requires: jetty-client = %{version}-%{release} -Requires: jetty-continuation = %{version}-%{release} -Requires: jetty-deploy = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-jmx = %{version}-%{release} -Requires: jetty-jndi = %{version}-%{release} -Requires: jetty-overlay-deployer = %{version}-%{release} -Requires: jetty-plus = %{version}-%{release} -Requires: jetty-policy = %{version}-%{release} -Requires: jetty-rewrite = %{version}-%{release} -Requires: jetty-security = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-servlet = %{version}-%{release} -Requires: jetty-servlets = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: jetty-websocket = %{version}-%{release} -Requires: jetty-xml = %{version}-%{release} -# These are not required by main jetty server so we don't require them -# in RPM. Install as necessary: -# * jetty-http-spi -# * jetty-jaspi -# * jetty-nested -# * jetty-nosql -# * jetty-osgi +Requires: jetty-client = %{version}-%{release} +Requires: jetty-annotations = %{version}-%{release} +Requires: jetty-client = %{version}-%{release} +Requires: jetty-continuation = %{version}-%{release} +Requires: jetty-deploy = %{version}-%{release} +Requires: jetty-http = %{version}-%{release} +Requires: jetty-io = %{version}-%{release} +Requires: jetty-jaas = %{version}-%{release} +Requires: jetty-jmx = %{version}-%{release} +Requires: jetty-jndi = %{version}-%{release} +Requires: jetty-plus = %{version}-%{release} +Requires: jetty-proxy = %{version}-%{release} +Requires: jetty-rewrite = %{version}-%{release} +Requires: jetty-security = %{version}-%{release} +Requires: jetty-server = %{version}-%{release} +Requires: jetty-servlet = %{version}-%{release} +Requires: jetty-servlets = %{version}-%{release} +Requires: jetty-util = %{version}-%{release} +Requires: jetty-webapp = %{version}-%{release} +Requires: jetty-websocket-api = %{version}-%{release} +Requires: jetty-websocket-common = %{version}-%{release} +Requires: jetty-websocket-server = %{version}-%{release} +Requires: jetty-websocket-servlet = %{version}-%{release} Requires(pre): shadow-utils Requires(post): systemd-units, systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units + Provides: group(%username) = %jtuid Provides: user(%username) = %jtuid Obsoletes: %{name}-manual < %{version}-%{release} +Obsoletes: %{name}-ajp < %{version}-%{release} +Obsoletes: %{name}-http-spi < %{version}-%{release} +Obsoletes: %{name}-monitor < %{version}-%{release} +Obsoletes: %{name}-nested < %{version}-%{release} +Obsoletes: %{name}-overlay-deployer < %{version}-%{release} +Obsoletes: %{name}-policy < %{version}-%{release} + %description %global desc \ Jetty is a 100% Java HTTP Server and Servlet Container. This means that you\ @@ -171,430 +178,302 @@ 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 = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-plus = %{version}-%{release} -Requires: jetty-security = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-servlet = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: objectweb-asm -Requires: geronimo-annotation -Requires: tomcat-lib + %description annotations %{extdesc} %{summary}. +%package ant +Summary: ant module for Jetty + +%description ant +%{extdesc} %{summary}. + %package client Summary: client module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-jmx = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: jetty-xml = %{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 = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: tomcat-servlet-3.0-api +%package httpservice +Summary: httpservice module for Jetty -%description http-spi +%description httpservice %{extdesc} %{summary}. %package io Summary: io module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} %description io %{extdesc} %{summary}. +%package jaas +Summary: jaas module for Jetty + +%description jaas +%{extdesc} %{summary}. + %package jaspi Summary: jaspi module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-security = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{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 = %{version}-%{release} -Requires: jetty-client = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-xml = %{version}-%{release} +%package jsp +Summary: jsp module for Jetty -%description monitor +%description jsp %{extdesc} %{summary}. -%package nested -Summary: nested module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: tomcat-servlet-3.0-api - -%description nested +%package jspc-maven-plugin +Summary: jspc-maven-plugin module for Jetty + +%description jspc-maven-plugin %{extdesc} %{summary}. -%package overlay-deployer -Summary: overlay-deployer module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-deploy = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-jndi = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-servlet = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: jetty-xml = %{version}-%{release} -Requires: geronimo-jta -Requires: tomcat-servlet-3.0-api - -%description overlay-deployer +%package maven-plugin +Summary: maven-plugin module for Jetty + +%description maven-plugin %{extdesc} %{summary}. %package plus Summary: plus module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-jndi = %{version}-%{release} -Requires: jetty-security = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-servlet = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: jetty-xml = %{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 = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} +%package proxy +Summary: proxy module for Jetty -%description policy +%description proxy %{extdesc} %{summary}. %package rewrite Summary: rewrite module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-client = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: tomcat-servlet-3.0-api %description rewrite %{extdesc} %{summary}. +%package runner +Summary: runner module for Jetty + +%description runner +%{extdesc} %{summary}. + %package security Summary: security module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{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 -Requires: jetty-project = %{version}-%{release} -Requires: jetty-continuation = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-jmx = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-continuation = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-jmx = %{version}-%{release} -Requires: jetty-security = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-client = %{version}-%{release} -Requires: jetty-continuation = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: tomcat-servlet-3.0-api %description servlets %{extdesc} %{summary}. +%package spring +Summary: spring module for Jetty + +%description spring +%{extdesc} %{summary}. + +%package start +Summary: start module for Jetty + +%description start +%{extdesc} %{summary}. + %package util Summary: util module for Jetty # Utf8Appendable.java is additionally under MIT license License: (ASL 2.0 or EPL) and MIT -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: tomcat-servlet-3.0-api -Requires: slf4j + %description util + +%package util-ajax +Summary: util-ajax module for Jetty + +%description util-ajax %{extdesc} %{summary}. %package webapp Summary: webapp module for Jetty -License: ASL 2.0 or EPL -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-security = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-servlet = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-xml = %{version}-%{release} -Requires: glassfish-jsp -Requires: glassfish-jsp-api -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 = %{version}-%{release} -Requires: jetty-http = %{version}-%{release} -Requires: jetty-io = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{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 = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} %description xml %{extdesc} %{summary}. +%package websocket-api +Summary: websocket-api module for Jetty + +%description websocket-api +%{extdesc} %{summary}. + +%package websocket-client +Summary: websocket-client module for Jetty + +%description websocket-client +%{extdesc} %{summary}. + +%package websocket-common +Summary: websocket-common module for Jetty + +%description websocket-common +%{extdesc} %{summary}. + +%package websocket-parent +Summary: POM file for jetty-websocket + +%description websocket-parent +%{extdesc} %{summary}. + +%package websocket-server +Summary: websocket-server module for Jetty + +%description websocket-server +%{extdesc} %{summary}. + +%package websocket-servlet +Summary: websocket-servlet module for Jetty + +%description websocket-servlet +%{extdesc} %{summary}. + %if %{with nosql} %package nosql Summary: nosql module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: mongo-java-driver >= 2.6.5-4 -Requires: tomcat-servlet-3.0-api %description nosql %{extdesc} %{summary}. %endif %if %{with osgi} -%package osgi -Summary: OSGi module for Jetty -Requires: java >= 1:1.7.0 -Requires: jpackage-utils -Requires: jetty-project = %{version}-%{release} -Requires: jetty-annotations = %{version}-%{release} -Requires: jetty-deploy = %{version}-%{release} -Requires: jetty-nested = %{version}-%{release} -Requires: jetty-server = %{version}-%{release} -Requires: jetty-servlet = %{version}-%{release} -Requires: jetty-util = %{version}-%{release} -Requires: jetty-webapp = %{version}-%{release} -Requires: jetty-xml = %{version}-%{release} -Requires: eclipse-platform -Requires: eclipse-rcp -Requires: glassfish-jsp -Requires: glassfish-jsp-api -Requires: tomcat-servlet-3.0-api -Requires: tomcat-el-2.2-api -Requires: tomcat-jsp-2.2-api -Requires: tomcat-lib - -%description osgi +%package osgi-boot +Summary: osgi-boot module for Jetty + +%description osgi-boot +%{extdesc} %{summary}. + +%package osgi-boot-warurl +Summary: osgi-boot-warurl module for Jetty + +%description osgi-boot-warurl +%{extdesc} %{summary}. + +%package osgi-project +Summary: osgi-project module for Jetty + +%description osgi-project +%{extdesc} %{summary}. + +%package osgi-boot-jsp +Summary: osgi-boot-jsp module for Jetty + +%description osgi-boot-jsp %{extdesc} %{summary}. -%endif + +%endif # with osgi %package javadoc Summary: Javadoc for %{name} Group: Documentation # some MIT-licensed code (from Utf8Appendable) is used to generate javadoc License: (ASL 2.0 or EPL) and MIT -Requires: jpackage-utils %description javadoc %{summary}. %prep -%setup -q -n %{jettyname}-%{version}.%{addver} +%setup -q -n %{jettyname}.project-jetty-%{version}.%{addver} for f in $(find . -name "*.?ar"); do rm $f; done find . -name "*.class" -exec rm {} \; %patch0 -p2 -b .sav +%patch1 -p1 -b .sav %patch4 -p1 -b .sav -# Remove javadoc execution -# We generate javadoc as a separate step -%pom_remove_plugin :maven-javadoc-plugin jetty-aggregate/jetty-all -%pom_remove_dep :jetty-all jetty-distribution -%pom_remove_dep org.mortbay.jetty:jetty-util jetty-continuation +# Use proper groupId for apache ant +%pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml -# Disable test artifacts +# Disable test and example artifacts # they need more dependencies then we have time for right now :-) +# and also xmvn currently doesn't support .war %pom_disable_module tests -%pom_disable_module test-continuation -%pom_disable_module test-jetty-nested -%pom_disable_module test-jetty-servlet -%pom_disable_module test-jetty-osgi jetty-osgi +%pom_disable_module examples +%pom_disable_module test-jetty-osgi jetty-osgi/pom.xml + +# Since tests are disabled, we don't have some jars +%pom_remove_dep :test-jetty-webapp jetty-distribution/pom.xml +%pom_remove_dep :test-proxy-webapp jetty-distribution/pom.xml +%pom_remove_dep :example-async-rest-webapp jetty-distribution/pom.xml +%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-jetty-webapp']]" jetty-distribution/pom.xml +%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-proxy-webapp']]" jetty-distribution/pom.xml +%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='example-async-rest-webapp']]" jetty-distribution/pom.xml + +# Missing jars (jetty-setuid-java-1.0.0.jar,jetty-setuid-java-1.0.0-config.jar) +%pom_xpath_remove "pom:execution[pom:id[text()='unpack-setuid-config']]" jetty-distribution/pom.xml +%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-distribution/pom.xml + +# We don't have this plugin yet +%pom_remove_plugin :findbugs-maven-plugin jetty-websocket/pom.xml + +# enforcer plugin constantly complains +%pom_remove_plugin :maven-enforcer-plugin # Change servelt groupId to javax.servlet %pom_xpath_inject "pom:project/pom:properties" " @@ -621,7 +500,6 @@ find . -name "*.class" -exec rm {} \; # (like some TLS extensions for OpenJDK) %pom_disable_module jetty-spdy %pom_remove_dep org.eclipse.jetty.spdy: jetty-distribution -%pom_xpath_remove "pom:execution[pom:id[text()='copy-spdy']]" jetty-distribution # Disable OSGi %if %{without osgi} @@ -645,25 +523,22 @@ find . -name "*.class" -exec rm {} \; cp %{SOURCE1} djetty -# this needs jetty6 things, so just remove it -# shouldn't cause any trouble since it handled only in loadClass elsewhere -rm jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Jetty6Continuation.java iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \ LICENSE-CONTRIBUTOR/CDDLv1.0.txt.con 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 -e \ - -Dmaven.local.depmap.file=%{SOURCE4} \ - -Dmaven.test.skip=true \ - install javadoc:aggregate +%mvn_package :jetty-distribution __noinstall +# Separate package for main POM file +%mvn_package :jetty-project project + +export XMVN_RESOLV_DEPMAPS=",%{SOURCE4}" +# we don't have all necessary dependencies to run tests +%mvn_build -f -s + cd jetty-distribution rm -rf target/distribution mkdir -p target/distribution @@ -671,22 +546,17 @@ find .. -ipath '*target/*config.jar' | ( while read; do unzip $REPLY -x 'META-INF/*' -d target/distribution done) -mvn-rpmbuild \ - -Dmaven.repo.local=$(pwd)/../.m2 \ - -Dmaven.local.depmap.file=%{SOURCE4} \ - -Dmaven.test.skip=true \ - install javadoc:aggregate - %install +%mvn_install + # dirs install -dm 755 %{buildroot}%{_bindir} install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d install -dm 755 %{buildroot}%{_javadir}/%{name} - - install -dm 755 %{buildroot}%{_javadocdir}/%{name} install -dm 755 %{buildroot}%{confdir} install -dm 755 %{buildroot}%{homedir} +install -dm 755 %{buildroot}%{homedir}/start.d install -dm 755 %{buildroot}%{logdir} install -dm 755 %{buildroot}%{rundir} install -dm 755 %{buildroot}%{tempdir} @@ -699,9 +569,12 @@ cp %{SOURCE5} %{buildroot}%{_unitdir}/ # main pkg tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir} mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/ -rm -rf %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver} +rm -rf %{buildroot}%{homedir}/%{name}-distribution-%{version} rm -f %{buildroot}%{homedir}/bin/*cygwin* +# copy previously extracted configuration +cp jetty-distribution/target/distribution/etc/* %{buildroot}%{homedir}/etc/ + chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh chmod +x djetty mv djetty %{buildroot}%{_bindir}/djetty @@ -715,64 +588,9 @@ sed -i "1{s:^:lib=%{homedir}/lib\n:}" %{buildroot}%{homedir}/start.ini mv %{buildroot}%{homedir}/start.ini %{buildroot}%{confdir} ln -s %{confdir}/start.ini %{buildroot}%{homedir} - -install -dm 755 %{buildroot}%{_mavenpomdir} -for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \ - jetty-deploy jetty-http jetty-io jetty-jmx jetty-jndi \ - jetty-overlay-deployer jetty-plus jetty-policy \ - jetty-rewrite jetty-security jetty-server jetty-servlet \ - jetty-servlets jetty-util jetty-webapp jetty-websocket \ - jetty-xml; do - mv %{buildroot}%{homedir}/lib/$module-*.jar \ - %{buildroot}%{_javadir}/%{name}/$module.jar - 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 -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; do - 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 -f $module -done - -%if %{with nosql} -install -m 644 jetty-nosql/target/jetty-nosql-%{version}.%{addver}.jar \ - %{buildroot}%{_javadir}/%{name}/jetty-nosql.jar -install -pm 644 jetty-nosql/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-nosql.pom -%add_maven_depmap JPP.%{name}-jetty-nosql.pom %{name}/jetty-nosql.jar -f jetty-nosql -%endif - -%if %{with osgi} -pushd jetty-osgi - install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/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 -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 -f jetty-osgi - done - - #httpservice is a bit special (for no good reason) - module=jetty-httpservice - 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 -f jetty-osgi -popd -%endif - -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom -%add_maven_depmap JPP.%{name}-project.pom -f project - # purge bundled jars -rm %{buildroot}%{homedir}/lib/{annotations,jndi,jsp,jta}/* +rm %{buildroot}%{homedir}/lib/{annotations,jndi,jsp,websocket}/* +rm %{buildroot}%{homedir}/lib/*.jar # recreat tarball structure in lib ln -sf $(build-classpath tomcat-servlet-3.0-api) \ @@ -788,23 +606,22 @@ build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \ glassfish-jsp-api tomcat/jasper tomcat/jasper-el tomcat/tomcat-api \ tomcat/tomcat-juli tomcat/tomcat-jsp-2.2-api - ln -sf $(build-classpath geronimo-jta) \ - %{buildroot}%{homedir}/lib/jta/ - -mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.%{addver}.jar \ - %{buildroot}%{_javadir}/%{name}/jetty-monitor.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 -f jetty-monitor + %{buildroot}%{homedir}/lib/jndi/ + +for module in jetty-annotations jetty-client jetty-continuation jetty-deploy \ + jetty-http jetty-io jetty-jaas jetty-jmx jetty-jndi jetty-plus \ + jetty-proxy jetty-rewrite jetty-security jetty-server jetty-servlet \ + jetty-servlets jetty-util jetty-webapp jetty-xml; do + ln -s %{_javadir}/%{name}/$module.jar \ + %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar +done -mv %{buildroot}%{homedir}/start.jar \ - %{buildroot}%{_javadir}/%{name}/jetty-start.jar -ln -s %{_javadir}/%{name}/jetty-start.jar \ - %{buildroot}%{homedir}/start.jar -install -pm 644 jetty-start/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-start.pom -%add_maven_depmap JPP.%{name}-jetty-start.pom %{name}/jetty-start.jar +for module in websocket-api websocket-common \ + websocket-server websocket-servlet; do + ln -s %{_javadir}/%{name}/$module.jar \ + %{buildroot}%{homedir}/lib/websocket/$module-%{version}.%{addver}.jar +done ( cat << EO_RC @@ -841,12 +658,6 @@ rm %{buildroot}%{homedir}/*.txt %{buildroot}%{homedir}/*.html # See: https://bugzilla.redhat.com/show_bug.cgi?id=845993 ln -sf %{rundir} %{buildroot}%{homedir}/work -# following seem like config directories -for cdir in overlays;do - mv %{buildroot}%{homedir}/$cdir %{buildroot}/%{confdir}/$cdir - ln -s %{confdir}/$cdir %{buildroot}%{homedir}/$cdir -done - # this should be symlinked the other way around but rpm doesn't let us # do that! BAD BAD rpm # https://bugzilla.redhat.com/show_bug.cgi?id=447156 @@ -854,10 +665,6 @@ for cdir in contexts contexts-available resources;do ln -sf %{homedir}/$cdir %{buildroot}/%{confdir}/$cdir done -# javadocs -install -dm 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ - %pre # Add the "jetty" user and group @@ -899,50 +706,71 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \ %ghost %dir %attr(755, jetty, jetty) %{rundir} %{appdir} %{_unitdir}/%{name}.service +%doc NOTICE.txt README.txt VERSION.txt LICENSE* +%dir %{_javadir}/%{name} %files project -f .mfiles-project %doc NOTICE.txt README.txt VERSION.txt LICENSE* -%dir %{_javadir}/%{name} -%files ajp -f .mfiles-jetty-ajp %files annotations -f .mfiles-jetty-annotations +%files ant -f .mfiles-jetty-ant %files client -f .mfiles-jetty-client %files continuation -f .mfiles-jetty-continuation %files deploy -f .mfiles-jetty-deploy %files http -f .mfiles-jetty-http -%files http-spi -f .mfiles-jetty-http-spi +%files httpservice -f .mfiles-jetty-httpservice %files io -f .mfiles-jetty-io +%files jaas -f .mfiles-jetty-jaas %files jaspi -f .mfiles-jetty-jaspi %files jmx -f .mfiles-jetty-jmx %files jndi -f .mfiles-jetty-jndi -%files monitor -f .mfiles-jetty-monitor -%files nested -f .mfiles-jetty-nested -%files overlay-deployer -f .mfiles-jetty-overlay-deployer +%files jsp -f .mfiles-jetty-jsp +%files jspc-maven-plugin -f .mfiles-jetty-jspc-maven-plugin +%files maven-plugin -f .mfiles-jetty-maven-plugin %files plus -f .mfiles-jetty-plus -%files policy -f .mfiles-jetty-policy +%files proxy -f .mfiles-jetty-proxy %files rewrite -f .mfiles-jetty-rewrite +%files runner -f .mfiles-jetty-runner %files security -f .mfiles-jetty-security %files server -f .mfiles-jetty-server %files servlet -f .mfiles-jetty-servlet %files servlets -f .mfiles-jetty-servlets +%files spring -f .mfiles-jetty-spring +%files start -f .mfiles-jetty-start %files util -f .mfiles-jetty-util +%files util-ajax -f .mfiles-jetty-util-ajax %files webapp -f .mfiles-jetty-webapp -%files websocket -f .mfiles-jetty-websocket %files xml -f .mfiles-jetty-xml +%files project -f .mfiles-project +%files websocket-api -f .mfiles-websocket-api +%files websocket-client -f .mfiles-websocket-client +%files websocket-common -f .mfiles-websocket-common +%files websocket-parent -f .mfiles-websocket-parent +%files websocket-server -f .mfiles-websocket-server +%files websocket-servlet -f .mfiles-websocket-servlet +%files javadoc -f .mfiles-javadoc +%doc NOTICE.txt README.txt VERSION.txt LICENSE* %if %{with nosql} %files nosql -f .mfiles-jetty-nosql %endif %if %{with osgi} -%files osgi -f jetty-osgi/.mfiles-jetty-osgi +%files osgi-project -f .mfiles-jetty-osgi-project +%files osgi-boot -f .mfiles-jetty-osgi-boot +%files osgi-boot-warurl -f .mfiles-jetty-osgi-boot-warurl +%files osgi-boot-jsp -f .mfiles-jetty-osgi-boot-jsp %endif -%files javadoc +%files javadoc -f .mfiles-javadoc %doc NOTICE.txt LICENSE* %doc %{_javadocdir}/%{name} %changelog +* Mon Feb 18 2013 Michal Srb - 9.0.0-0.1.RC0 +- Update to upstream version 9.0.0 +- Build with xmvn + * Fri Feb 15 2013 Alexander Kurtakov 8.1.9-3 - Add missing BR on maven-license-plugin.