[debian-edu-commits] debian-edu/ 01/03: exclude three of the actually four websocket implementations
Thorsten Glaser
tg at moszumanska.debian.org
Tue Nov 8 21:08:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
tg pushed a commit to branch master
in repository guacamole-client.
commit 10c0604b97293cc2ca18b14d3f504f0c61cf60b8
Author: mirabilos <thorsten.glaser at teckids.org>
Date: Tue Nov 8 21:33:48 2016 +0100
exclude three of the actually four websocket implementations
(the JSR 356 one, which we c̲a̲n̲ actually build, is good enough)
Thanks to Emmanuel Bourg <ebourg at apache.org> for this hint!
cf. Message-ID: <e740b53c-335b-1403-3d8e-6c021f0c3d0d at apache.org>
---
debian/control | 10 ++---
debian/patches/fix-java-build.patch | 24 +++++-------
debian/patches/fix-java-code.patch | 78 -------------------------------------
debian/patches/series | 1 -
4 files changed, 15 insertions(+), 98 deletions(-)
diff --git a/debian/control b/debian/control
index 80bd868..e601428 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,10 @@ Build-Depends:
libjersey1-guice-java,
libjersey1-json-java,
libjersey1-server-java,
- libjetty8-extra-java,
- libjetty8-java,
- libjetty9-extra-java,
- libjetty9-java,
+# libjetty8-extra-java,
+# libjetty8-java,
+# libjetty9-extra-java,
+# libjetty9-java,
liblogback-java,
libmaven-assembly-plugin-java,
libmaven-dependency-plugin-java,
@@ -29,7 +29,7 @@ Build-Depends:
libminify-maven-plugin-java,
libservlet3.1-java,
libslf4j-java,
- libtomcat7-java,
+# libtomcat7-java,
maven-debian-helper,
po-debconf,
Standards-Version: 3.9.8
diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index 53684c0..32f2bb7 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -1,5 +1,6 @@
# DP: first hunk is from original Debian package to fix .war file name
# DP: packages never use -Werror, that's for upstream
+# DP: exclude non-JSR356 websocket implementations we cannot build
# DP: add various dependencies to build
# DP: remove extensions we cannot possibly build, for now
@@ -14,15 +15,22 @@
<plugins>
<!-- Written for 1.6 -->
-@@ -60,7 +62,6 @@
+@@ -60,9 +62,13 @@
<target>1.6</target>
<compilerArgs>
<arg>-Xlint:all</arg>
- <arg>-Werror</arg>
</compilerArgs>
<fork>true</fork>
++ <excludes>
++ <exclude>**/glyptodon/guacamole/net/basic/websocket/jetty8/**</exclude>
++ <exclude>**/glyptodon/guacamole/net/basic/websocket/jetty9/**</exclude>
++ <exclude>**/glyptodon/guacamole/net/basic/websocket/tomcat/**</exclude>
++ </excludes>
</configuration>
-@@ -334,6 +335,24 @@
+ </plugin>
+
+@@ -334,6 +340,12 @@
<version>1.17.1</version>
</dependency>
@@ -31,18 +39,6 @@
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>debian</version>
+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-catalina</artifactId>
-+ <version>debian</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-coyote</artifactId>
-+ <version>debian</version>
-+ <scope>provided</scope>
-+ </dependency>
+
</dependencies>
diff --git a/debian/patches/fix-java-code.patch b/debian/patches/fix-java-code.patch
deleted file mode 100644
index dd71e92..0000000
--- a/debian/patches/fix-java-code.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# DP: update for Jetty 9.2 API
-
---- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
-+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
-@@ -24,6 +24,8 @@ package org.glyptodon.guacamole.net.basi
-
- import org.eclipse.jetty.websocket.api.UpgradeRequest;
- import org.eclipse.jetty.websocket.api.UpgradeResponse;
-+import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-+import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
- import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
- import org.glyptodon.guacamole.net.basic.TunnelRequestService;
-
-@@ -51,7 +53,6 @@ public class BasicGuacamoleWebSocketCrea
- this.tunnelRequestService = tunnelRequestService;
- }
-
-- @Override
- public Object createWebSocket(UpgradeRequest request, UpgradeResponse response) {
-
- // Validate and use "guacamole" subprotocol
-@@ -69,4 +70,14 @@ public class BasicGuacamoleWebSocketCrea
-
- }
-
-+ @Override
-+ public Object createWebSocket(ServletUpgradeRequest request, ServletUpgradeResponse response) {
-+ for (String subprotocol : request.getSubProtocols()) {
-+ if ("guacamole".equals(subprotocol)) {
-+ response.setAcceptedSubProtocol(subprotocol);
-+ return new BasicGuacamoleWebSocketTunnelListener(tunnelRequestService);
-+ }
-+ }
-+ return null;
-+ }
- }
---- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
-+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
-@@ -69,14 +69,9 @@ public abstract class GuacamoleWebSocket
- */
- private void closeConnection(Session session, GuacamoleStatus guac_status) {
-
-- try {
- int code = guac_status.getWebSocketCode();
- String message = Integer.toString(guac_status.getGuacamoleStatusCode());
- session.close(new CloseStatus(code, message));
-- }
-- catch (IOException e) {
-- logger.debug("Unable to close WebSocket connection.", e);
-- }
-
- }
-
---- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
-+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
-@@ -38,7 +38,7 @@ public class WebSocketTunnelRequest exte
- /**
- * All parameters passed via HTTP to the WebSocket handshake.
- */
-- private final Map<String, String[]> handshakeParameters;
-+ private final Map<String, List<String>> handshakeParameters;
-
- /**
- * Creates a TunnelRequest implementation which delegates parameter and
-@@ -65,12 +65,7 @@ public class WebSocketTunnelRequest exte
-
- @Override
- public List<String> getParameterValues(String name) {
--
-- String[] values = handshakeParameters.get(name);
-- if (values == null)
-- return null;
--
-- return Arrays.asList(values);
-+ return handshakeParameters.get(name);
- }
-
- }
diff --git a/debian/patches/series b/debian/patches/series
index 765dea0..cf8e32c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
fix-js-build.patch
fix-java-build.patch
-fix-java-code.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-client.git
More information about the debian-edu-commits
mailing list