From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3Uti-0000jn-DN for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3Utd-0000HI-MI for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:10 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60247) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3Utd-0000HC-Ik for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3Utd-00065q-Bk for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:05 -0400 Subject: [bug#28841] [PATCH 13/24] gnu: Add java-eclipse-jetty-server. Resent-Message-ID: From: julien@lepiller.eu Date: Sun, 15 Oct 2017 00:23:38 +0200 Message-Id: <20171014222349.12902-13-julien@lepiller.eu> In-Reply-To: <20171014222349.12902-1-julien@lepiller.eu> References: <20171014233216.49c852f7@lepiller.eu> <20171014222349.12902-1-julien@lepiller.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28841@debbugs.gnu.org From: Julien Lepiller * gnu/packages/java.scm (java-eclipse-jetty-server): New variable. --- gnu/packages/java.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9124387fd..cd1aaf12e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6329,6 +6329,27 @@ or embedded instantiation. This package provides HTTP-related utility classes." ("io" ,java-eclipse-jetty-io-9.2) ,@(package-inputs java-eclipse-jetty-util-9.2))))) +(define java-eclipse-jetty-http-test-classes + (package + (inherit java-eclipse-jetty-util) + (name "java-eclipse-jetty-http-test-classes") + (arguments + `(#:jar-name "eclipse-jetty-http.jar" + #:source-dir "src/test" + #:tests? #f + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "jetty-http")))))) + (inputs + `(("slf4j" ,java-slf4j-api) + ("servlet" ,java-tomcat) + ("http" ,java-eclipse-jetty-http) + ("io" ,java-eclipse-jetty-io) + ("util" ,java-eclipse-jetty-util))))) + (define-public java-eclipse-jetty-jmx (package (inherit java-eclipse-jetty-util) @@ -6360,3 +6381,50 @@ or embedded instantiation. This package provides the JMX management."))) (inputs `(("util" ,java-eclipse-jetty-util-9.2) ,@(package-inputs java-eclipse-jetty-util-9.2))))) + +(define-public java-eclipse-jetty-server + (package + (inherit java-eclipse-jetty-util) + (name "java-eclipse-jetty-server") + (arguments + `(#:jar-name "eclipse-jetty-server.jar" + #:source-dir "src/main/java" + #:jdk ,icedtea-8 + #:tests? #f; requires a mockito version we don't have + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "jetty-server"))) + (add-before 'build 'fix-source + (lambda _ + ;; Explicit casts to prevent build failures + (substitute* "src/main/java/org/eclipse/jetty/server/Request.java" + (("append\\(LazyList") + "append((CharSequence)LazyList")) + (substitute* + "src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java" + (((string-append + "Class<\\? extends EventListener> clazz = _classLoader==null" + "\\?Loader.loadClass\\(ContextHandler.class,className\\):" + "_classLoader.loadClass\\(className\\);")) + (string-append "Class clazz = " + "(Class) " + "(_classLoader==null?Loader.loadClass(" + "ContextHandler.class,className):" + "_classLoader.loadClass(className));")))))))) + (inputs + `(("slf4j" ,java-slf4j-api) + ("servlet" ,java-tomcat) + ("http" ,java-eclipse-jetty-http) + ("io" ,java-eclipse-jetty-io) + ("jmx" ,java-eclipse-jetty-jmx) + ("util" ,java-eclipse-jetty-util))) + (native-inputs + `(("test-classes" ,java-eclipse-jetty-http-test-classes) + ,@(package-native-inputs java-eclipse-jetty-util))) + (synopsis "Core jetty server artifact") + (description "The Jetty Web Server provides an HTTP server and Servlet +container capable of serving static and dynamic content either from a standalone +or embedded instantiation. This package provides the core jetty server +artifact."))) -- 2.14.2