From unknown Mon Jun 23 07:46:38 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#35570 <35570@debbugs.gnu.org> To: bug#35570 <35570@debbugs.gnu.org> Subject: Status: java-tomcat: Make it the full package Reply-To: bug#35570 <35570@debbugs.gnu.org> Date: Mon, 23 Jun 2025 14:46:38 +0000 retitle 35570 java-tomcat: Make it the full package reassign 35570 guix-patches submitter 35570 Bj=C3=B6rn H=C3=B6fling severity 35570 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:35:03 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:35:03 +0000 Received: from localhost ([127.0.0.1]:52570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3FH-0007RL-3G for submit@debbugs.gnu.org; Sat, 04 May 2019 18:35:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3FF-0007Qo-M1 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:35:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:52989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3FA-0004ft-AN for submit@debbugs.gnu.org; Sat, 04 May 2019 18:34:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3F9-0003Jl-8M for guix-patches@gnu.org; Sat, 04 May 2019 18:34:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.8 required=5.0 tests=BAYES_50,FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3F8-0004fU-9P for guix-patches@gnu.org; Sat, 04 May 2019 18:34:55 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35760 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3F8-0004ez-3g for guix-patches@gnu.org; Sat, 04 May 2019 18:34:54 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id EFC273F85A for ; Sun, 5 May 2019 00:34:50 +0200 (CEST) Date: Sun, 5 May 2019 00:34:50 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: Subject: java-tomcat: Make it the full package Message-ID: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/0z_sUk.ovKKlEPtqy9ttUBK"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/0z_sUk.ovKKlEPtqy9ttUBK Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable The current java-tomcat package is only building the jar-files and uses Tomcat only as a servlet-api package. This patch series changes it to the "real" package with a bin, conf, ... directory. If you have a CATALINA_BASE, i.e. a Tomcat instance directory with conf, log, webapps, you can start Tomcat like that: CATALINA_BASE=3D/home/bjoern/guix/tmp/catalina-home /gnu/store/q5dqsiiwb665= jfb6ckcfpw3ijgm4gyh7-java-tomcat-8.5.40/bin/startup.sh And then navigate to http://localhost:8080/ to view your new site. The standard Tomcat installation copies the commons-daemon.jar and the java-ecj.jar. We better use symlinks to the input package. But these would be overridden by a repacking phase: Thus, we need to modify the ant-build-system, placing this series into the staging branch. What's finally outstanding is a tomcat-service. Bj=C3=B6rn --Sig_/0z_sUk.ovKKlEPtqy9ttUBK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4TigAKCRC/KGy2WT5f /Wx/AJ9vGNFVwTGegprNiJr63/aA8OVQMgCgitvGyhpNLCwpge9QM3+wiRD2KMQ= =P9ju -----END PGP SIGNATURE----- --Sig_/0z_sUk.ovKKlEPtqy9ttUBK-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:37:19 2019 Received: (at 35570) by debbugs.gnu.org; 4 May 2019 22:37:20 +0000 Received: from localhost ([127.0.0.1]:52575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3HT-0007Uq-KJ for submit@debbugs.gnu.org; Sat, 04 May 2019 18:37:19 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:57026 helo=bjoernhoefling.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3HS-0007Uj-Dt for 35570@debbugs.gnu.org; Sat, 04 May 2019 18:37:18 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 8C7533F85A for <35570@debbugs.gnu.org>; Sun, 5 May 2019 00:37:17 +0200 (CEST) Date: Sun, 5 May 2019 00:37:16 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: 35570@debbugs.gnu.org Subject: [PATCH 1/8] gnu: ant-build-system: Don't override symlinks. Message-ID: <20190505003716.4a38433e@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/8+rBdrsrwAU6hBYWbtLjs=O"; protocol="application/pgp-signature" X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 35570 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.9 (/) --Sig_/8+rBdrsrwAU6hBYWbtLjs=O Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable When repacking jar-files, don't work on symlinks: Otherwise, they would be overridden with the repacked jar-file. * guix/build/ant-build-system.scm (regular-jar-file-predicate): New procedu= re. (generate-jar-indices, strip-jar-timestamps): Use it. --- guix/build/ant-build-system.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.= scm index d79a2d55ed..0fec06f497 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2016, 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; ;;; This file is part of GNU Guix. ;;; @@ -171,6 +172,12 @@ to the default GNU unpack strategy." #:allow-other-keys) (apply invoke `("ant" ,build-target ,@make-flags))) =20 +(define (regular-jar-file-predicate file stat) + "Predicate returning true if FILE is ending on '.jar' +and STAT indicates it is a regular file." + (and ((file-name-predicate "\\.jar$") file stat) + (eq? 'regular (stat:type stat)))) + (define* (generate-jar-indices #:key outputs #:allow-other-keys) "Generate file \"META-INF/INDEX.LIST\". This file does not use word wra= ps and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps, @@ -181,7 +188,10 @@ dependencies of this jar file." (invoke "jar" "-i" jar)) (for-each (match-lambda ((output . directory) - (for-each generate-index (find-files directory "\\.jar$")))) + (for-each generate-index + (find-files + directory + regular-jar-file-predicate)))) outputs) #t) =20 @@ -222,7 +232,8 @@ repack them. This is necessary to ensure that archives= are reproducible." =20 (for-each (match-lambda ((output . directory) - (for-each repack-archive (find-files directory "\\.jar$")))) + (for-each repack-archive + (find-files directory regular-jar-file-predicate)= ))) outputs) #t) =20 --=20 2.21.0 --Sig_/8+rBdrsrwAU6hBYWbtLjs=O Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4UHAAKCRC/KGy2WT5f /XWUAJkBVwSPbEZrMcCQybfVzT5XJxJG9wCgr31aVylFUIotUJmfeu+CcweCBfA= =DhtJ -----END PGP SIGNATURE----- --Sig_/8+rBdrsrwAU6hBYWbtLjs=O-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:38:08 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:38:08 +0000 Received: from localhost ([127.0.0.1]:52579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3IG-0007WJ-14 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3IE-0007Vq-Ko for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:34315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3I8-0005xK-Ee for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3I5-0003am-D2 for guix-patches@gnu.org; Sat, 04 May 2019 18:38:00 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_40,FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3I4-0005wU-Ce for guix-patches@gnu.org; Sat, 04 May 2019 18:37:57 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35764 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3I3-0005w9-FQ for guix-patches@gnu.org; Sat, 04 May 2019 18:37:56 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id D3A7B3F85A for ; Sun, 5 May 2019 00:37:54 +0200 (CEST) Date: Sun, 5 May 2019 00:37:54 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 2/8] gnu: java-javaee-servletapi: Don't use unstable tarball. Message-ID: <20190505003754.3c696a98@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/U8FPQ.okytNMx/Z9PzTGPWV"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/U8FPQ.okytNMx/Z9PzTGPWV Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable * gnu/packages/java.scm (java-javaee-servletapi)[source]: Use git-fetch. --- gnu/packages/java.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9664d749fb..f92b3d5e89 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10,6 +10,7 @@ ;;; Copyright =C2=A9 2018 G=C3=A1bor Boskovits ;;; Copyright =C2=A9 2018 Chris Marusich ;;; Copyright =C2=A9 2018 Efraim Flashner +;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; ;;; This file is part of GNU Guix. ;;; @@ -2836,14 +2837,15 @@ API and version 2.1 of the Java ServerPages API.") (package (name "java-javaee-servletapi") (version "3.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javaee/servlet-spec/" - "archive/" version ".zip")) - (file-name (string-append name "-" version ".zip")) - (sha256 - (base32 - "0m6p13vgfb1ihich1jp5j6fqlhkjsrkn32c86bsbkryp38ipwg8w")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javaee/servlet-spec.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s03lj8w5an70lkqbjycgfrfk0kc07vbfav91jzk87gh3awf9ksl")))) (build-system ant-build-system) (arguments `(#:jar-name "javax-servletapi.jar" --=20 2.21.0 --Sig_/U8FPQ.okytNMx/Z9PzTGPWV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4UQgAKCRC/KGy2WT5f /QYUAKCDP+PWE+2tP+4j9AfM+pbT8aqIWQCeNlz+3BWptuACje92KOPlJqDXuPo= =L9y+ -----END PGP SIGNATURE----- --Sig_/U8FPQ.okytNMx/Z9PzTGPWV-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:38:42 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:38:42 +0000 Received: from localhost ([127.0.0.1]:52582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ik-0007X2-Dn for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ii-0007Wp-HL for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:57701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Ic-0006LI-Lx for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Ib-0003fx-GN for guix-patches@gnu.org; Sat, 04 May 2019 18:38:30 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.5 required=5.0 tests=BAYES_05,FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3Ia-0006H8-3t for guix-patches@gnu.org; Sat, 04 May 2019 18:38:29 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35766 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3IZ-0006G8-Tj for guix-patches@gnu.org; Sat, 04 May 2019 18:38:28 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 70E713F85A for ; Sun, 5 May 2019 00:38:24 +0200 (CEST) Date: Sun, 5 May 2019 00:38:23 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 3/8] gnu: java-javaee-servletapi: Add properties-files to jar. Message-ID: <20190505003823.453451b5@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/2oSmWXSu2IGdwPmMG6Kemgn"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/2oSmWXSu2IGdwPmMG6Kemgn Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable * gnu/packages/java.scm (jav-javaee-servletapi)[arguments]: Add phase 'copy-resources' to copy properties-files. --- gnu/packages/java.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f92b3d5e89..9b635699f6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2851,7 +2851,25 @@ API and version 2.1 of the Java ServerPages API.") `(#:jar-name "javax-servletapi.jar" ;; no tests #:tests? #f - #:source-dir "src/main/java")) + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/javax/servlet/http") + (let ((from-prefix "src/main/java/javax/servlet/") + (to-prefix "build/classes/javax/servlet/")) + (for-each (lambda (f) + (copy-file (string-append from-prefix f) + (string-append to-prefix f))) + (list "LocalStrings_ja.properties" + "LocalStrings.properties" + "LocalStrings_fr.properties" + "http/LocalStrings_es.properties" + "http/LocalStrings_ja.properties" + "http/LocalStrings.properties" + "http/LocalStrings_fr.properties"))) + #t))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://javaee.github.io/servlet-spec/") --=20 2.21.0 --Sig_/2oSmWXSu2IGdwPmMG6Kemgn Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4UXwAKCRC/KGy2WT5f /Rk4AJ4kUAeUFbyzCNayWP01SSfh6YJ3UgCfSAHEUAgB2qrLMeIYrRdUxIhewTk= =+j0D -----END PGP SIGNATURE----- --Sig_/2oSmWXSu2IGdwPmMG6Kemgn-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:39:28 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:39:28 +0000 Received: from localhost ([127.0.0.1]:52587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3JU-0007YW-A9 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:39:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3JS-0007YK-JK for submit@debbugs.gnu.org; Sat, 04 May 2019 18:39:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:59973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3JN-0006jv-Cx for submit@debbugs.gnu.org; Sat, 04 May 2019 18:39:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JM-0003mF-2u for guix-patches@gnu.org; Sat, 04 May 2019 18:39:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.8 required=5.0 tests=BAYES_50,FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3JK-0006iW-BA for guix-patches@gnu.org; Sat, 04 May 2019 18:39:16 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35768 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JK-0006iK-2B for guix-patches@gnu.org; Sat, 04 May 2019 18:39:14 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 913F63F85A for ; Sun, 5 May 2019 00:39:13 +0200 (CEST) Date: Sun, 5 May 2019 00:39:12 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 4/8] gnu: Remove dependencies on java-tomcat, use servlet API Message-ID: <20190505003912.2d6e5d84@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/dCEsEQ=0qIYlEO_mth8V_/B"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/dCEsEQ=0qIYlEO_mth8V_/B Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable These packages are using java-tomcat as a dependency where they actually only need a servlet API. * gnu/packages/maven.scm (maven-wagon-tck-http)[inputs]: Remove java-tomcat, add java-javaee-servletapi. (maven-wagon-http)[native-inputs]: Same here. * gnu/packages/web.scm (java-eclipse-jetty-util)[inputs]: Same here. (java-eclipse-jetty-http-test-classes)[inputs]: Same here. (java-eclipse-jetty-security)[inputs]: Same here. (java-eclipse-jetty-servlet)[inputs]: Same here. (java-eclipse-jetty-webapp-9.2)[inputs]: Same here. --- gnu/packages/maven.scm | 5 +++-- gnu/packages/web.scm | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index d383f16255..592cc74f2d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2018 Julien Lepiller ;;; Copyright =C2=A9 2019 Tobias Geerinckx-Rite +;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; ;;; This file is part of GNU Guix. ;;; @@ -523,7 +524,7 @@ gets and puts artifacts using the file system."))) (inputs `(("java-plexus-util" ,java-plexus-utils) ("maven-wagon-provider-api" ,maven-wagon-provider-api) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-slf4j-api" ,java-slf4j-api) ("java-commons-codec" ,java-commons-codec) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) @@ -663,7 +664,7 @@ wagon providers supporting HTTP."))) ("java-jdom2" ,java-jdom2) ("java-asm" ,java-asm) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2) ("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2) ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7242ede3be..3d9070f169 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -31,6 +31,7 @@ ;;; Copyright =C2=A9 2018 M=C4=83d=C4=83lin Ionel Patra=C8=99cu ;;; Copyright =C2=A9 2018 Alex Vong ;;; Copyright =C2=A9 2019 Nicolas Goaziou +;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; ;;; This file is part of GNU Guix. ;;; @@ -5702,7 +5703,7 @@ Web Server.") #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat))) + ("servlet" ,java-javaee-servletapi))) (native-inputs `(("junit" ,java-junit) ("hamcrest" ,java-hamcrest-all) @@ -5890,7 +5891,7 @@ or embedded instantiation. This package provides the JMX management."))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("io" ,java-eclipse-jetty-io) ("util" ,java-eclipse-jetty-util))))) @@ -5985,7 +5986,7 @@ artifact."))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("server" ,java-eclipse-jetty-server) ("util" ,java-eclipse-jetty-util))) @@ -6028,7 +6029,7 @@ infrastructure"))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("http-test" ,java-eclipse-jetty-http-test-classes) ("io" ,java-eclipse-jetty-io) @@ -6163,7 +6164,7 @@ container."))) ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2) ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2) ("java-eclipse-jetty-xml-9.2" ,java-eclipse-jetty-xml-9.2) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ,@(package-inputs java-eclipse-jetty-util-9.2))) (native-inputs `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2) --=20 2.21.0 --Sig_/dCEsEQ=0qIYlEO_mth8V_/B Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4UkAAKCRC/KGy2WT5f /duxAJ9VIRgJ3a8kW+GFn6qSPcG085ubswCgjieqtro/DQqp8+ajZBHwz8pEACE= =kYWG -----END PGP SIGNATURE----- --Sig_/dCEsEQ=0qIYlEO_mth8V_/B-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:41:26 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:41:26 +0000 Received: from localhost ([127.0.0.1]:52592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3LR-0007bk-Va for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3LR-0007bX-3b for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:46892) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3LL-0000G9-SX for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3LK-00040e-SM for guix-patches@gnu.org; Sat, 04 May 2019 18:41:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,FROM_EXCESS_BASE64 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3LJ-0000As-PN for guix-patches@gnu.org; Sat, 04 May 2019 18:41:18 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35770 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3LJ-0000Af-JM for guix-patches@gnu.org; Sat, 04 May 2019 18:41:17 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id DD9DB3F85A for ; Sun, 5 May 2019 00:41:16 +0200 (CEST) Date: Sun, 5 May 2019 00:41:16 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 5/8] gnu: java-commons-daemon: Update to 1.1.0. Message-ID: <20190505004116.6a1a3f08@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/4d+yBlTVZD3Hb.p0HmSgtuj"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/4d+yBlTVZD3Hb.p0HmSgtuj Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable * gnu/packages/java (java-commons-daemon): Update to 1.1.0. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9b635699f6..3e0198b6aa 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6248,14 +6248,14 @@ This is a part of the Apache Commons Project.") (define-public java-commons-daemon (package (name "java-commons-daemon") - (version "1.0.15") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/daemon/source/" "commons-daemon-" version "-src.tar.gz")) (sha256 (base32 - "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) + "141gkhfzv5v3pdhic6y4ardq2dhsa3v36j8wmmhy6f8mac48fp7n")))) (build-system ant-build-system) (arguments `(#:test-target "test" --=20 2.21.0 --Sig_/4d+yBlTVZD3Hb.p0HmSgtuj Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4VDAAKCRC/KGy2WT5f /RopAJ0Zew2vQjDNLUvliZad9aDHzgwQhgCfWckFsXwBvfJPxpa/Z7VJCvUgq9Y= =vt5e -----END PGP SIGNATURE----- --Sig_/4d+yBlTVZD3Hb.p0HmSgtuj-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:41:49 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:41:49 +0000 Received: from localhost ([127.0.0.1]:52595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Lp-0007cK-CG for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ln-0007c7-TF for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:55359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Li-0000f4-OT for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Lh-00043C-Lj for guix-patches@gnu.org; Sat, 04 May 2019 18:41:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00, FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3Lg-0000d9-JA for guix-patches@gnu.org; Sat, 04 May 2019 18:41:41 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35772 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Lg-0000by-CF for guix-patches@gnu.org; Sat, 04 May 2019 18:41:40 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id E78B13F85A for ; Sun, 5 May 2019 00:41:39 +0200 (CEST) Date: Sun, 5 May 2019 00:41:39 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 6/8] gnu: Add java-ecj in version 4.6.3. Message-ID: <20190505004139.370990ba@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/MrHHEYuDUIL0EY7nll6c6FX"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/MrHHEYuDUIL0EY7nll6c6FX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable * gnu/packages/java.scm (java-ecj): New variable. --- gnu/packages/java.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3e0198b6aa..df151013fd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2363,6 +2363,45 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n" (native-inputs `(("unzip" ,unzip))))) =20 +(define-public java-ecj + (package (inherit java-ecj-3) + (version "4.6.3") + (source + (origin + (method url-fetch) + (uri (string-append + "http://archive.eclipse.org/eclipse/downloads/drops4/R-" + version + "-201703010400/ecjsrc-" + version + ".jar")) + (sha256 + (base32 + "11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl")))) + (arguments + `(#:tests? #f ; none included + #:build-target "build" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build.xml + (lambda _ + (substitute* "src/build.xml" + (("^.*MANIFEST.*$") + "")) + #t)) + (add-after 'unpack 'fix-prop + (lambda _ + (substitute* "src/build.xml" + (("^.*properties.*$") + " + ")) + #t)) + (add-before 'build 'chdir + (lambda _ + (chdir "src") + #t)) + (replace 'install (install-jars "."))))))) + (define-public java-cisd-base (let ((revision 38938) (base-version "14.12.0")) --=20 2.21.0 --Sig_/MrHHEYuDUIL0EY7nll6c6FX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4VIwAKCRC/KGy2WT5f /T4MAJwLUH2F4iX+iXzWU1ygSTnFFELdpwCcCwiknr8IaS9GIujL9ETeZLlxieU= =T+lZ -----END PGP SIGNATURE----- --Sig_/MrHHEYuDUIL0EY7nll6c6FX-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:42:18 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:42:18 +0000 Received: from localhost ([127.0.0.1]:52600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3MH-0007dX-PL for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3MF-0007dK-CO for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:46492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3MA-0001h2-7q for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M9-0004EG-1T for guix-patches@gnu.org; Sat, 04 May 2019 18:42:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_40,FROM_EXCESS_BASE64 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3M7-0001d1-RM for guix-patches@gnu.org; Sat, 04 May 2019 18:42:09 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35774 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M7-0001ab-Gv for guix-patches@gnu.org; Sat, 04 May 2019 18:42:07 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 1426A3F85A for ; Sun, 5 May 2019 00:42:07 +0200 (CEST) Date: Sun, 5 May 2019 00:42:06 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 7/8] gnu: java-tomcat: Build the full Tomcat package. Message-ID: <20190505004206.23197eea@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/vaZXz831rdGCl06j5Wjkv9g"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/vaZXz831rdGCl06j5Wjkv9g Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Currently java-tomcat uses the deploy build target. In that way, it is built like a library, with only the jar files. This commit will change the arget to deploy to build the full tomcat package. * gnu/packages/web.scm (java-tomcat)[source]: Remove bat-files in snippet. [inputs]: Remove java-eclipse-jdt-core, add java-commons-daemon, java-ecj. [native-inputs]: Remove. [arguments]: Use "deploy" build-target, add phases 'modify-deploy, 'symlink-commons-daemon, 'symlink-java-ecj, change 'install phase. --- gnu/packages/web.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3d9070f169..cb9af0a781 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5552,14 +5552,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (snippet '(begin (for-each delete-file (find-files "." "\\.jar$")) + (for-each delete-file (find-files "." "\\.bat$")) #t)))) (build-system ant-build-system) (inputs - `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) - (native-inputs - `(("java-junit" ,java-junit))) + `(("java-commons-daemon" ,java-commons-daemon) + ("java-ecj" ,java-ecj))) (arguments - `(#:build-target "package" + `(#:build-target "deploy" #:tests? #f; requires downloading some files. #:phases (modify-phases %standard-phases @@ -5582,6 +5582,33 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (("")) #t)) + (add-after 'unpack 'modify-deploy + (lambda _ + ;; The Tomcat build downloads and copies these files to the + ;; bin and lib directory. + ;; We instead symlink to the input (see below). + (substitute* "build.xml" + (("") "")) + #t)) + (add-after 'install 'symlink-commons-daemon + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((commons-daemon (assoc-ref inputs "java-commons-daemon")) + (files (find-files commons-daemon "commons-daemon-.*\\.jar")) + (daemon-jar (car files)) + (out-bin (string-append (assoc-ref outputs "out") "/bin")) + (target (string-append out-bin "/commons-daemon.jar"))) + (symlink daemon-jar target) + #t))) + (add-after 'install 'symlink-java-ecj + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((java-ecj (assoc-ref inputs "java-ecj")) + (files (find-files java-ecj "ecj.*\\.jar")) + (java-ecj-jar (car files)) + (out-lib (string-append (assoc-ref outputs "out") "/lib")) + (target (string-append out-lib "/java-ecj.jar"))) + (symlink java-ecj-jar target) + #t))) (add-after 'unpack 'generate-properties (lambda _ ;; This could have been passed to make-flags, but getcwd returns @@ -5592,7 +5619,10 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (string-append "base.path=3D" (getcwd) "/downloads\n")))) #t)) (replace 'install - (install-jars "output/build/lib"))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "output/build" out)) + #t))))) (home-page "https://tomcat.apache.org") (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket") --=20 2.21.0 --Sig_/vaZXz831rdGCl06j5Wjkv9g Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4VPgAKCRC/KGy2WT5f /WyUAJ40UguCCCCRxqHcN61gkRvDhWbncgCfb0OXxSrTEEDTT6IcOFEUsAEzcH0= =dVB9 -----END PGP SIGNATURE----- --Sig_/vaZXz831rdGCl06j5Wjkv9g-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 04 18:42:42 2019 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:42:42 +0000 Received: from localhost ([127.0.0.1]:52603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Mg-0007eB-6J for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Mf-0007dx-B9 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:52771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Ma-0002Rk-6U for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3MZ-0004Qf-AU for guix-patches@gnu.org; Sat, 04 May 2019 18:42:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,FROM_EXCESS_BASE64 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3MY-0002OH-EK for guix-patches@gnu.org; Sat, 04 May 2019 18:42:35 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35776 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3MY-0002MA-7U for guix-patches@gnu.org; Sat, 04 May 2019 18:42:34 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id C48933F85A for ; Sun, 5 May 2019 00:42:33 +0200 (CEST) Date: Sun, 5 May 2019 00:42:33 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: guix-patches@gnu.org Subject: [PATCH 8/8] gnu: java-tomcat: Update to 8.5.40. Message-ID: <20190505004233.0c878053@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/PQA.McCFDhQzMGP.e8e9Sky"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 83.151.27.109 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) --Sig_/PQA.McCFDhQzMGP.e8e9Sky Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable * gnu/packages/web.scm (java-tomcat): Update to 8.5.40. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cb9af0a781..2f1818dd3d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5539,14 +5539,14 @@ encoder/decoder based on the draft-12 specification= for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.38") + (version "8.5.40") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-= src.tar.gz")) (sha256 (base32 - "13pbsyk39g1qph82nngp54mqycmg60rxlxwy4yszsssahrqnggb2")) + "0isv1cya8iq6ijgg5sshpy3p4j4gs7708n559n9vzy20zbylnhi0")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet --=20 2.21.0 --Sig_/PQA.McCFDhQzMGP.e8e9Sky Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4VWQAKCRC/KGy2WT5f /Q2NAKCMEy7du+g6HNXTEnEZFZ5n624jQgCcDTQ/Zs7Oz7/PS0C7sKbqM3l4ex0= =PYiD -----END PGP SIGNATURE----- --Sig_/PQA.McCFDhQzMGP.e8e9Sky-- From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 13 16:58:36 2019 Received: (at 35570-done) by debbugs.gnu.org; 13 Oct 2019 20:58:36 +0000 Received: from localhost ([127.0.0.1]:37154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iJkwl-0004B5-Ok for submit@debbugs.gnu.org; Sun, 13 Oct 2019 16:58:35 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:38626 helo=bjoernhoefling.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iJkwj-0004Ao-Uj for 35570-done@debbugs.gnu.org; Sun, 13 Oct 2019 16:58:34 -0400 Received: from alma-ubu (pD951FEB5.dip0.t-ipconnect.de [217.81.254.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 3E7DE3F910; Sun, 13 Oct 2019 22:58:32 +0200 (CEST) Date: Sun, 13 Oct 2019 22:58:31 +0200 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: 35570-done@debbugs.gnu.org Subject: Re: [bug#35570] java-tomcat: Make it the full package Message-ID: <20191013225831.516c7bde@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/9Vir8KDCBAxQi6L82cKq4hT"; protocol="application/pgp-signature" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 35570-done Cc: =?UTF-8?B?R8OhYm9y?= Boskovits X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.9 (/) --Sig_/9Vir8KDCBAxQi6L82cKq4hT Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, 5 May 2019 00:34:50 +0200 Bj=C3=B6rn H=C3=B6fling wrote: > The current java-tomcat package is only building the jar-files and > uses Tomcat only as a servlet-api package. This patch series changes > it to the "real" package with a bin, conf, ... directory. >=20 > If you have a CATALINA_BASE, i.e. a Tomcat instance directory with > conf, log, webapps, you can start Tomcat like that: >=20 > CATALINA_BASE=3D/home/bjoern/guix/tmp/catalina-home /gnu/store/q5dqsiiwb6= 65jfb6ckcfpw3ijgm4gyh7-java-tomcat-8.5.40/bin/startup.sh >=20 > And then navigate to http://localhost:8080/ to view your new site. >=20 > The standard Tomcat installation copies the commons-daemon.jar and the > java-ecj.jar. We better use symlinks to the input package. But these > would be overridden by a repacking phase: Thus, we need to modify the > ant-build-system, placing this series into the staging branch. >=20 > What's finally outstanding is a tomcat-service. >=20 > Bj=C3=B6rn Pushed to staging as d99e7ee0f2bbe4abe08552afaa9821036da2a760 with an update to the latest 8.5.x Tomcat. Thanks to G=C3=A1bor for reviewing. I will continue with getting Tomcat9 in (which needs some more/updated dependencies) and I plan to write a service for Tomcat, if time admits me to do so. Bj=C3=B6rn --Sig_/9Vir8KDCBAxQi6L82cKq4hT Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXaOP9wAKCRC/KGy2WT5f /b4MAJ9MsNYLLPdXqcxAFOxjrkTNxJi8lACfa+EdqovtjIEEMZeU378CbjwchYI= =zq43 -----END PGP SIGNATURE----- --Sig_/9Vir8KDCBAxQi6L82cKq4hT-- From unknown Mon Jun 23 07:46:38 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 11 Nov 2019 12:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator