Update josm

Julien LepillerMon Oct 23 19:11:13+0200 2017

31daa88

Update josm

more/packages/java.scm

3131
  #:use-module (gnu packages autotools)
3232
  #:use-module (gnu packages base)
3333
  #:use-module (gnu packages compression)
34+
  #:use-module (gnu packages docbook)
3435
  #:use-module (gnu packages java)
3536
  #:use-module (gnu packages perl)
37+
  #:use-module (gnu packages xml)
3638
  #:use-module (more packages python))
3739
3840
(define-public java-tomcat

7981
Java WebSocket specifications are developed under the Java Community Process.")
8082
    (license license:asl2.0)))
8183
82-
;(define-public java-tomcat-7
83-
;  (package
84-
;    (inherit java-tomcat)
85-
;    (version "7.0.81")
86-
;    (source (origin
87-
;              (method url-fetch)
88-
;              (uri (string-append "mirror://apache/tomcat/tomcat-7/v"
89-
;                                  version "/src/apache-tomcat-" version "-src.tar.gz"))
90-
;              (sha256
91-
;               (base32
92-
;                "0rjyv3jpya60ph60950gmiqa6znbiq2dvsydxgwwiyqc47xrm9zw"))))))
93-
9484
(define-public java-openjfx
9585
  (package
9686
    (name "java-openjfx")

281271
       ("java-openjfx-base" ,java-openjfx-base)
282272
       ("java-openjfx-media" ,java-openjfx-media)
283273
       ("java-openjfx-graphics" ,java-openjfx-graphics)
274+
       ("java-avalon-framework-api" ,java-avalon-framework-api)
275+
       ("java-httpcomponents-client" ,java-httpcomponents-client)
276+
       ("java-httpcomponents-core" ,java-httpcomponents-core)
277+
       ("java-commons-jcs" ,java-commons-jcs)
284278
       ("java-commons-collections" ,java-commons-collections)
285279
       ("java-commons-jcs" ,java-commons-jcs)
286280
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)

294288
         (add-after 'unpack 'rm-build.xml
295289
           (lambda* _
296290
             (delete-file "build.xml")))
291+
         (add-after 'unpack 'rm-jcs-embedded
292+
           (lambda _
293+
             (delete-file-recursively "src/org/apache/commons/jcs")))
297294
         (add-before 'build 'fix-revision
298295
           (lambda* _
299296
             (with-output-to-file "REVISION.XML"

682679
       ("assertj" ,java-assertj)
683680
       ("mockito" ,java-mockito-1)))
684681
    (home-page "https://github.com/powermock/powermock")
685-
    (synopsis "")
686-
    (description "")
682+
    (synopsis "Mock library extension framework")
683+
    (description "PowerMock is a framework that extends other mock libraries
684+
such as EasyMock with more powerful capabilities.  PowerMock uses a custom
685+
classloader and bytecode manipulation to enable mocking of static methods,
686+
constructors, final classes and methods, private methods, removal of static
687+
initializers and more.  By using a custom classloader no changes need to be
688+
done to the IDE or continuous integration servers which simplifies adoption.")
687689
    (license license:asl2.0)))
688690
689691
(define-public java-powermock-reflect

10241026
               (mkdir-p share)
10251027
               (copy-file "dist/bsh-2.0b6.jar" (string-append share "/bsh-2.0b6.jar"))))))))
10261028
    (home-page "http://beanshell.org/")
1027-
    (synopsis "")
1028-
    (description "")
1029+
    (synopsis "Lightweight Scripting for Java")
1030+
    (description "BeanShell is a small, free, embeddable Java source
1031+
interpreter with object scripting language features, written in Java.
1032+
BeanShell dynamically executes standard Java syntax and extends it with common
1033+
scripting conveniences such as loose types, commands, and method closures like
1034+
those in Perl and JavaScript.")
10291035
    (license license:asl2.0)))
10301036
10311037
(define-public java-hdrhistogram

10811087
    (arguments
10821088
     `(#:jar-name "java-jmock.jar"
10831089
       #:source-dir "jmock/src/main/java"
1084-
       #:test-dir "jmock/src/test"
1085-
       #:phases
1086-
       (modify-phases %standard-phases
1087-
         (add-before 'check 'fix-tests
1088-
           (lambda _
1089-
             ;; Otherwise the abstract class is tested, but junit cannot create
1090-
             ;; an instance of it. Then remove dependent.
1091-
             (for-each (lambda (file) (delete-file file))
1092-
               '("jmock/src/test/java/org/jmock/test/unit/lib/AbstractMatcherTest.java"
1093-
                 "jmock/src/test/java/org/jmock/test/unit/lib/CurrentStateMatcherTests.java")))))))
1090+
       #:test-dir "jmock/src/test"))
10941091
    (native-inputs
10951092
     `(("cglib" ,java-cglib)))
10961093
    (home-page "https://github.com/jmock-developers/jmock-library")
1097-
    (synopsis "")
1098-
    (description "")
1094+
    (synopsis "Mock object library")
1095+
    (description "Jmock is an expressive Mock Object library for Test Driven
1096+
Development.")
10991097
    (license license:bsd-3)))
11001098
11011099
(define-public java-jmock-junit4

16541652
;     `(("core" ,java-spring-framework-core)
16551653
;       ("cglib" ,java-cglib)
16561654
;       ("inject" ,java-javax-inject)
1657-
;       ("snakeyaml" ,java-snakeyaml-notests)
1655+
;       ("snakeyaml" ,java-snakeyaml)
16581656
;       ("el" ,java-jboss-el-api-spec)
16591657
;       ("aspectj" ,java-aspectj-weaver)
16601658
;       ("logging" ,java-commons-logging-minimal)))

19571955
       #:tests? #f; requires testng which depends on jcommander
19581956
       #:source-dir "src/main/java"))
19591957
    (home-page "http://jcommander.org")
1960-
    (synopsis "")
1961-
    (description "")
1958+
    (synopsis "Command line parameters parser")
1959+
    (description "JCommander is a very small Java framework that makes it
1960+
trivial to parse command line parameters.  Parameters are declared with
1961+
annotations.")
19621962
    (license license:asl2.0)))
19631963
19641964
(define-public java-assertj

20502050
       ("asm" ,java-asm)
20512051
       ("aopalliance" ,java-aopalliance)))
20522052
    (home-page "http://testng.org")
2053-
    (synopsis "")
2054-
    (description "")
2053+
    (synopsis "Testing framework")
2054+
    (description "TestNG is a testing framework inspired from JUnit and NUnit
2055+
but introducing some new functionalities that make it more powerful and easier
2056+
to use.")
20552057
    (license license:asl2.0)))
20562058
20572059
(define-public java-fest-util

20732075
     `(("junit" ,java-junit)
20742076
       ("hamcrest" ,java-hamcrest-core)))
20752077
    (home-page "https://github.com/alexruiz/fest-util")
2076-
    (synopsis "")
2077-
    (description "")
2078+
    (synopsis "FEST common utilities")
2079+
    (description "Common utilities used in all FEST module.")
20782080
    (license license:asl2.0)))
20792081
20802082
;; required by java-jnacl

21142116
    (inputs
21152117
     `(("junit" ,java-junit)))
21162118
    (home-page "https://github.com/alexruiz/fest-test")
2117-
    (synopsis "")
2118-
    (description "")
2119+
    (synopsis "Common FEST testing infrastructure")
2120+
    (description "Fest-test contains the common FEST testing infrastructure.")
21192121
    (license license:asl2.0)))
21202122
21212123
;(define-public java-fest-assert-1

21732175
       ("java-objenesis" ,java-objenesis)
21742176
       ("java-asm" ,java-asm)))
21752177
    (home-page "https://github.com/alexruiz/fest-assert-2.x")
2176-
    (synopsis "")
2177-
    (description "")
2178+
    (synopsis "FEST fluent assertions")
2179+
    (description "FEST-Assert provides a fluent interface for assertions.")
21782180
    (license license:asl2.0)))
21792181
21802182
(define-public java-jnacl

22202222
       ("java-fest-util" ,java-fest-util)
22212223
       ("java-fest-assert" ,java-fest-assert)))
22222224
    (home-page "https://github.com/neilalexander/jnacl")
2223-
    (synopsis "")
2224-
    (description "")
2225+
    (synopsis "Java implementation of NaCl")
2226+
    (description "Pure Java implementation of the NaCl: Networking and
2227+
Cryptography library.")
22252228
    (license license:mpl2.0)))
22262229
22272230
(define-public java-jeromq

22542257
     `(("java-hamcrest-core" ,java-hamcrest-core)
22552258
       ("junit" ,java-junit)))
22562259
    (home-page "http://zeromq.org/bindings:java")
2257-
    (synopsis "")
2258-
    (description "")
2260+
    (synopsis "Java binding for ??MQ")
2261+
    (description "Jeromq provides the java bindings for ??MQ.")
22592262
    (license license:mpl2.0)))
22602263
22612264
(define-public java-log4j-core

22972300
       #:phases
22982301
       (modify-phases %standard-phases
22992302
         (add-after 'unpack 'enter-dir
2300-
           (lambda _ (chdir "log4j-core") #t)))))))
2303+
           (lambda _ (chdir "log4j-core") #t)))))
2304+
    (synopsis "Core component of the Log4j framework")
2305+
    (description "This package provides the core component of the Log4j
2306+
logging framework for Java.")))
23012307
23022308
(define-public java-apache-felix-utils
23032309
  (package

25442550
    (description "")
25452551
    (license license:asl2.0)))
25462552
2553+
(define-public java-commons-digester
2554+
  (package
2555+
    (name "java-commons-digester")
2556+
    (version "3.2")
2557+
    (source (origin
2558+
              (method url-fetch)
2559+
              (uri (string-append "mirror://apache/commons/digester/source/"
2560+
                                  "commons-digester3-" version "-src.tar.gz"))
2561+
              (sha256
2562+
               (base32
2563+
                "03kc18dfl5ma50cn02ji7rbhm33qpxyd9js6mvzznf8f7y6pmykk"))))
2564+
    (build-system ant-build-system)
2565+
    (arguments
2566+
     `(#:jar-name "commons-digester.jar"
2567+
       #:source-dir "src/main/java"
2568+
       #:phases
2569+
       (modify-phases %standard-phases
2570+
         (add-before 'build 'copy-resource
2571+
           (lambda _
2572+
             (copy-recursively "src/main/resources" "build/classes")))
2573+
         (add-before 'test 'copy-test-resource
2574+
           (lambda _
2575+
             (copy-recursively "src/test/resources" "build/test-classes"))))))
2576+
    (inputs
2577+
     `(("logging" ,java-commons-logging-minimal)
2578+
       ("cglib" ,java-cglib)
2579+
       ("beanutils", java-commons-beanutils)))
2580+
    (native-inputs
2581+
     `(("junit" ,java-junit)
2582+
       ("hamcrest" ,java-hamcrest-core)))
2583+
    (home-page "https://commons.apache.org/proper/commons-digester/")
2584+
    (synopsis "")
2585+
    (description "")
2586+
    (license license:asl2.0)))
2587+
2588+
(define-public java-commons-validator
2589+
  (package
2590+
    (name "java-commons-validator")
2591+
    (version "1.6")
2592+
    (source (origin
2593+
              (method url-fetch)
2594+
              (uri (string-append "mirror://apache//commons/validator/source/"
2595+
                                  "commons-validator-" version "-src.tar.gz"))
2596+
              (sha256
2597+
               (base32
2598+
                "1v2iqhjz4iqwmv38gzf953php770mmhglibixzvxjc2yca3sizkb"))))
2599+
    (build-system ant-build-system)
2600+
    (arguments
2601+
     `(#:jar-name "commons-validator.jar"
2602+
       #:source-dir "src/main/java"
2603+
       #:tests? #f; Require network access (jakarta.apache.org)
2604+
       #:test-exclude (list "**/Abstract*.java"
2605+
                            ;; Require network access (jakarta.apache.org)
2606+
                            "**/ByteTest.java"
2607+
                            "**/DateTest.java"
2608+
                            "**/DoubleTest.java"
2609+
                            "**/EmailTest.java"
2610+
                            "**/EntityImportTest.java"
2611+
                            "**/ExceptionTest.java"
2612+
                            "**/ExtensionTest.java")
2613+
       #:phases
2614+
       (modify-phases %standard-phases
2615+
         (add-before 'build 'copy-resource
2616+
           (lambda _
2617+
             (copy-recursively "src/main/resources" "build/classes")))
2618+
         (add-before 'test 'copy-test-resource
2619+
           (lambda _
2620+
             (copy-recursively "src/test/resources" "build/test-classes")))
2621+
         (add-before 'build 'fix-digester
2622+
           (lambda _
2623+
             ;; Port from digester 1 to digester 3.
2624+
             (substitute* (find-files "src/main/java" ".*\\.java")
2625+
               (("commons.digester") "commons.digester3")
2626+
               (("org.apache.commons.digester3.xmlrules.DigesterLoader")
2627+
                "org.apache.commons.digester3.binder.DigesterLoader"))
2628+
             ;; digester is private in this class, so we use the getter
2629+
             (substitute* "src/main/java/org/apache/commons/validator/FormSetFactory.java"
2630+
               (("digester.peek") "getDigester().peek"))
2631+
             (substitute* "src/main/java/org/apache/commons/validator/ValidatorResources.java"
2632+
               (("// DEPRECATED")
2633+
                "// DEPRECATED\nimport org.apache.commons.digester3.xmlrules.FromXmlRulesModule;")
2634+
               (("private Digester initDigester")
2635+
                (string-append
2636+
                  "private FromXmlRulesModule rulesModule(final URL url) {\n"
2637+
                  "  return new FromXmlRulesModule() {\n"
2638+
                  "    @Override\n"
2639+
                  "    protected void loadRules() {\n"
2640+
                  "      loadXMLRules(url);"
2641+
                  "    }\n"
2642+
                  "  };\n"
2643+
                  "}\n"
2644+
                  "private Digester initDigester"))
2645+
               ;; Copied from digester tests
2646+
               (("createDigester\\(rulesUrl\\)")
2647+
                "newLoader(rulesModule(rulesUrl)).newDigester()")))))))
2648+
    (inputs
2649+
     `(("digester" ,java-commons-digester)
2650+
       ("beanutils" ,java-commons-beanutils)
2651+
       ("collections" ,java-commons-collections)
2652+
       ("logging" ,java-commons-logging-minimal)))
2653+
    (native-inputs
2654+
     `(("junit" ,java-junit)))
2655+
    (home-page "https://commons.apache.org/proper/commons-validator")
2656+
    (synopsis "")
2657+
    (description "")
2658+
    (license license:asl2.0)))
2659+
2660+
(define-public java-ognl
2661+
  (package
2662+
    (name "java-ognl")
2663+
    (version "3.2.3")
2664+
    (source (origin
2665+
              (method url-fetch)
2666+
              (uri (string-append "https://github.com/jkuhnert/ognl/archive/OGNL_"
2667+
                                  (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
2668+
                                  ".tar.gz"))
2669+
              (sha256
2670+
               (base32
2671+
                "1p4yni36ln69cdl7icylpg87yzgnx9i08k4a5yhcvgmbr49p273w"))))
2672+
    (build-system ant-build-system)
2673+
    (arguments
2674+
     `(#:tests? #f; Tests are run as a dependency of "dist"
2675+
       #:jdk ,icedtea-8
2676+
       #:make-flags (list "-Dcompile.version=7")
2677+
       #:phases
2678+
       (modify-phases %standard-phases
2679+
         (add-before 'build 'remove-binaries
2680+
           (lambda _
2681+
             (for-each delete-file (find-files "." ".*\\.jar"))
2682+
             #t))
2683+
         (add-before 'build 'remove-clover
2684+
           (lambda _
2685+
             (substitute* "osbuild.xml"
2686+
               (("clover-check,") "")
2687+
               ((", clover.report"), "")
2688+
               ((".*clover-setup.*") "")
2689+
               ((".*src/test/\\*\\*/\\*.java.*") "")
2690+
               (("<files>") "")
2691+
               (("</files>") ""))))
2692+
         (replace 'install
2693+
           (lambda* (#:key outputs inputs #:allow-other-keys)
2694+
             (install-file "build/ognl-2.7.2.jar" (string-append (assoc-ref outputs "out") "/share/java")))))))
2695+
             ;(zero? (system* "ant" "dist" "-Dcompile.version=7"
2696+
             ;                (string-append "-Ddist="
2697+
             ;                               (assoc-ref outputs "out")
2698+
             ;                               "/share/java")
2699+
             ;                (string-append "-Ddocbook.xsl.path="
2700+
             ;                               (assoc-ref inputs "docbook-xsl"))
2701+
             ;                (string-append "-Ddocbook.xml.path="
2702+
             ;                               (assoc-ref inputs "docbook-xml"))
2703+
             ;                               )))))))
2704+
    (inputs
2705+
     `(("javassist" ,java-jboss-javassist)))
2706+
    (native-inputs
2707+
     `(("junit" ,java-junit)
2708+
       ("hamcrest" ,java-hamcrest-core)
2709+
       ("docbook-xml" ,docbook-xml)
2710+
       ("docbook-xsl" ,docbook-xsl)
2711+
       ("libxml2" ,libxml2)))
2712+
    (home-page "http://www.opensymphony.com/ognl/"); down ? and ognl.org is not owned by the project
2713+
    (synopsis "")
2714+
    (description "")
2715+
    (license license:asl2.0)))
2716+
2717+
(define-public java-apache-struts
2718+
  (package
2719+
    (name "java-apache-struts")
2720+
    (version "2.5.13")
2721+
    (source (origin
2722+
              (method url-fetch)
2723+
              (uri (string-append "mirror://apache/struts/" version "/struts-"
2724+
                                  version "-src.zip"))
2725+
              (sha256
2726+
               (base32
2727+
                "1pi3ymql7d9axxzi6pd8iqap1d3s2pij88mc7zywbw7mva61y8qy"))))
2728+
    (build-system ant-build-system)
2729+
    (arguments
2730+
     `(#:jar-name "apache-struts.jar"
2731+
       #:source-dir "src/core/src/main/java"
2732+
       #:test-dir "src/core/src/test"))
2733+
    (inputs
2734+
     `(("log4j" ,java-log4j-api)
2735+
       ("lang3" ,java-commons-lang3)
2736+
       ("io" ,java-commons-io)
2737+
       ("logging" ,java-commons-logging-minimal)
2738+
       ("servlet" ,java-classpathx-servletapi)
2739+
       ("ognl" ,java-ognl)
2740+
       ("velocity" ,java-velocity)
2741+
       ("testng" ,java-testng)))
2742+
    (native-inputs
2743+
     `(("junit" ,java-junit)
2744+
       ("unzip" ,unzip)))
2745+
    (home-page "https://struts.apache.org/")
2746+
    (synopsis "")
2747+
    (description "")
2748+
    (license license:asl2.0)))
2749+
25472750
(define-public java-velocity
25482751
  (package
25492752
    (name "java-velocity")

26182821
           (lambda* (#:key inputs #:allow-other-keys)
26192822
             ;; Don't download anything
26202823
             (substitute* "build.xml"
2621-
               ((".*download.xml.*") ""))))
2824+
               ((".*download.xml.*") ""))
2825+
             ;; Replace digester with digester3
2826+
             (substitute* (find-files "src/main/java" ".*\\.java")
2827+
               (("commons.digester") "commons.digester3"))
2828+
             #t))
26222829
         (replace 'install
26232830
           (lambda* (#:key outputs #:allow-other-keys)
26242831
             (let* ((out (assoc-ref outputs "out"))

26292836
    (inputs
26302837
     `(("dom4j" ,java-dom4j)
26312838
       ("velocity" ,java-velocity)
2839+
       ("digester" ,java-commons-digester)
2840+
       ("validator" ,java-commons-validator)
26322841
       ("beanutils", java-commons-beanutils)))
2633-
    ;; apache struts, commons validator
2842+
    ;; apache struts
26342843
    (home-page "https://velocity.apache.org/tools/devel")
26352844
    (synopsis "")
26362845
    (description "")

63756584
       ("io" ,java-eclipse-jetty-io-9.2)
63766585
       ("http" ,java-eclipse-jetty-http-9.2)
63776586
       ("security" ,java-eclipse-jetty-security-9.2)
6378-
       ;("continuation" ,java-eclipse-jetty-continuation-8)
63796587
       ("http-test" ,java-eclipse-jetty-http-test-classes-9.2)
63806588
       ("server" ,java-eclipse-jetty-server-9.2)
63816589
       ,@(package-inputs java-eclipse-jetty-util-9.2)))))