From 3560a2cdaa5fdc56b0613bada93242f1360f2273 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Nov 2019 11:47:43 +0200 Subject: gnu: java-eclipse-sisu-plexus: Don't use unstable tarball. * gnu/packages/java.scm (java-eclipse-sisu-plexus)[source]: Use git-fetch and git-file-name. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d9ea5526b83..c27e3c3c9d3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich -;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018, 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -10821,12 +10821,14 @@ OSGi Service Registry is a goal of this project.") (name "java-eclipse-sisu-plexus") (version "0.3.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/eclipse/sisu.plexus/" - "archive/releases/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse/sisu.plexus.git") + (commit (string-append "releases/" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lbj7nxy5j0z71k407zbb82icfqh7midrfk0fb3fa3jzdjz0d9d9")) + "1nvxky49v4h724wkfn842n68gj70zinidn1cmhvbb31j1zp6wf8p")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From e0c0b0786aa47d1fe7e79928943a848b7bc42b90 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Nov 2019 12:25:35 +0200 Subject: gnu: java-eclipse-sisu-plexus: Update to 0.3.4. * gnu/packages/java.scm (java-eclipse-sisu-plexus): Update to 0.3.4. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c27e3c3c9d3..75eee9e9673 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10819,7 +10819,7 @@ OSGi Service Registry is a goal of this project.") (define-public java-eclipse-sisu-plexus (package (name "java-eclipse-sisu-plexus") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) (uri (git-reference @@ -10828,7 +10828,7 @@ OSGi Service Registry is a goal of this project.") (file-name (git-file-name name version)) (sha256 (base32 - "1nvxky49v4h724wkfn842n68gj70zinidn1cmhvbb31j1zp6wf8p")) + "17mjlajnsqnk07cc58h1qpxrif85yb2m2y0pyba48yjjgikk8r9f")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 570f3b63709717a97a4a4501a6135e2c1f18bcdf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 13 Nov 2019 22:18:28 +0100 Subject: gnu: antlr3: Fix building after changes in ant-build-system. * gnu/packages/java.scm (antlr3, antlr3-3.1, antlr3-3.3): Fix copying resources causing an error message later in the bootstrap chain. --- gnu/packages/java.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 75eee9e9673..4734bba68c7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6742,14 +6742,16 @@ import org.antlr.grammar.v3.ANTLRTreePrinter;")) (add-before 'build 'fix-build-xml (lambda _ (substitute* "build.xml" - ((" + (("target name=\"compile\">") + "target name=\"compile\"> + -")) #t))))) (native-inputs `(("antlr" ,antlr2) @@ -6855,14 +6857,16 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (add-before 'build 'fix-build-xml (lambda _ (substitute* "build.xml" - ((" + (("target name=\"compile\">") + "target name=\"compile\"> + -")) #t))))) (native-inputs `(("antlr" ,antlr2) @@ -6874,7 +6878,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) ("antlr" ,antlr2) ("antlr3" ,antlr3-3.1))))) -(define antlr3-3.1 +(define-public antlr3-3.1 (package (inherit antlr3) (version "3.1") @@ -6932,14 +6936,16 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (add-before 'build 'fix-build-xml (lambda _ (substitute* "build.xml" - ((" + (("target name=\"compile\">") + "target name=\"compile\"> + -")) #t))))) (native-inputs `(("antlr" ,antlr2))) -- cgit v1.3 From da655b1eb2da35b58665c646589c2b533a941459 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:17:02 +0200 Subject: gnu: Add java-jsonp-api. * gnu/packages/java.scm (java-jsonp-api): New variable. --- gnu/packages/java.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4734bba68c7..c145898af60 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019 Carlo Zancanaro -;;; Copyright © 2017, 2018 Julien Lepiller +;;; Copyright © 2017, 2018, 2019 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice @@ -11230,3 +11230,33 @@ the application using Java to Lisp integration APIs.") license:bsd-3 ;; jfli is released under CPL 1.0 license:cpl1.0)))) + +(define-public java-jsonp-api + (package + (name "java-jsonp-api") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/jsonp") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nxq16lrx7i87hgyj5rzcwilvr67h0i299gygfn8f5vs4n7n59vy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jsonp-api.jar" + #:tests? #f + #:source-dir "api/src/main/java" + #:test-dir "api/src/test")) + (home-page "https://eclipse-ee4j.github.io/jsonp/") + (synopsis "JSON Processing in Java") + (description "JSON Processing (JSON-P) is a Java API to process (e.g. +parse, generate, transform and query) JSON messages. It produces and +consumes JSON text in a streaming fashion (similar to StAX API for XML) +and allows to build a Java object model for JSON text using API classes +(similar to DOM API for XML).") + ;; either gpl2 only with classpath exception, or epl2.0. + (license (list license:gpl2 + license:epl2.0)))) -- cgit v1.3 From d45f73c9a17d2c03522b5ec4a4a307354cb28fc4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:19:21 +0200 Subject: gnu: Add java-jsonp-impl. * gnu/packages/java.scm (java-jsonp-impl): New variable. --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c145898af60..dc1cb78a014 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11260,3 +11260,18 @@ and allows to build a Java object model for JSON text using API classes ;; either gpl2 only with classpath exception, or epl2.0. (license (list license:gpl2 license:epl2.0)))) + +(define-public java-jsonp-impl + (package + (inherit java-jsonp-api) + (name "java-jsonp-impl") + (arguments + `(#:jar-name "jsonp-impl.jar" + #:tests? #f + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test")) + (propagated-inputs + `(("java-jsonp-api" ,java-jsonp-api))) + (description "JSON Processing (JSON-P) is a Java API to process (e.g. +parse, generate, transform and query) JSON messages. This package contains +a reference implementation of that API."))) -- cgit v1.3 From 357f4564002d6951858d10f807fca7af834887a8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:27:10 +0200 Subject: gnu: Add java-xmp. * gnu/packages/java.scm (java-xmp): New variable. --- gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dc1cb78a014..41171af340e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11275,3 +11275,47 @@ and allows to build a Java object model for JSON text using API classes (description "JSON Processing (JSON-P) is a Java API to process (e.g. parse, generate, transform and query) JSON messages. This package contains a reference implementation of that API."))) + +(define-public java-xmp + (package + (name "java-xmp") + (version "5.1.3") + (source (origin + (method url-fetch) + (uri (string-append "http://download.macromedia.com/pub/developer" + "/xmp/sdk/XMPCoreJava-" version ".zip")) + (sha256 + (base32 + "14nai2mmsg7l5ya2y5mx4w4lr1az3sk2fjz6hiy4zdrsavgvl1g7")))) + (build-system ant-build-system) + (arguments + `(#:build-target "build" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "XMPCore") + #t)) + (add-before 'build 'fix-timestamp + (lambda _ + (substitute* "build.xml" + (("\\$\\{BuildDate\\}") "1970 Jan 01 00:00:00-GMT")) + #t)) + (replace 'install + (install-jars ".")) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "docs" + (string-append (assoc-ref outputs "out") "/share/doc/java-xmp")) + #t))))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://www.adobe.com/devnet/xmp.html") + (synopsis "Extensible Metadat Platform (XMP) support in Java") + (description "Adobe's Extensible Metadata Platform (XMP) is a labeling +technology that allows you to embed data about a file, known as metadata, +into the file itself. The XMP Toolkit for Java is based on the C++ XMPCore +library and the API is similar.") + (license license:bsd-3))) -- cgit v1.3 From a005c63a2167b76ce89b5a7017b216320a403ab4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:31:35 +0200 Subject: gnu: Add java-metadata-extractor. * gnu/packages/java.scm (java-metadata-extractor): New variable. --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 41171af340e..20db3e95537 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11319,3 +11319,40 @@ technology that allows you to embed data about a file, known as metadata, into the file itself. The XMP Toolkit for Java is based on the C++ XMPCore library and the API is similar.") (license license:bsd-3))) + +(define-public java-metadata-extractor + (package + (name "java-metadata-extractor") + (version "2.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drewnoakes/metadata-extractor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yrq0swrl1r40yjbk5kqzjxr04jlkq9lfi711jvfgjf5kp2qinj")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "metadata-extractor.jar" + #:source-dir "Source" + #:test-dir "Tests" + #:phases + (modify-phases %standard-phases + (add-before 'check 'fix-test-dir + (lambda _ + (substitute* "build.xml" + (("/java\">") "\">")) + #t))))) + (propagated-inputs + `(("java-xmp" ,java-xmp))) + (native-inputs + `(("java-hamcrest-core" ,java-hamcrest-core) + ("java-junit" ,java-junit))) + (home-page "https://github.com/drewnoakes/metadata-extractor") + (synopsis "Extract metadata from image and video files") + (description "Metadata-extractor is a straightforward Java library for +reading metadata from image files. It is able to read metadata in Exif, +IPTC, XMP, ICC and more formats.") + (license license:asl2.0))) -- cgit v1.3 From 16fdf2f55d13ebcb16bdbb888a1c3453c47e469d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:47:48 +0200 Subject: gnu: javacc: Install binaries. * gnu/packages/java.scm (javacc)[arguments]: Add install-bin phase. --- gnu/packages/java.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 20db3e95537..bc55c2fa39a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2394,7 +2394,27 @@ debugging, etc.") #:test-target "test" #:phases (modify-phases %standard-phases - (replace 'install (install-jars "target"))))) + (replace 'install (install-jars "target")) + (add-after 'install 'install-bin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/java")) + (bin (string-append out "/bin")) + (javacc (string-append bin "/javacc"))) + (mkdir-p bin) + (with-output-to-file javacc + (lambda _ + (display + (string-append "#!/bin/sh\n" + (assoc-ref inputs "jdk") "/bin/java" + " -cp " dir "/javacc.jar" " `basename $0`" " $*")))) + (chmod javacc #o755) + ;; symlink to different names to affect the first argument and + ;; change the behavior of the jar file. + (symlink javacc (string-append bin "/jjdoc")) + (symlink javacc (string-append bin "/jjtree")) + #t)))))) + (native-inputs `(("javacc" ,javacc-4))))) -- cgit v1.3 From 7214fbd2f114fbd3dfad97f361a2065c133e4159 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:45:36 +0200 Subject: gnu: Add java-openjfx-build. * gnu/packages/java.scm (java-openjfx-build): New variable. --- gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bc55c2fa39a..bf1cb49d73a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2320,6 +2320,50 @@ new Date();")) `(("java-junit" ,java-junit) ,@(package-inputs ant/java8))))) +(define-public java-openjfx-build + (package + (name "java-openjfx-build") + ;; This is a java-8 version + (version "8.202") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") + (changeset (string-append + (string-join (string-split version #\.) "u") + "-ga")))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-openjfx.jar" + #:source-dir "buildSrc/src/main/java" + #:test-dir "buildSrc/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'configure 'generate-jsl-parser + (lambda _ + (invoke "antlr3" "-o" + "buildSrc/src/main/java/com/sun/scenario/effect/compiler" + "buildSrc/src/main/antlr/JSL.g")))))) + (inputs + `(("antlr3" ,antlr3) + ("java-stringtemplate" ,java-stringtemplate))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "https://openjfx.io") + (synopsis "Graphical application toolkit in Java") + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains base classes for the OpenJFX +distribution and helper classes for building other parts of the +distribution.") + (license license:gpl2))) ;gpl2 only, with classpath exception + (define-public javacc-4 (package (name "javacc") -- cgit v1.3 From 46f0543983fcbd5f75127b8a05133f16230ca66e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 12:56:33 +0200 Subject: gnu: Add java-openjfx-base. * gnu/packages/java.scm (java-openjfx-base): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bf1cb49d73a..8ee2b32c3af 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2364,6 +2364,38 @@ distribution and helper classes for building other parts of the distribution.") (license license:gpl2))) ;gpl2 only, with classpath exception +(define-public java-openjfx-base + (package (inherit java-openjfx-build) + (name "java-openjfx-base") + (arguments + `(#:jar-name "java-openjfx-base.jar" + #:source-dir "modules/base/src/main/java:modules/base/src/main/java8:modules/base/src/main/version-info" + #:test-dir "modules/base/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'check 'remove-empty-file + (lambda _ + (with-directory-excursion "modules/base/src/test/java" + ;; These files are completely commented, but junit expects them to + ;; contain a class, so tests fail. + (delete-file + "com/sun/javafx/property/adapter/PropertyDescriptorTest.java") + (delete-file + "com/sun/javafx/property/adapter/ReadOnlyPropertyDescriptorTest.java") + (delete-file "javafx/beans/property/PropertiesTest.java") + (delete-file + "javafx/beans/property/adapter/ReadOnlyJavaBeanPropertyBuilder_General_Test.java") + ;; This one fails + (delete-file "com/sun/javafx/runtime/VersionInfoTest.java")) + #t))))) + (propagated-inputs + `(("java-openjfx-build" ,java-openjfx-build))) + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains base classes for the OpenJFX +distribution."))) + (define-public javacc-4 (package (name "javacc") -- cgit v1.3 From 36f73d705898441c3594f477eb18cf15255f538a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 13:01:00 +0200 Subject: gnu: Add java-openjfx-graphics. * gnu/packages/java.scm (java-openjfx-graphics): New variable. --- gnu/packages/java.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8ee2b32c3af..2c5e9d679f7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2396,6 +2396,23 @@ modern, efficient, and fully featured toolkit for developing rich client applications. This package contains base classes for the OpenJFX distribution."))) +(define-public java-openjfx-graphics + (package (inherit java-openjfx-build) + (name "java-openjfx-graphics") + (arguments + `(#:jar-name "java-openjfx-graphics.jar" + #:source-dir "modules/graphics/src/main/java" + #:tests? #f; require X + #:test-dir "modules/graphics/src/test")) + (propagated-inputs + `(("java-openjfx-base" ,java-openjfx-base) + ("java-swt" ,java-swt))) + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains graphics-related classes for the +OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") -- cgit v1.3 From 68a13319aa34898132a2787a281da012d5ad025b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 13:02:39 +0200 Subject: gnu: Add java-openjfx-media. * gnu/packages/java.scm (java-openjfx-media): New variable. --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2c5e9d679f7..c41ea204925 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2413,6 +2413,21 @@ modern, efficient, and fully featured toolkit for developing rich client applications. This package contains graphics-related classes for the OpenJFX distribution."))) +(define-public java-openjfx-media + (package (inherit java-openjfx-build) + (name "java-openjfx-media") + (propagated-inputs + `(("java-openjxf-graphics" ,java-openjfx-graphics))) + (arguments + `(#:jar-name "java-openjfx-media.jar" + #:source-dir "modules/media/src/main/java" + #:tests? #f)); no tests + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains media-related classes for the +OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") -- cgit v1.3 From 0dd6089d344148e7ba39bc4c66288fc006814d60 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 13:11:57 +0200 Subject: gnu: Add java-svg-salamander. * gnu/packages/java.scm (java-svg-salamander): New variable. * gnu/packages/patches/java-svg-salamander-Fix-non-det.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 47 ++++++++++++ .../patches/java-svg-salamander-Fix-non-det.patch | 86 ++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 gnu/packages/patches/java-svg-salamander-Fix-non-det.patch (limited to 'gnu/packages/java.scm') diff --git a/gnu/local.mk b/gnu/local.mk index e1c1cef8542..7ef5ef7a6cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1001,6 +1001,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ + %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c41ea204925..32e3c3ce6fd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11484,3 +11484,50 @@ library and the API is similar.") reading metadata from image files. It is able to read metadata in Exif, IPTC, XMP, ICC and more formats.") (license license:asl2.0))) + +(define-public java-svg-salamander + (package + (name "java-svg-salamander") + (version "1.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blackears/svgSalamander") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf")) + (modules '((guix build utils))) + (snippet + `(for-each delete-file (find-files "." ".*.jar"))) + (patches + (search-patches "java-svg-salamander-Fix-non-det.patch")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "svg-core") + #t)) + (add-before 'build 'copy-jars + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (car (find-files (assoc-ref inputs "javacc") "\\.jar$")) + "../libraries/javacc.jar") + (copy-file (car (find-files (assoc-ref inputs "ant") "ant\\.jar$")) + "../libraries/ant.jar") + #t)) + (replace 'install + (install-jars "dist"))))) + (native-inputs + `(("javacc" ,javacc))) + (home-page "https://github.com/blackears/svgSalamander") + (synopsis "SVG engine for Java") + (description "SVG Salamander is an SVG engine for Java that's designed +to be small, fast, and allow programmers to use it with a minimum of fuss. +It's in particular targeted for making it easy to integrate SVG into Java +games and making it much easier for artists to design 2D game content - from +rich interactive menus to charts and graphcs to complex animations.") + (license license:bsd-2))) diff --git a/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch new file mode 100644 index 00000000000..418fa0867f0 --- /dev/null +++ b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch @@ -0,0 +1,86 @@ +From c812efa9fcbfb49a571cc73af83c8da5cb951bcf Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Thu, 2 May 2019 19:05:33 +0200 +Subject: [PATCH] Fix non determinism and installation + +--- + svg-core/build.xml | 22 ---------------------- + svg-core/nbproject/build-impl.xml | 1 - + 2 files changed, 23 deletions(-) + +diff --git a/svg-core/build.xml b/svg-core/build.xml +index cc72eb7..0f9c3e6 100755 +--- a/svg-core/build.xml ++++ b/svg-core/build.xml +@@ -102,7 +102,6 @@ + + + +- + + + +@@ -112,7 +111,6 @@ + + + +- + + + +@@ -126,7 +124,6 @@ + + + +- + + + +@@ -203,7 +200,6 @@ + + + +- + + + +@@ -213,24 +209,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml +index b448d8a..37725ad 100755 +--- a/svg-core/nbproject/build-impl.xml ++++ b/svg-core/nbproject/build-impl.xml +@@ -1045,7 +1045,6 @@ is divided into following sections: + + + +- + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" +-- +2.21.0 + -- cgit v1.3 From ff56e6efe3d9e992e167cbe016a31504e1675c3f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 14:08:13 +0200 Subject: gnu: Add java-jboss-transaction-api-spec. * gnu/packages/java.scm (java-jboss-transaction-api-spec): New variable. --- gnu/packages/java.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 32e3c3ce6fd..883f8378b55 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11531,3 +11531,33 @@ It's in particular targeted for making it easy to integrate SVG into Java games and making it much easier for artists to design 2D game content - from rich interactive menus to charts and graphcs to complex animations.") (license license:bsd-2))) + +(define-public java-jboss-transaction-api-spec + (package + (name "java-jboss-transaction-api-spec") + (version "1.2+1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jboss/jboss-transaction-api_spec") + (commit "jboss-transaction-api_1.2_spec-1.1.1.Final"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xbfq5hvb86izflydxrqqv3k26c1ba2m0ap6m97shqrsdi9by4wy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-jboss-transaction-api_spec.jar" + #:source-dir "src/main/java" + #:tests? #f)); no tests + (inputs + `(("java-cdi-api" ,java-cdi-api) + ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec))) + (home-page "https://github.com/jboss/jboss-transaction-api_spec") + (synopsis "Generic transaction management API in Java") + (description "Java-jboss-transaction-api-spec implements the Transactions +API. A transaction is a unit of work containing one or more operations +involving one or more shared resources having ACID (Atomicity, Consistency, +Isolation and Durability) properties.") + ;; either gpl2 only with classpath exception or cddl. + (license (list license:gpl2 license:cddl1.0)))) -- cgit v1.3 From b635d2728e459ab47b3a599339326035a9982537 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 14:29:52 +0200 Subject: gnu: Add java-commons-pool. * gnu/packages/java.scm (java-commons-pool): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 883f8378b55..01e0ed4cadd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5109,6 +5109,38 @@ expressions to graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.") (license license:asl2.0))) +(define-public java-commons-pool + (package + (name "java-commons-pool") + (version "2.6.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/pool/source/" + "commons-pool2-" version "-src.tar.gz")) + (sha256 + (base32 + "1fi1hgqmq01bs6azbj3sfswxzadp2r8sjjfiq6ryilz1m50kvrv6")))) + (arguments + `(#:jar-name "common-pool.jar" + #:source-dir "src/main/java" + #:test-exclude + (list "**/PerformanceTest.java"))) + (build-system ant-build-system) + (inputs + `(("java-cglib" ,java-cglib))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-asm" ,java-asm) + ("java-objenesis" ,java-objenesis))) + (home-page "https://commons.apache.org/proper/commons-pool/") + (synopsis "Object-pooling API in Java") + (description "The commons-pool package provides an object-pooling API +and a number of object pool implementations. This package defines a +handful of pooling interfaces and some base classes that may be useful when +creating new pool implementations.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") -- cgit v1.3 From f31ea164bedb29067350cc01f18e0f96b9b732a8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 14:37:35 +0200 Subject: gnu: Add java-commons-dbcp. * gnu/packages/java.scm (java-commons-dbcp): New variable. --- gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 01e0ed4cadd..ffe4edd1ce4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5141,6 +5141,37 @@ handful of pooling interfaces and some base classes that may be useful when creating new pool implementations.") (license license:asl2.0))) +(define-public java-commons-dbcp + (package + (name "java-commons-dbcp") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/dbcp/source/" + "commons-dbcp2-" version "-src.tar.gz")) + (sha256 + (base32 + "0axbvcbnf2l70fc3ybrlp3siw2w4ka9mia2pnx4py8gz54cpw3rc")))) + (arguments + `(#:source-dir "src/main/java" + #:jar-name "java-commons-dbcp.jar" + #:tests? #f)); requires apache-geronimo + (inputs + `(("java-commons-pool" ,java-commons-pool) + ("java-commons-logging" ,java-commons-logging-minimal) + ("java-jboss-transaction-api-spec" ,java-jboss-transaction-api-spec))) + (native-inputs + `(("java-junit" ,java-junit))) + (build-system ant-build-system) + (home-page "https://commons.apache.org/proper/commons-dbcp/") + (synopsis "Database Connection Pool for Java") + (description "Commons-dbcp allows you to share a pool of database +connections between users. Creating a new connection for each user can be +time consuming and even unfeasible when the number of simultaneous users is +very large. This package provides a way to share a poole of connections to +reduce that load.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") -- cgit v1.3 From 934b83e45a0bb715eee44067b7b778e381f86248 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 May 2019 14:42:34 +0200 Subject: gnu: Add java-commons-jcs. * gnu/packages/java.scm (java-commons-jcs): New variable. --- gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ffe4edd1ce4..65f8d6aa777 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5172,6 +5172,52 @@ very large. This package provides a way to share a poole of connections to reduce that load.") (license license:asl2.0))) +(define-public java-commons-jcs + (package + (name "java-commons-jcs") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/jcs/source/" + "commons-jcs-dist-" version "-src.tar.gz")) + (sha256 + (base32 + "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "commons-jcs.jar" + #:source-dir "commons-jcs-core/src/main/java" + #:test-dir "commons-jcs-core/src/test" + #:tests? #f; requires hsqldb + #:phases + (modify-phases %standard-phases + (add-before 'build 'prepare + (lambda _ + (with-directory-excursion + "commons-jcs-core/src/main/java/org/apache/commons/jcs" + (substitute* + "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" + (("commons.dbcp") "commons.dbcp2") + ((".*\\.setMaxActive.*") "")) + ;;; Remove dependency on velocity-tools + (delete-file "admin/servlet/JCSAdminServlet.java")) + #t))))) + (propagated-inputs + `(("java-classpathx-servletapi" ,java-classpathx-servletapi) + ("java-commons-logging-minimal" ,java-commons-logging-minimal) + ("java-commons-httpclient" ,java-commons-httpclient) + ("java-commons-dbcp" ,java-commons-dbcp))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://commons.apache.org/proper/commons-jcs/") + (synopsis "Distributed caching system in Java") + (description "JCS is a distributed caching system written in Java. It +is intended to speed up applications by providing a means to manage cached +data of various dynamic natures. Like any caching system, JCS is most useful +for high read, low put applications. Latency times drop sharply and +bottlenecks move away from the database in an effectively cached system.") + (license license:asl2.0))) + (define-public java-jsr250 (package (name "java-jsr250") -- cgit v1.3