more java packages
more/packages/java.scm
52 | 52 | #:use-module (more packages maven) | |
53 | 53 | #:use-module (more packages python)) | |
54 | 54 | ||
55 | + | (define-public java-httpcomponents-httpasyncclient | |
56 | + | (package | |
57 | + | (name "java-httpcomponents-httpasyncclient") | |
58 | + | (version "4.1.4") | |
59 | + | (source (origin | |
60 | + | (method url-fetch) | |
61 | + | (uri (string-append "mirror://apache/httpcomponents/httpasyncclient/" | |
62 | + | "source/httpcomponents-asyncclient-" | |
63 | + | version "-src.tar.gz")) | |
64 | + | (sha256 | |
65 | + | (base32 | |
66 | + | "0xfc20zrwdym6g00sz5y38mdmcn4y2jikkmfgqyh9zm4nkyj7ci5")))) | |
67 | + | (build-system ant-build-system) | |
68 | + | (arguments | |
69 | + | `(#:jar-name "httpcomponents-httpasyncclient.jar" | |
70 | + | #:phases | |
71 | + | (modify-phases %standard-phases | |
72 | + | (add-after 'unpack 'chdir | |
73 | + | (lambda _ (chdir "httpasyncclient") #t))))) | |
74 | + | (inputs | |
75 | + | `(("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
76 | + | ("java-commons-codec" ,java-commons-codec) | |
77 | + | ("java-commons-io" ,java-commons-io) | |
78 | + | ("java-hamcrest-core" ,java-hamcrest-core) | |
79 | + | ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient) | |
80 | + | ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) | |
81 | + | ("java-httpcomponents-httpcore-nio" ,java-httpcomponents-httpcore-nio) | |
82 | + | ("java-mockito" ,java-mockito-1) | |
83 | + | ("java-junit" ,java-junit))) | |
84 | + | (home-page "https://hc.apache.org/httpcomponents-asyncclient-ga/") | |
85 | + | (synopsis "HTTP client library for Java") | |
86 | + | (description "Although the @code{java.net} package provides basic | |
87 | + | functionality for accessing resources via HTTP, it doesn't provide the full | |
88 | + | flexibility or functionality needed by many applications. @code{HttpAsyncClient} | |
89 | + | seeks to fill this void by providing an efficient, up-to-date, and | |
90 | + | feature-rich package implementing the client side of the most recent HTTP | |
91 | + | standards and recommendations.") | |
92 | + | (license license:asl2.0))) | |
93 | + | ||
55 | 94 | (define-public java-fastutil | |
56 | 95 | (package | |
57 | 96 | (name "java-fastutil") | |
… | |||
2762 | 2801 | ;; Needed because tests look for data in src/... directly. | |
2763 | 2802 | (chdir "spring-core") | |
2764 | 2803 | #t)) | |
2804 | + | (add-before 'configure 'unbundle-asm | |
2805 | + | (lambda _ | |
2806 | + | (with-directory-excursion "src/main/java/org/springframework/asm" | |
2807 | + | (for-each delete-file | |
2808 | + | (filter (lambda (file) (not (string=? file "./SpringAsmInfo.java"))) | |
2809 | + | (find-files "." ".*.java"))) | |
2810 | + | (substitute* "SpringAsmInfo.java" | |
2811 | + | (("package org.springframework.asm;") | |
2812 | + | "package org.springframework.asm; | |
2813 | + | ||
2814 | + | import org.objectweb.asm.Opcodes;"))) | |
2815 | + | #t)) | |
2765 | 2816 | (add-before 'configure 'rename-dep | |
2766 | 2817 | (lambda _ | |
2767 | 2818 | (substitute* "src/main/java/org/springframework/objenesis/SpringObjenesis.java" | |
2768 | - | (("org.springframework.objenesis") "org.objenesis")) | |
2819 | + | (("org.springframework.objenesis\\.") "org.objenesis.") | |
2820 | + | (("import org.springframework.util.ConcurrentReferenceHashMap;") | |
2821 | + | "import org.springframework.util.ConcurrentReferenceHashMap; | |
2822 | + | import org.objenesis.Objenesis; | |
2823 | + | import org.objenesis.ObjenesisException;")) | |
2824 | + | (substitute* (find-files "." ".*.java") | |
2825 | + | (("org.springframework.asm\\.") "org.objectweb.asm.") | |
2826 | + | (("org.objectweb.asm.SpringAsmInfo") | |
2827 | + | "org.springframework.asm.SpringAsmInfo")) | |
2769 | 2828 | #t)) | |
2770 | 2829 | (add-before 'configure 'add-import | |
2771 | 2830 | (lambda _ | |
… | |||
2789 | 2848 | (find-files "." ".*")))) | |
2790 | 2849 | #t))))) | |
2791 | 2850 | (inputs | |
2792 | - | `(("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
2793 | - | ("java-jopt-simple" ,java-jopt-simple) | |
2851 | + | `(("java-asm" ,java-asm) | |
2852 | + | ("java-aspectj-weaver" ,java-aspectj-weaver) | |
2853 | + | ("java-cglib" ,java-cglib) | |
2794 | 2854 | ("java-commons-codec" ,java-commons-codec) | |
2855 | + | ("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
2856 | + | ("java-jopt-simple" ,java-jopt-simple) | |
2795 | 2857 | ("java-log4j-1.2-api" ,java-log4j-1.2-api) | |
2796 | - | ("java-objenesis" ,java-objenesis) | |
2797 | - | ("java-cglib" ,java-cglib) | |
2798 | - | ("java-aspectj-weaver" ,java-aspectj-weaver))) | |
2858 | + | ("java-objenesis" ,java-objenesis))) | |
2799 | 2859 | (native-inputs | |
2800 | 2860 | `(("java-junit" ,java-junit) | |
2801 | 2861 | ("java-hamcrest-all" ,java-hamcrest-all) | |
2802 | - | ("java-asm" ,java-asm) | |
2803 | 2862 | ("java-jboss-annotations-api-spec" ,java-jboss-annotations-api-spec) | |
2804 | 2863 | ("java-xmlunit-legacy" ,java-xmlunit-legacy) | |
2805 | 2864 | ("java-xmlunit" ,java-xmlunit) | |
… | |||
2945 | 3004 | (("org.springframework.cglib") "net.sf.cglib") | |
2946 | 3005 | (("net.sf.cglib.core.SpringNamingPolicy") "org.springframework.cglib.core.SpringNamingPolicy")) | |
2947 | 3006 | (substitute* "src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java" | |
2948 | - | (("org.springframework.objenesis") "org.objenesis")) | |
3007 | + | (("org.springframework.objenesis") "org.objenesis") | |
3008 | + | (("org.objenesis.SpringObjenesis") | |
3009 | + | "org.springframework.objenesis.SpringObjenesis")) | |
2949 | 3010 | #t)) | |
2950 | 3011 | (add-before 'check 'copy-test-classes | |
2951 | 3012 | (lambda _ | |
… | |||
3004 | 3065 | ("java-objenesis" ,java-objenesis) | |
3005 | 3066 | ;; Note: for javax-el (el-api) | |
3006 | 3067 | ("java-tomcat" ,java-tomcat))) | |
3068 | + | (native-inputs | |
3069 | + | `(("java-asm" ,java-asm) | |
3070 | + | ,@(package-native-inputs java-spring-framework-core))) | |
3071 | + | (description ""))) | |
3072 | + | ||
3073 | + | (define-public java-spring-framework-instrument | |
3074 | + | (package | |
3075 | + | (inherit java-spring-framework-core) | |
3076 | + | (name "java-spring-framework-instrument") | |
3077 | + | (arguments | |
3078 | + | `(#:jar-name "java-spring-framework-instrument.jar" | |
3079 | + | #:jdk ,icedtea-8 | |
3080 | + | #:source-dir "src/main/java" | |
3081 | + | #:test-dir "src/test" | |
3082 | + | #:phases | |
3083 | + | (modify-phases %standard-phases | |
3084 | + | (add-before 'configure 'chdir | |
3085 | + | (lambda _ | |
3086 | + | ;; Needed because tests look for data in src/... directly. | |
3087 | + | (chdir "spring-instrument") | |
3088 | + | #t)) | |
3089 | + | (add-before 'build 'copy-resources | |
3090 | + | (lambda _ | |
3091 | + | (copy-recursively "src/main/resources" "build/classes") | |
3092 | + | #t)) | |
3093 | + | (add-before 'check 'copy-test-resources | |
3094 | + | (lambda* (#:key inputs #:allow-other-keys) | |
3095 | + | (copy-recursively "src/test/resources" | |
3096 | + | "build/test-classes") | |
3097 | + | #t))))) | |
3098 | + | (inputs '()) | |
3099 | + | (description ""))) | |
3100 | + | ||
3101 | + | (define-public java-spring-framework-test | |
3102 | + | (package | |
3103 | + | (inherit java-spring-framework-core) | |
3104 | + | (name "java-spring-framework-test") | |
3105 | + | (arguments | |
3106 | + | `(#:jar-name "java-spring-framework-test.jar" | |
3107 | + | #:jdk ,icedtea-8 | |
3108 | + | #:source-dir "src/main/java" | |
3109 | + | #:test-dir "src/test" | |
3110 | + | #:phases | |
3111 | + | (modify-phases %standard-phases | |
3112 | + | (add-before 'configure 'chdir | |
3113 | + | (lambda _ | |
3114 | + | ;; Needed because tests look for data in src/... directly. | |
3115 | + | (chdir "spring-test") | |
3116 | + | #t)) | |
3117 | + | (add-before 'build 'copy-resources | |
3118 | + | (lambda _ | |
3119 | + | (copy-recursively "src/main/resources" "build/classes") | |
3120 | + | #t)) | |
3121 | + | (add-before 'check 'copy-test-resources | |
3122 | + | (lambda* (#:key inputs #:allow-other-keys) | |
3123 | + | (copy-recursively "src/test/resources" | |
3124 | + | "build/test-classes") | |
3125 | + | #t))))) | |
3126 | + | (inputs | |
3127 | + | `(("java-spring-framework-core" ,java-spring-framework-core) | |
3128 | + | ("java-spring-framework-web" ,java-spring-framework-web))) | |
3007 | 3129 | (description ""))) | |
3008 | 3130 | ||
3009 | 3131 | (define-public java-spring-framework-context | |
… | |||
3015 | 3137 | #:jdk ,icedtea-8 | |
3016 | 3138 | #:source-dir "src/main/java" | |
3017 | 3139 | #:test-dir "src/test" | |
3140 | + | #:tests? #f; TODO: require spring-framework-test | |
3018 | 3141 | #:phases | |
3019 | 3142 | (modify-phases %standard-phases | |
3020 | 3143 | (add-before 'configure 'chdir | |
… | |||
3027 | 3150 | (with-directory-excursion "src/main/java/org/springframework" | |
3028 | 3151 | (substitute* | |
3029 | 3152 | (list | |
3153 | + | "context/expression/MapAccessor.java" | |
3030 | 3154 | "context/annotation/ConfigurationClassEnhancer.java" | |
3031 | 3155 | "scripting/support/ScriptFactoryPostProcessor.java") | |
3156 | + | (("org.springframework.objenesis.ObjenesisException") | |
3157 | + | "org.objenesis.ObjenesisException") | |
3158 | + | (("org.springframework.asm") "org.objectweb.asm") | |
3032 | 3159 | (("org.springframework.cglib") "net.sf.cglib") | |
3033 | 3160 | (("net.sf.cglib.core.SpringNamingPolicy") | |
3034 | 3161 | "org.springframework.cglib.core.SpringNamingPolicy"))) | |
… | |||
3049 | 3176 | #t))))) | |
3050 | 3177 | (inputs | |
3051 | 3178 | `(("groovy" ,groovy) | |
3179 | + | ("java-asm" ,java-asm) | |
3052 | 3180 | ("java-aspectj-weaver" ,java-aspectj-weaver) | |
3053 | 3181 | ("java-bsh" ,java-bsh) | |
3054 | 3182 | ("java-cglib" ,java-cglib) | |
… | |||
3058 | 3186 | ("java-javax-ejb" ,java-javax-ejb) | |
3059 | 3187 | ("java-javax-inject" ,java-javax-inject) | |
3060 | 3188 | ("java-javax-interceptor" ,java-javax-interceptor) | |
3061 | - | ("java-javax-validation" ,java-javax-validation) | |
3189 | + | ("java-javax-validation-1" ,java-javax-validation-1) | |
3062 | 3190 | ("java-joda-time" ,java-joda-time) | |
3191 | + | ("java-objenesis" ,java-objenesis) | |
3063 | 3192 | ("java-snakeyaml" ,java-snakeyaml) | |
3064 | 3193 | ("java-spring-framework-aop" ,java-spring-framework-aop) | |
3065 | 3194 | ("java-spring-framework-beans" ,java-spring-framework-beans) | |
3066 | 3195 | ("java-spring-framework-beans-groovy" ,java-spring-framework-beans-groovy) | |
3067 | 3196 | ("java-spring-framework-core" ,java-spring-framework-core) | |
3068 | 3197 | ("java-spring-framework-expression" ,java-spring-framework-expression) | |
3198 | + | ("java-spring-framework-instrument" ,java-spring-framework-instrument) | |
3069 | 3199 | ;; Note: for javax-el (el-api) | |
3070 | 3200 | ("java-tomcat" ,java-tomcat))) | |
3201 | + | ;(native-inputs | |
3202 | + | ; `(("java-spring-framework-test" ,java-spring-framework-test) | |
3203 | + | ; ,@(package-native-inputs java-spring-framework-core))) | |
3071 | 3204 | (description ""))) | |
3072 | 3205 | ||
3073 | - | (define-public java-spring-framework-test | |
3206 | + | (define-public java-spring-framework-web | |
3074 | 3207 | (package | |
3075 | 3208 | (inherit java-spring-framework-core) | |
3076 | - | (name "java-spring-framework-test") | |
3209 | + | (name "java-spring-framework-web") | |
3077 | 3210 | (arguments | |
3078 | - | `(#:jar-name "java-spring-framework-test.jar" | |
3211 | + | `(#:jar-name "java-spring-framework-web.jar" | |
3079 | 3212 | #:jdk ,icedtea-8 | |
3080 | 3213 | #:source-dir "src/main/java" | |
3081 | 3214 | #:test-dir "src/test" | |
… | |||
3084 | 3217 | (add-before 'configure 'chdir | |
3085 | 3218 | (lambda _ | |
3086 | 3219 | ;; Needed because tests look for data in src/... directly. | |
3087 | - | (chdir "spring-test") | |
3220 | + | (chdir "spring-web") | |
3088 | 3221 | #t)) | |
3089 | 3222 | (add-before 'build 'copy-resources | |
3090 | 3223 | (lambda _ | |
3091 | 3224 | (copy-recursively "src/main/resources" "build/classes") | |
3092 | 3225 | #t)) | |
3226 | + | ;(add-before 'check 'copy-test-classes | |
3227 | + | ; (lambda _ | |
3228 | + | ; (mkdir-p "src/test/java/org/springframework/tests") | |
3229 | + | ; (copy-file "../spring-core/src/test/java/org/springframework/tests/TestGroup.java" | |
3230 | + | ; "src/test/java/org/springframework/tests/TestGroup.java") | |
3231 | + | ; (copy-file "../spring-core/src/test/java/org/springframework/tests/Assume.java" | |
3232 | + | ; "src/test/java/org/springframework/tests/Assume.java") | |
3233 | + | ; #t)) | |
3093 | 3234 | (add-before 'check 'copy-test-resources | |
3094 | 3235 | (lambda* (#:key inputs #:allow-other-keys) | |
3095 | - | (copy-recursively "src/test/resources" | |
3096 | - | "build/test-classes") | |
3236 | + | (copy-recursively "src/test/resources" "build/test-classes") | |
3097 | 3237 | #t))))) | |
3098 | 3238 | (inputs | |
3099 | - | `(("java-spring-framework-core" ,java-spring-framework-core) | |
3100 | - | ("java-spring-framework-web" ,java-spring-framework-web))) | |
3239 | + | `(("java-spring-framework-beans" ,java-spring-framework-beans) | |
3240 | + | ("java-spring-framework-core" ,java-spring-framework-core) | |
3241 | + | ("java-httpcomponents-httpasyncclient" ,java-httpcomponents-httpasyncclient) | |
3242 | + | ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient) | |
3243 | + | ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) | |
3244 | + | ("java-httpcomponents-httpcore-nio" ,java-httpcomponents-httpcore-nio))) | |
3101 | 3245 | (description ""))) | |
3102 | 3246 | ||
3103 | 3247 | (define-public java-spring-framework-expression | |
… | |||
3116 | 3260 | ;; Needed because tests look for data in src/... directly. | |
3117 | 3261 | (chdir "spring-expression") | |
3118 | 3262 | #t)) | |
3263 | + | (add-before 'build 'fix-asm | |
3264 | + | (lambda _ | |
3265 | + | (substitute* (find-files "." ".*.java") | |
3266 | + | (("org.springframework.asm") "org.objectweb.asm")) | |
3267 | + | (substitute* "src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java" | |
3268 | + | (("@Override") "")) | |
3269 | + | #t)) | |
3119 | 3270 | (add-before 'build 'copy-resources | |
3120 | 3271 | (lambda _ | |
3121 | 3272 | (copy-recursively "src/main/resources" "build/classes") | |
… | |||
3134 | 3285 | "build/test-classes") | |
3135 | 3286 | #t))))) | |
3136 | 3287 | (inputs | |
3137 | - | `(("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
3288 | + | `(("java-asm" ,java-asm) | |
3289 | + | ("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
3138 | 3290 | ("java-spring-framework-core" ,java-spring-framework-core))) | |
3139 | 3291 | (description ""))) | |
3140 | 3292 | ||
… | |||
3667 | 3819 | #:test-dir "src/core/src/test" | |
3668 | 3820 | #:jdk ,icedtea-8)) | |
3669 | 3821 | (inputs | |
3670 | - | `(("java-log4j-api" ,java-log4j-api) | |
3822 | + | `(("java-apache-freemarker" ,java-apache-freemarker) | |
3823 | + | ("java-log4j-api" ,java-log4j-api) | |
3671 | 3824 | ("java-commons-lang3" ,java-commons-lang3) | |
3672 | 3825 | ("java-commons-io" ,java-commons-io) | |
3673 | 3826 | ("java-commons-logging-minimal" ,java-commons-logging-minimal) | |
… | |||
3676 | 3829 | ("java-spring-framework-beans" ,java-spring-framework-beans) | |
3677 | 3830 | ("java-spring-framework-context" ,java-spring-framework-context) | |
3678 | 3831 | ("java-spring-framework-core" ,java-spring-framework-core) | |
3832 | + | ("java-spring-framework-web" ,java-spring-framework-web) | |
3679 | 3833 | ("java-velocity" ,java-velocity) | |
3680 | 3834 | ("java-testng" ,java-testng))) | |
3681 | 3835 | (native-inputs |