diff --git a/build.xml b/build.xml index 8777e66dcde6bf6377f1a06915bfbda20bc26a63..92603d707815c21ee2b26de545485c78337237c7 100644 --- a/build.xml +++ b/build.xml @@ -10,8 +10,8 @@ <include name="**/*.jar"/> <!-- several useless (and may be harmful) things at the moment --> <exclude name="seals/seals-omt-client.jar" /> - <!--exclude name="slf4j/logback-core-1.0.9.jar" /> - <exclude name="slf4j/logback-classic-1.0.9.jar" /--> + <!--exclude name="slf4j/logback-core-1.2.3.jar" /> + <exclude name="slf4j/logback-classic-1.2.3.jar" /--> </fileset> </path> @@ -216,7 +216,7 @@ <onejar file="ontowrap" group="fr.inrialpes.exmo" desc="Ontology wrapper" - path="jena/jena-arq.jar jena/jena-iri.jar jena/jena-core.jar jena/jena-base.jar jena/jena-shaded-guava.jar skosapi/skosapi.jar owlapi10/api.jar owlapi10/impl.jar owlapi10/io.jar owlapi10/rdfapi.jar owlapi10/rdfparser.jar owlapi3/owlapi-bin.jar"> + path="jena/jena-arq.jar jena/jena-iri.jar jena/jena-core.jar jena/jena-base.jar jena/jena-shaded-guava.jar skosapi/skosapi.jar owlapi10/api.jar owlapi10/impl.jar owlapi10/io.jar owlapi10/rdfapi.jar owlapi10/rdfparser.jar owlapi30/owlapi-bin.jar"> <files> <fileset dir="classes"> <include name="fr/inrialpes/exmo/ontowrap/**/*.class" /> @@ -230,7 +230,7 @@ group="fr.inrialpes.exmo.align" desc="Alignment API implementation" main="fr.inrialpes.exmo.align.cli.Procalign" - path="skosapi/skosapi.jar owlapi30/owlapi-bin.jar ontosim/ontosim.jar cli/commons-cli.jar slf4j/jcl-over-slf4j.jar slf4j/log4j-over-slf4j.jar slf4j/slf4j-api.jar jwnl/jwnl.jar lucene/lucene-core.jar lucene/lucene-analyzers-common.jar jena/jena-base.jar jena/jena-core.jar jena/jena-iri.jar jena/httpcore.jar jena/httpclient.jar jena/jena-shaded-guava.jar iddl/iddl.jar xerces/xercesImpl.jar xerces/resolver.jar xerces/xml-apis.jar hermit/hermit.jar align.jar ontowrap.jar procalign.jar lang/commons-lang3.jar"> + path="skosapi/skosapi.jar owlapi30/owlapi-bin.jar ontosim/ontosim.jar cli/commons-cli.jar slf4j/jcl-over-slf4j.jar slf4j/log4j-over-slf4j.jar slf4j/slf4j-api.jar jwnl/jwnl.jar lucene/lucene-core.jar lucene/lucene-analyzers-common.jar jena/jena-base.jar jena/jena-core.jar jena/jena-iri.jar jena/jena-shaded-guava.jar iddl/iddl.jar xerces/xercesImpl.jar xerces/resolver.jar xerces/xml-apis.jar hermit/hermit.jar align.jar ontowrap.jar procalign.jar lang/commons-text.jar lang/commons-lang3.jar http/httpcore.jar http/httpclient.jar http/httpclient-cache.jar thrift/libthrift.jar"> <files> <fileset dir="classes"> <include name="fr/inrialpes/exmo/align/impl/**/*.class"/> @@ -249,7 +249,7 @@ group="fr.inrialpes.exmo.align" desc="Alignment server" main="fr.inrialpes.exmo.align.service.AlignmentService" - path="procalign.jar osgi/osgi-core.jar jade/jade.jar jdbc/mysql-connector-java.jar jdbc/postgresql-jdbc4.jar servlet/servlet-api.jar fileupload/commons-fileupload.jar fileupload/commons-io.jar jetty/jetty-util.jar jetty/jetty-server.jar jetty/jetty-http.jar jetty/jetty-io.jar gson/gson.jar xerces/xercesImpl.jar lang/commons-lang3.jar"> + path="procalign.jar osgi/osgi-core.jar jade/jade.jar jdbc/mysql-connector-java.jar jdbc/postgresql-jdbc4.jar servlet/servlet-api.jar fileupload/commons-fileupload.jar fileupload/commons-io.jar jetty/jetty-util.jar jetty/jetty-server.jar jetty/jetty-http.jar jetty/jetty-io.jar gson/gson.jar xerces/xercesImpl.jar lang/commons-text.jar lang/commons-lang3.jar"> <files> <fileset dir="classes"> <include name="fr/inrialpes/exmo/align/service/**/*.class"/> @@ -324,7 +324,7 @@ <isset property="group"/> </condition> <echo message="Testing ${testset}..."/> - <echo message="You may also want to try sh test/clitest.sh"/> + <echo message="You may also want to try bash test/clitest.sh"/> <taskdef resource="testngtasks" classpath="${tooldir}/testng/testng.jar" /> <javac srcdir="test/src" includeantruntime="false" destdir="test/classes" debug="on" encoding="iso8859-15"> <!--compilerarg value="-Xlint:all"/--> @@ -336,6 +336,7 @@ <!-- possible groups: raw=impl+serv+io+onto+omwg, full=raw+ling+sem --> <!-- ling requires WordNet and takes ages initialising it --> <!-- testng seems to be in parallel by default: forcing thread to 1 (otherwise there are interferences --> + <property name="log.level" value="DEBUG" /> <testng groups="${testset}" outputDir="test/html" verbose="1" parallel="classes" threadCount="1" @@ -343,6 +344,7 @@ <!-- if ones uses logback --> <propertyset> <propertyref name="logback.configurationFile"/> + <!--propertyref name="log.level" /--> </propertyset> <classpath> <path refid="classpath" /> @@ -537,6 +539,7 @@ <onepom file="@{file}" /> </for--> <onepom file="cli/commons-cli" /> + <onepom file="thrift/libthrift.jar" /> <onepom file="hermit/hermit" /> <onepom file="iddl/iddl" /> <onepom file="jade/jade" /> @@ -544,7 +547,12 @@ <onepom file="jdbc/postgresql-jdbc4" /> <onepom file="jena/jena-arq" /> <onepom file="jena/jena-iri" /> + <onepom file="jena/jena-base" /> <onepom file="jena/jena-core" /> + <onepom file="jena/jena-shaded-guava" /> + <onepom file="http/httpclient" /> + <onepom file="http/httpclient-cache" /> + <onepom file="http/httpcore" /> <onepom file="jetty/jetty-util" /> <onepom file="jetty/jetty" /> <onepom file="jwnl/jwnl" /> @@ -553,6 +561,7 @@ <onepom file="slf4j/log4j-over-slf4j" /> <onepom file="lucene/lucene-core" /> <onepom file="lucene/lucene-analyzers-common" /> + <onepom file="lang/commons-text" /> <onepom file="lang/commons-lang3" /> <onepom file="ontosim/ontosim" /> <onepom file="osgi/osgi-core" />