pool/jetty-minimal
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=11

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-08 10:41:46 +00:00 committed by Git OBS Bridge
parent 2ce0653569
commit 16586a78f0
4 changed files with 32 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-minimal.changes
View File

@ -7,6 +7,7 @@ Fri Nov 8 06:52:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
* jetty-annotations-asm6.patch * jetty-annotations-asm6.patch
+ adapt to changed context + adapt to changed context
+ build against asm6 instead of asm7 that we don't have + build against asm6 instead of asm7 that we don't have
- Fix some rpmlint warnings and errors
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 5 15:39:31 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue Nov 5 15:39:31 UTC 2019 - Fridrich Strba <fstrba@suse.com>

42
jetty-minimal.spec
View File

@ -27,7 +27,6 @@ License: Apache-2.0 OR EPL-1.0
URL: https://www.eclipse.org/jetty/ URL: https://www.eclipse.org/jetty/
Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz
Patch0: jetty-annotations-asm6.patch Patch0: jetty-annotations-asm6.patch
Patch1: jetty-websocket-websocket-api-1.1.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.annotation:javax.annotation-api)
@ -62,122 +61,122 @@ This package contains
%{desc} %{desc}
%package -n %{base_name}-annotations %package -n %{base_name}-annotations
Summary: annotations module for Jetty Summary: The annotations module for Jetty
%description -n %{base_name}-annotations %description -n %{base_name}-annotations
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-client %package -n %{base_name}-client
Summary: client module for Jetty Summary: The client module for Jetty
%description -n %{base_name}-client %description -n %{base_name}-client
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-continuation %package -n %{base_name}-continuation
Summary: continuation module for Jetty Summary: The continuation module for Jetty
%description -n %{base_name}-continuation %description -n %{base_name}-continuation
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-http %package -n %{base_name}-http
Summary: http module for Jetty Summary: The http module for Jetty
%description -n %{base_name}-http %description -n %{base_name}-http
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-http-spi %package -n %{base_name}-http-spi
Summary: http-spi module for Jetty Summary: The http-spi module for Jetty
%description -n %{base_name}-http-spi %description -n %{base_name}-http-spi
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-io %package -n %{base_name}-io
Summary: io module for Jetty Summary: The io module for Jetty
%description -n %{base_name}-io %description -n %{base_name}-io
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-jaas %package -n %{base_name}-jaas
Summary: jaas module for Jetty Summary: The jaas module for Jetty
%description -n %{base_name}-jaas %description -n %{base_name}-jaas
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-jndi %package -n %{base_name}-jndi
Summary: jndi module for Jetty Summary: The jndi module for Jetty
%description -n %{base_name}-jndi %description -n %{base_name}-jndi
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-jsp %package -n %{base_name}-jsp
Summary: jsp module for Jetty Summary: The jsp module for Jetty
Requires: glassfish-el Requires: glassfish-el
%description -n %{base_name}-jsp %description -n %{base_name}-jsp
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-security %package -n %{base_name}-security
Summary: security module for Jetty Summary: The security module for Jetty
%description -n %{base_name}-security %description -n %{base_name}-security
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-openid %package -n %{base_name}-openid
Summary: openid module for Jetty Summary: The openid module for Jetty
%description -n %{base_name}-openid %description -n %{base_name}-openid
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-server %package -n %{base_name}-server
Summary: server module for Jetty Summary: The server module for Jetty
%description -n %{base_name}-server %description -n %{base_name}-server
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-servlet %package -n %{base_name}-servlet
Summary: servlet module for Jetty Summary: The servlet module for Jetty
%description -n %{base_name}-servlet %description -n %{base_name}-servlet
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-util %package -n %{base_name}-util
Summary: util module for Jetty Summary: The util module for Jetty
%description -n %{base_name}-util %description -n %{base_name}-util
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-util-ajax %package -n %{base_name}-util-ajax
Summary: util-ajax module for Jetty Summary: The util-ajax module for Jetty
%description -n %{base_name}-util-ajax %description -n %{base_name}-util-ajax
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-webapp %package -n %{base_name}-webapp
Summary: webapp module for Jetty Summary: The webapp module for Jetty
%description -n %{base_name}-webapp %description -n %{base_name}-webapp
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-jmx %package -n %{base_name}-jmx
Summary: jmx module for Jetty Summary: The jmx module for Jetty
%description -n %{base_name}-jmx %description -n %{base_name}-jmx
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-xml %package -n %{base_name}-xml
Summary: xml module for Jetty Summary: The xml module for Jetty
%description -n %{base_name}-xml %description -n %{base_name}-xml
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-plus %package -n %{base_name}-plus
Summary: plus module for Jetty Summary: The plus module for Jetty
%description -n %{base_name}-plus %description -n %{base_name}-plus
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-proxy %package -n %{base_name}-proxy
Summary: proxy module for Jetty Summary: The proxy module for Jetty
%description -n %{base_name}-proxy %description -n %{base_name}-proxy
%{extdesc} %{summary}. %{extdesc} %{summary}.
@ -192,7 +191,6 @@ Summary: Javadoc for %{name}
%setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver} %setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver}
%patch0 -p1 %patch0 -p1
%patch1 -p1
find . -name "*.?ar" -exec rm {} \; find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \; find . -name "*.class" -exec rm {} \;

28
jetty-websocket-websocket-api-1.1.patch
View File

@ -1,28 +0,0 @@
--- jetty.project-jetty-9.4.22.v20191022/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java 2019-11-08 08:24:57.576221260 +0100
+++ jetty.project-jetty-9.4.22.v20191022/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java 2019-11-08 08:24:09.291930696 +0100
@@ -33,6 +33,8 @@
import javax.websocket.EndpointConfig;
import javax.websocket.Extension;
import javax.websocket.MessageHandler;
+import javax.websocket.MessageHandler.Partial;
+import javax.websocket.MessageHandler.Whole;
import javax.websocket.RemoteEndpoint.Async;
import javax.websocket.RemoteEndpoint.Basic;
import javax.websocket.Session;
@@ -94,6 +96,16 @@
this.messageHandlerSet = new HashSet<>();
}
+ public <T> void addMessageHandler(Class<T> clazz, Partial<T> handler) throws IllegalStateException
+ {
+ throw new IllegalStateException("Unimplemented addMessageHandler(Class<T> clazz, Partial<T> handler)");
+ }
+
+ public <T> void addMessageHandler(Class<T> clazz, Whole<T> handler) throws IllegalStateException
+ {
+ throw new IllegalStateException("Unimplemented addMessageHandler(Class<T> clazz, Whole<T> handler)");
+ }
+
@Override
public void addMessageHandler(MessageHandler handler) throws IllegalStateException
{

20
jetty-websocket.spec
View File

@ -27,8 +27,10 @@ License: Apache-2.0 OR EPL-1.0
URL: https://www.eclipse.org/jetty/ URL: https://www.eclipse.org/jetty/
Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz
Patch0: jetty-annotations-asm6.patch Patch0: jetty-annotations-asm6.patch
Patch1: jetty-websocket-websocket-api-1.1.patch
BuildRequires: fdupes BuildRequires: fdupes
# Multiple providers, chose the 1.0 one over 1.1, since
# the relevant artifacts assume the API version 1.0
BuildRequires: jboss-websocket-1.0-api
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(javax.websocket:javax.websocket-api) BuildRequires: mvn(javax.websocket:javax.websocket-api)
@ -44,6 +46,7 @@ BuildRequires: mvn(org.eclipse.jetty:jetty-server) >= %{version}
BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) >= %{version} BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) >= %{version}
BuildRequires: mvn(org.eclipse.jetty:jetty-util) >= %{version} BuildRequires: mvn(org.eclipse.jetty:jetty-util) >= %{version}
BuildRequires: mvn(org.eclipse.jetty:jetty-xml) >= %{version} BuildRequires: mvn(org.eclipse.jetty:jetty-xml) >= %{version}
Requires: jboss-websocket-1.0-api
BuildArch: noarch BuildArch: noarch
# jp_minimal doesn't have main package # jp_minimal doesn't have main package
@ -61,43 +64,43 @@ Jetty is available on all Java supported platforms.
This package contains the websocket modules for Jetty This package contains the websocket modules for Jetty
%package -n %{base_name}-websocket-api %package -n %{base_name}-websocket-api
Summary: websocket-api module for Jetty Summary: The websocket-api module for Jetty
%description -n %{base_name}-websocket-api %description -n %{base_name}-websocket-api
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-websocket-client %package -n %{base_name}-websocket-client
Summary: websocket-client module for Jetty Summary: The The websocket-client module for Jetty
%description -n %{base_name}-websocket-client %description -n %{base_name}-websocket-client
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-websocket-common %package -n %{base_name}-websocket-common
Summary: websocket-common module for Jetty Summary: The websocket-common module for Jetty
%description -n %{base_name}-websocket-common %description -n %{base_name}-websocket-common
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-websocket-server %package -n %{base_name}-websocket-server
Summary: websocket-server module for Jetty Summary: The websocket-server module for Jetty
%description -n %{base_name}-websocket-server %description -n %{base_name}-websocket-server
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-websocket-servlet %package -n %{base_name}-websocket-servlet
Summary: websocket-servlet module for Jetty Summary: The websocket-servlet module for Jetty
%description -n %{base_name}-websocket-servlet %description -n %{base_name}-websocket-servlet
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-javax-websocket-client-impl %package -n %{base_name}-javax-websocket-client-impl
Summary: javax-websocket-client-impl module for Jetty Summary: The javax-websocket-client-impl module for Jetty
%description -n %{base_name}-javax-websocket-client-impl %description -n %{base_name}-javax-websocket-client-impl
%{extdesc} %{summary}. %{extdesc} %{summary}.
%package -n %{base_name}-javax-websocket-server-impl %package -n %{base_name}-javax-websocket-server-impl
Summary: javax-websocket-server-impl module for Jetty Summary: The javax-websocket-server-impl module for Jetty
%description -n %{base_name}-javax-websocket-server-impl %description -n %{base_name}-javax-websocket-server-impl
%{extdesc} %{summary}. %{extdesc} %{summary}.
@ -112,7 +115,6 @@ Summary: Javadoc for %{name}
%setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver} %setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver}
%patch0 -p1 %patch0 -p1
%patch1 -p1
find . -name "*.?ar" -exec rm {} \; find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \; find . -name "*.class" -exec rm {} \;