add jaxb jar in test conf for jdk 11

xfeep · xfeep · commit 2072ddee6193 · 2019-10-26T23:56:56.000+08:00
diff --git a/test/nginx-working-dir/conf/nginx-plain.conf b/test/nginx-working-dir/conf/nginx-plain.conf
@@ -62,7 +62,7 @@ http {
     ###coroutine enabled mode
     #jvm_options "-javaagent:#{ncjar}=mb";
     ###for win32, class path seperator is ";"
-    #jvm_options "-Xbootclasspath/a:#{ncjar}:#{mrr}/org/clojure/clojure/1.5.1/clojure-1.5.1.jar";
+    #jvm_options "-Xbootclasspath/a:#{ncjar}:#{mrr}/org/clojure/clojure/1.9.0/clojure-1.9.0.jar:#{mrr}/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.jar";
    
    
     ###wave log level, default is error
@@ -79,7 +79,7 @@ http {
     #jvm_classpath_check off;
     
     ###including ring-core & compojure & clj-http & clj-jdbc & mysql-connector-java for test
-    jvm_classpath "#{ncdev}/bin:#{ncjar}:coroutine-udfs:#{ncdev}/bin:#{ncdev}/test/clojure:#{ncdev}/src/clojure:#{ncdev}/test/groovy:#{mrr}/clojure-complete/clojure-complete/0.2.3/clojure-complete-0.2.3.jar:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar:#{mrr}/org/clojure/tools.macro/0.1.0/tools.macro-0.1.0.jar:#{mrr}/org/codehaus/groovy/groovy/2.3.4/groovy-2.3.4.jar:#{mrr}/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar:#{mrr}/tigris/tigris/0.1.1/tigris-0.1.1.jar:#{mrr}/ring/ring-codec/1.0.0/ring-codec-1.0.0.jar:#{mrr}/org/jsoup/jsoup/1.7.1/jsoup-1.7.1.jar:#{mrr}/org/clojure/java.jdbc/0.3.3/java.jdbc-0.3.3.jar:#{mrr}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:#{mrr}/cheshire/cheshire/5.2.0/cheshire-5.2.0.jar:#{mrr}/clj-time/clj-time/0.4.4/clj-time-0.4.4.jar:#{mrr}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:#{mrr}/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.2.1/jackson-dataformat-smile-2.2.1.jar:#{mrr}/junit/junit/4.11/junit-4.11.jar:#{mrr}/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1.jar:#{mrr}/commons-io/commons-io/2.4/commons-io-2.4.jar:#{mrr}/commons-codec/commons-codec/1.8/commons-codec-1.8.jar:#{mrr}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:#{mrr}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar:#{mrr}/org/clojure/tools.reader/0.7.3/tools.reader-0.7.3.jar:#{mrr}/org/apache/httpcomponents/httpcore/4.3/httpcore-4.3.jar:#{mrr}/org/clojure/tools.trace/0.7.10/tools.trace-0.7.10.jar:#{mrr}/org/clojure/tools.nrepl/0.2.3/tools.nrepl-0.2.3.jar:#{mrr}/org/apache/httpcomponents/httpclient/4.3.1/httpclient-4.3.1.jar:#{mrr}/joda-time/joda-time/2.1/joda-time-2.1.jar:#{mrr}/crouton/crouton/0.1.1/crouton-0.1.1.jar:#{mrr}/clout/clout/1.1.0/clout-1.1.0.jar:#{mrr}/mysql/mysql-connector-java/5.1.30/mysql-connector-java-5.1.30.jar:#{mrr}/slingshot/slingshot/0.10.3/slingshot-0.10.3.jar:#{mrr}/org/clojure/clojure/1.5.1/clojure-1.5.1.jar:#{mrr}/compojure/compojure/1.1.6/compojure-1.1.6.jar:#{mrr}/org/apache/httpcomponents/httpmime/4.3.1/httpmime-4.3.1.jar:#{mrr}/ring/ring-core/1.2.1/ring-core-1.2.1.jar:#{mrr}/org/clojure/core.incubator/0.1.0/core.incubator-0.1.0.jar:#{mrr}/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar";
+    jvm_classpath "#{ncdev}/test/nginx-working-dir/coroutine-udfs:#{ncdev}/bin:#{ncdev}/test/clojure:#{ncdev}/src/clojure:#{ncdev}/test/groovy:#{mrr}/clout/clout/1.1.0/clout-1.1.0.jar:#{mrr}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:#{mrr}/nrepl/nrepl/0.6.0/nrepl-0.6.0.jar:#{mrr}/clojure-complete/clojure-complete/0.2.5/clojure-complete-0.2.5.jar:#{mrr}/org/clojure/tools.macro/0.1.0/tools.macro-0.1.0.jar:#{mrr}/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar:#{mrr}/org/apache/httpcomponents/httpclient/4.3.1/httpclient-4.3.1.jar:#{mrr}/commons-io/commons-io/2.6/commons-io-2.6.jar:#{mrr}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:#{mrr}/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.2.1/jackson-dataformat-smile-2.2.1.jar:#{mrr}/crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar:#{mrr}/org/clojure/java.jdbc/0.3.3/java.jdbc-0.3.3.jar:#{mrr}/junit/junit/4.11/junit-4.11.jar:#{mrr}/stylefruits/gniazdo/1.1.2/gniazdo-1.1.2.jar:#{mrr}/slingshot/slingshot/0.10.3/slingshot-0.10.3.jar:#{mrr}/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar:#{mrr}/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar:#{mrr}/org/clojure/core.incubator/0.1.0/core.incubator-0.1.0.jar:#{mrr}/org/apache/httpcomponents/httpcore/4.3/httpcore-4.3.jar:#{mrr}/org/eclipse/jetty/websocket/websocket-common/9.4.19.v20190610/websocket-common-9.4.19.v20190610.jar:#{mrr}/org/jsoup/jsoup/1.7.1/jsoup-1.7.1.jar:#{mrr}/org/codehaus/groovy/groovy/2.3.4/groovy-2.3.4.jar:#{mrr}/org/apache/httpcomponents/httpmime/4.3.1/httpmime-4.3.1.jar:#{mrr}/tigris/tigris/0.1.1/tigris-0.1.1.jar:#{mrr}/org/eclipse/jetty/websocket/websocket-client/9.4.19.v20190610/websocket-client-9.4.19.v20190610.jar:#{mrr}/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar:#{mrr}/org/eclipse/jetty/jetty-http/9.4.19.v20190610/jetty-http-9.4.19.v20190610.jar:#{mrr}/commons-codec/commons-codec/1.8/commons-codec-1.8.jar:#{mrr}/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1.jar:#{mrr}/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar:#{mrr}/org/eclipse/jetty/jetty-util/9.4.19.v20190610/jetty-util-9.4.19.v20190610.jar:#{mrr}/org/eclipse/jetty/jetty-io/9.4.19.v20190610/jetty-io-9.4.19.v20190610.jar:#{mrr}/mysql/mysql-connector-java/5.1.30/mysql-connector-java-5.1.30.jar:#{mrr}/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.jar:#{mrr}/org/clojure/data.json/0.2.5/data.json-0.2.5.jar:#{mrr}/org/clojure/tools.reader/0.8.1/tools.reader-0.8.1.jar:#{mrr}/org/clojure/tools.trace/0.7.10/tools.trace-0.7.10.jar:#{mrr}/org/eclipse/jetty/websocket/websocket-api/9.4.19.v20190610/websocket-api-9.4.19.v20190610.jar:#{mrr}/clj-time/clj-time/0.14.3/clj-time-0.14.3.jar:#{mrr}/org/clojure/clojure/1.9.0/clojure-1.9.0.jar:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar:#{mrr}/org/eclipse/jetty/jetty-xml/9.4.19.v20190610/jetty-xml-9.4.19.v20190610.jar:#{mrr}/org/eclipse/jetty/jetty-client/9.4.19.v20190610/jetty-client-9.4.19.v20190610.jar:#{mrr}/ring/ring-codec/1.1.1/ring-codec-1.1.1.jar:#{mrr}/compojure/compojure/1.1.6/compojure-1.1.6.jar:#{mrr}/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.jar:#{mrr}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:#{mrr}/cheshire/cheshire/5.2.0/cheshire-5.2.0.jar:#{mrr}/ring/ring-core/1.7.1/ring-core-1.7.1.jar:#{mrr}/crypto-random/crypto-random/1.2.0/crypto-random-1.2.0.jar:#{mrr}/joda-time/joda-time/2.9.9/joda-time-2.9.9.jar:#{mrr}/crouton/crouton/0.1.1/crouton-0.1.1.jar";
         
     
     ###setting user defined class waving configuration files which are in the above boot classpath
diff --git a/test/nginx-working-dir/conf/nginx-threadpool.conf b/test/nginx-working-dir/conf/nginx-threadpool.conf
@@ -75,7 +75,7 @@ http {
     #jvm_options "-Dnginx.clojure.wave.trace.classpattern=com.mysql.jdbc.StatementImpl";
 
     ###including ring-core & compojure & clj-http & clj-jdbc & mysql-connector-java for test
-    jvm_classpath "#{ncdev}/bin:#{ncjar}:coroutine-udfs:#{ncdev}/bin:#{ncdev}/test/clojure:#{ncdev}/src/clojure:#{ncdev}/test/groovy:#{mrr}/clojure-complete/clojure-complete/0.2.3/clojure-complete-0.2.3.jar:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar:#{mrr}/org/clojure/tools.macro/0.1.0/tools.macro-0.1.0.jar:#{mrr}/org/codehaus/groovy/groovy/2.3.4/groovy-2.3.4.jar:#{mrr}/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar:#{mrr}/tigris/tigris/0.1.1/tigris-0.1.1.jar:#{mrr}/ring/ring-codec/1.0.0/ring-codec-1.0.0.jar:#{mrr}/org/jsoup/jsoup/1.7.1/jsoup-1.7.1.jar:#{mrr}/org/clojure/java.jdbc/0.3.3/java.jdbc-0.3.3.jar:#{mrr}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:#{mrr}/cheshire/cheshire/5.2.0/cheshire-5.2.0.jar:#{mrr}/clj-time/clj-time/0.4.4/clj-time-0.4.4.jar:#{mrr}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:#{mrr}/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.2.1/jackson-dataformat-smile-2.2.1.jar:#{mrr}/junit/junit/4.11/junit-4.11.jar:#{mrr}/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1.jar:#{mrr}/commons-io/commons-io/2.4/commons-io-2.4.jar:#{mrr}/commons-codec/commons-codec/1.8/commons-codec-1.8.jar:#{mrr}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:#{mrr}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar:#{mrr}/org/clojure/tools.reader/0.7.3/tools.reader-0.7.3.jar:#{mrr}/org/apache/httpcomponents/httpcore/4.3/httpcore-4.3.jar:#{mrr}/org/clojure/tools.trace/0.7.10/tools.trace-0.7.10.jar:#{mrr}/org/clojure/tools.nrepl/0.2.3/tools.nrepl-0.2.3.jar:#{mrr}/org/apache/httpcomponents/httpclient/4.3.1/httpclient-4.3.1.jar:#{mrr}/joda-time/joda-time/2.1/joda-time-2.1.jar:#{mrr}/crouton/crouton/0.1.1/crouton-0.1.1.jar:#{mrr}/clout/clout/1.1.0/clout-1.1.0.jar:#{mrr}/mysql/mysql-connector-java/5.1.30/mysql-connector-java-5.1.30.jar:#{mrr}/slingshot/slingshot/0.10.3/slingshot-0.10.3.jar:#{mrr}/org/clojure/clojure/1.5.1/clojure-1.5.1.jar:#{mrr}/compojure/compojure/1.1.6/compojure-1.1.6.jar:#{mrr}/org/apache/httpcomponents/httpmime/4.3.1/httpmime-4.3.1.jar:#{mrr}/ring/ring-core/1.2.1/ring-core-1.2.1.jar:#{mrr}/org/clojure/core.incubator/0.1.0/core.incubator-0.1.0.jar:#{mrr}/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar";
+    jvm_classpath "#{ncdev}/test/nginx-working-dir/coroutine-udfs:#{ncdev}/bin:#{ncdev}/test/clojure:#{ncdev}/src/clojure:#{ncdev}/test/groovy:#{mrr}/clout/clout/1.1.0/clout-1.1.0.jar:#{mrr}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:#{mrr}/nrepl/nrepl/0.6.0/nrepl-0.6.0.jar:#{mrr}/clojure-complete/clojure-complete/0.2.5/clojure-complete-0.2.5.jar:#{mrr}/org/clojure/tools.macro/0.1.0/tools.macro-0.1.0.jar:#{mrr}/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar:#{mrr}/org/apache/httpcomponents/httpclient/4.3.1/httpclient-4.3.1.jar:#{mrr}/commons-io/commons-io/2.6/commons-io-2.6.jar:#{mrr}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:#{mrr}/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.2.1/jackson-dataformat-smile-2.2.1.jar:#{mrr}/crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar:#{mrr}/org/clojure/java.jdbc/0.3.3/java.jdbc-0.3.3.jar:#{mrr}/junit/junit/4.11/junit-4.11.jar:#{mrr}/stylefruits/gniazdo/1.1.2/gniazdo-1.1.2.jar:#{mrr}/slingshot/slingshot/0.10.3/slingshot-0.10.3.jar:#{mrr}/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar:#{mrr}/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar:#{mrr}/org/clojure/core.incubator/0.1.0/core.incubator-0.1.0.jar:#{mrr}/org/apache/httpcomponents/httpcore/4.3/httpcore-4.3.jar:#{mrr}/org/eclipse/jetty/websocket/websocket-common/9.4.19.v20190610/websocket-common-9.4.19.v20190610.jar:#{mrr}/org/jsoup/jsoup/1.7.1/jsoup-1.7.1.jar:#{mrr}/org/codehaus/groovy/groovy/2.3.4/groovy-2.3.4.jar:#{mrr}/org/apache/httpcomponents/httpmime/4.3.1/httpmime-4.3.1.jar:#{mrr}/tigris/tigris/0.1.1/tigris-0.1.1.jar:#{mrr}/org/eclipse/jetty/websocket/websocket-client/9.4.19.v20190610/websocket-client-9.4.19.v20190610.jar:#{mrr}/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar:#{mrr}/org/eclipse/jetty/jetty-http/9.4.19.v20190610/jetty-http-9.4.19.v20190610.jar:#{mrr}/commons-codec/commons-codec/1.8/commons-codec-1.8.jar:#{mrr}/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1.jar:#{mrr}/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar:#{mrr}/org/eclipse/jetty/jetty-util/9.4.19.v20190610/jetty-util-9.4.19.v20190610.jar:#{mrr}/org/eclipse/jetty/jetty-io/9.4.19.v20190610/jetty-io-9.4.19.v20190610.jar:#{mrr}/mysql/mysql-connector-java/5.1.30/mysql-connector-java-5.1.30.jar:#{mrr}/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.jar:#{mrr}/org/clojure/data.json/0.2.5/data.json-0.2.5.jar:#{mrr}/org/clojure/tools.reader/0.8.1/tools.reader-0.8.1.jar:#{mrr}/org/clojure/tools.trace/0.7.10/tools.trace-0.7.10.jar:#{mrr}/org/eclipse/jetty/websocket/websocket-api/9.4.19.v20190610/websocket-api-9.4.19.v20190610.jar:#{mrr}/clj-time/clj-time/0.14.3/clj-time-0.14.3.jar:#{mrr}/org/clojure/clojure/1.9.0/clojure-1.9.0.jar:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar:#{mrr}/org/eclipse/jetty/jetty-xml/9.4.19.v20190610/jetty-xml-9.4.19.v20190610.jar:#{mrr}/org/eclipse/jetty/jetty-client/9.4.19.v20190610/jetty-client-9.4.19.v20190610.jar:#{mrr}/ring/ring-codec/1.1.1/ring-codec-1.1.1.jar:#{mrr}/compojure/compojure/1.1.6/compojure-1.1.6.jar:#{mrr}/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.jar:#{mrr}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:#{mrr}/cheshire/cheshire/5.2.0/cheshire-5.2.0.jar:#{mrr}/ring/ring-core/1.7.1/ring-core-1.7.1.jar:#{mrr}/crypto-random/crypto-random/1.2.0/crypto-random-1.2.0.jar:#{mrr}/joda-time/joda-time/2.9.9/joda-time-2.9.9.jar:#{mrr}/crouton/crouton/0.1.1/crouton-0.1.1.jar";
     
     ###setting user defined class waving configuration files which are in the above boot classpath
     #jvm_options "-Dnginx.clojure.wave.udfs=compojure-http-clj.txt,mysql-jdbc.txt,test-groovy.txt";
