diff --git a/build.xml b/build.xml index f9ca4232f6cff741e2688983c600f5d813658caa..1dc7471462f785d53b76dcf952ab9fbd8b8e8989 100644 --- a/build.xml +++ b/build.xml @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="iso-8859-1" ?> <!-- $Id$ --> -<project name="align" default="compile" basedir="."> +<project name="align" default="compile" basedir="." + xmlns:artifact="antlib:org.apache.maven.artifact.ant"> <!-- this is useful but introduces, Xlint:path warnings --> <path id="classpath"> <fileset dir="./lib"> <include name="**/*.jar"/> + <!-- several useless (and may be harmful) things at the moment --> + <exclude name="seals/seals-omt-client.jar" /> + <exclude name="log4j/slf4j-log4j.jar" /> </fileset> </path> - + <!-- tested --> <target name="usage" depends="versionnumber"> <echo>ant _target_ _options_ @@ -25,6 +29,7 @@ zip: creates a new zip file javadoc: generates documentation release: releases a new version + mavenize: creates a maven local repository cover: check test coverage analyse: perform static analysis svnbranch: copy the version under svn @@ -45,7 +50,7 @@ <!-- tested --> <target name="init" depends="bind"> - <property name="jarclasspath" value="skosapi/skosapi.jar owlapi30/owlapi-bin.jar ontosim/ontosim.jar getopt/getopt.jar log4j/commons-logging.jar log4j/log4j.jar log4j/slf4j-api.jar log4j/slf4j-log4j.jar jwnl/jwnl.jar lucene/lucene-core.jar jena/jena.jar jena/iri.jar jena/icu4j.jar iddl/iddl.jar xerces/xercesImpl.jar xerces/resolver.jar xerces/xml-apis.jar hermit/HermiT.jar align.jar ontowrap.jar procalign.jar"/> + <property name="jarclasspath" value="skosapi/skosapi.jar owlapi30/owlapi-bin.jar ontosim/ontosim.jar getopt/getopt.jar log4j/commons-logging.jar log4j/log4j.jar log4j/slf4j-api.jar jwnl/jwnl.jar lucene/lucene-core.jar jena/jena.jar jena/iri.jar jena/icu4j.jar iddl/iddl.jar xerces/xercesImpl.jar xerces/resolver.jar xerces/xml-apis.jar hermit/HermiT.jar align.jar ontowrap.jar procalign.jar"/> </target> <target name="versionnumber" depends="init" description="Establishes the version number"> @@ -110,17 +115,17 @@ <antcall target="compileall"/> </target> - <!--target name="analyse" depends="jar" description="Perform static analysis of code"> - // Use Checkstyle + <target name="analyse" depends="jar" description="Perform static analysis of code"> + <!-- Checkstyle <taskdef resource="checkstyletask.properties" - classpath="${tooldir}/checkstyle/checkstyle-all-5.0.jar"/> - // I must have a checks.xml - <checkstyle config="docs/sun_checks.xml"> + classpath="${tooldir}/checkstyle/checkstyle-all-5.0.jar"/--> + <!-- // I must have a checks.xml --> + <!--checkstyle config="docs/sun_checks.xml"> <fileset dir="src" includes="**/*.java"/> // let see if we can put a css <formatter type="xml" toFile="test/html/checkstyle.xml"/> - </checkstyle> - // Use FindBugs + </checkstyle--> + <!-- FindBugs <taskdef name="findbugs" classpath="${tooldir}/findbugs/findbugs-ant.jar" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/> <findbugs home="test/html/" output="xml" @@ -128,8 +133,8 @@ //<auxClasspath path="${basedir}/lib/Regex.jar" /> <sourcePath path="src" /> <class location="lib/align.jar" /> - </findbugs> - // Use PMD + </findbugs--> + <!-- Use PMD <taskdef name="pmd" classpath="${tooldir}/pmd/pmd-ant.jar" classname="net.sourceforge.pmd.ant.PMDTask"/> <pmd shortFilenames="true"> <ruleset>rulesets/favorites.xml</ruleset> @@ -138,11 +143,15 @@ <fileset dir="/usr/local/j2sdk1.4.1_01/src/"> <include name="java/lang/*.java"/> </fileset> - </pmd> - </target--> - - <!-- cover: emma seems really difficult - <taskdef resource="emma_ant.properties" classpathref="emma.lib" /--> + </pmd--> + <!-- tattletale: very long --> + <taskdef name="tattletale-report" + classname="org.jboss.tattletale.ant.ReportTask" + classpath="${tooldir}/tattletale/tattletale-ant.jar:${tooldir}/tattletale/tattletale.jar:${tooldir}/tattletale/javassist.jar"/> + <tattletale-report source="lib" destination="tattletale"/> + <!-- Emma (coverage) seems really difficult --> + <!--taskdef resource="emma_ant.properties" classpathref="emma.lib" /--> + </target> <macrodef name="onejar" description="utility macro for JAR packaging"> <attribute name="group" description="Maven group ID" /> @@ -156,7 +165,7 @@ <sequential> <delete file="lib/@{file}.jar"/> <!-- it may even be easier to generate the pom --> - <copy file="distrib/@{file}.pom" toFile="lib/@{file}.pom"> + <copy file="distrib/@{file}.pom" toFile="lib/@{file}.pom" overwrite="true"> <filterset> <filter token="GROUPID" value="@{group}"/> <filter token="ARTID" value="@{file}"/> @@ -466,6 +475,70 @@ </java> </target> + <!-- tested --> + <macrodef name="onepom" description="utility macro for maven exporting"> + <attribute name="file" description="Artifact name" /> + <sequential> + <artifact:install file="lib/@{file}.jar"> + <pom file="lib/@{file}.pom" /> + <localRepository path="mvn-repo" /> + </artifact:install> + </sequential> + </macrodef> + + <!-- tested --> + <target name="mavenize" depends="init" description="Creates a Maven local repositry"> + <echo message="Mavenizing..."/> + <path id="maven-ant-tasks.classpath" path="${tooldir}/maven/maven-ant-tasks-2.1.3.jar" /> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="antlib:org.apache.maven.artifact.ant" + classpathref="maven-ant-tasks.classpath" /> + <delete dir="mvn-repo"/> + <mkdir dir="mvn-repo"/> + <!-- should be far better to iterate on --> + <!--fileset dir="lib" includes="**/*.pom"/--> + <onepom file="getopt/getopt" /> + <onepom file="google-translate/google-api-translate-java" /> + <onepom file="google-translate/json" /> + <onepom file="hermit/hermit" /> + <onepom file="iddl/iddl" /> + <onepom file="jade/jade-http" /> + <onepom file="jade/iiop" /> + <onepom file="jade/jade" /> + <onepom file="jdbc/mysql-connector-java" /> + <onepom file="jdbc/postgresql-jdbc4" /> + <onepom file="jena/arq" /> + <onepom file="jena/icu4j" /> + <onepom file="jena/iri" /> + <onepom file="jena/jena" /> + <onepom file="jetty/jetty-util" /> + <onepom file="jetty/jetty" /> + <onepom file="jwnl/jwnl" /> + <onepom file="log4j/commons-logging" /> + <onepom file="log4j/log4j" /> + <onepom file="log4j/slf4j-api" /> + <onepom file="lucene/lucene-core" /> + <onepom file="ontosim/ontosim" /> + <onepom file="owlapi10/api" /> + <onepom file="owlapi10/impl" /> + <onepom file="owlapi10/io" /> + <onepom file="owlapi10/rdfapi" /> + <onepom file="owlapi10/rdfparser" /> + <onepom file="owlapi30/owlapi-bin" /> + <onepom file="oyster/oyster" /> + <onepom file="servlet/servlet-api" /> + <onepom file="skosapi/skosapi" /> + <onepom file="xerces/resolver" /> + <onepom file="xerces/xercesImpl" /> + <onepom file="xerces/xml-apis" /> + <onepom file="xsdlib/relaxngDatatype" /> + <onepom file="xsdlib/xsdlib" /> + <onepom file="align" /> + <onepom file="ontowrap" /> + <onepom file="procalign" /> + <onepom file="alignsvc" /> + </target> + <!-- tested --> <target name="clean" description="Clean up the whole directory"> <echo message="Cleaning..."/> diff --git a/distrib/align.pom b/distrib/align.pom index d769d4f84e334f85252579b32d4e50fb53e31dd8..a1d4745c31cb4a9030619a18b622ed997f2d6aa5 100644 --- a/distrib/align.pom +++ b/distrib/align.pom @@ -31,7 +31,7 @@ <name>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999</name> <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> </license> - <licence> + <license> <name>CeCILL-C Licence française de logiciel libre</name> <url>http://www.cecill.info/licences/Licence_CeCILL-C_V1-fr.txt</url> </license> diff --git a/distrib/alignsvc.pom b/distrib/alignsvc.pom index 355e10d4287d79ae34d832a79281428cb3f8762a..59900140e4e6008511ec68aa2c4b3ef851a62759 100644 --- a/distrib/alignsvc.pom +++ b/distrib/alignsvc.pom @@ -31,14 +31,14 @@ <name>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999</name> <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> </license> - <licence> + <license> <name>CeCILL-C Licence française de logiciel libre</name> <url>http://www.cecill.info/licences/Licence_CeCILL-C_V1-fr.txt</url> </license> </licenses> <packaging>jar</packaging> - <dependencies> + <!--dependencies> <dependency> <groupId>org.semanticweb.owl</groupId> <artifactId>align</artifactId> @@ -55,7 +55,7 @@ <artifactId>procalign</artifactId> <version>@VERS@</version> </dependency> - <dependencies> + <dependencies--> <developers> <developer> diff --git a/distrib/ontowrap.pom b/distrib/ontowrap.pom index 8aa8b8fb758db8d75051bdacb3591b88b902ead6..b16e3e078fa5524e3a93706c5d6f1740f933bfad 100644 --- a/distrib/ontowrap.pom +++ b/distrib/ontowrap.pom @@ -31,7 +31,7 @@ <name>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999</name> <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> </license> - <licence> + <license> <name>CeCILL-C Licence française de logiciel libre</name> <url>http://www.cecill.info/licences/Licence_CeCILL-C_V1-fr.txt</url> </license> diff --git a/distrib/procalign.pom b/distrib/procalign.pom index 1e85b001e6e417a7caf6aea80e666dc62dbeb174..36c8a2b466e6b936720256a56cb3202984c72d7c 100644 --- a/distrib/procalign.pom +++ b/distrib/procalign.pom @@ -31,14 +31,14 @@ <name>GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999</name> <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> </license> - <licence> + <license> <name>CeCILL-C Licence française de logiciel libre</name> <url>http://www.cecill.info/licences/Licence_CeCILL-C_V1-fr.txt</url> </license> </licenses> <packaging>jar</packaging> - <dependencies> + <!--dependencies> <dependency> <groupId>org.semanticweb.owl</groupId> <artifactId>align</artifactId> @@ -50,7 +50,7 @@ <artifactId>ontowrap</artifactId> <version>@VERS@</version> </dependency> - <dependencies> + <dependencies--> <developers> <developer> diff --git a/html/img/dependencies.png b/html/img/dependencies.png new file mode 100644 index 0000000000000000000000000000000000000000..986df174def68bcbe4b9ec200716c26568197020 Binary files /dev/null and b/html/img/dependencies.png differ diff --git a/html/lib.html b/html/lib.html index 237039140aef40a859737ebc11076bb641253040..2eaf98b34748219541b17f6585f05a6cb71bac51 100644 --- a/html/lib.html +++ b/html/lib.html @@ -12,7 +12,7 @@ <p>The Alignment API uses a number of external libraries. These libraries are shipped (in the lib directory) with the Alignment API. Each subdirectory of the lib directory - contains <a href="http://maven.apache.org/pom.html">Project Object + contains <a href="maven.html#pom">Project Object Models (POM)</a> which provide information about the version, license and dependencies for these libraries. </p> @@ -32,6 +32,8 @@ Here is a picture of the various dependencies involved: <center> <img src="img/depend.png"/> </center> +This is a simplified view: <a href="img/dependencies.png">click here + for the full graph generated by Tattletale</a>. </p> <h2>Required for the API implementation (procalign)</h2> diff --git a/html/maven.html b/html/maven.html new file mode 100644 index 0000000000000000000000000000000000000000..0da858d2931eed50a13e2096c825a374ab956f2c --- /dev/null +++ b/html/maven.html @@ -0,0 +1,122 @@ +<html> +<head> +<title>Alignment API: Maven</title> +<!--style type="text/css">@import url(style.css);</style--> +<link rel="stylesheet" type="text/css" href="base.css" /> +<link rel="stylesheet" type="text/css" href="style.css" /> +</head> +<body bgcolor="#ffffff"> + +<center><h1>Alignment API: To our Maven users</h1></center> + +<p> +The Alignment API is not a native Maven project. +It is built using Ant. +There are reason for that: we think that maven is putting too much +hassle to developpers with respect to delivered benefits. +</p> +<p> +However, we have no reason to not help our Maven users as long as +this is not too difficult. +</p> + +<h2>Generating a local repository</h2> + +<p> +You can generate a local maven repository by simply applying: +<div class="terminal"> +$ ant mavenize +Buildfile: /Java/alignapi/build.xml + +bind: + +init: + +mavenize: + [echo] Mavenizing... + [delete] Deleting directory /Java/alignapi/mvn-repo + [mkdir] Created dir: /Java/alignapi/mvn-repo +[artifact:install] [INFO] Installing /Java/alignapi/lib/align.jar to /Java/alignapi/mvn-repo/org/semanticweb/owl/align/4.4/align-4.4.jar + ... + +BUILD SUCCESSFUL +Total time: 1 second +</div> +This will generate a directory <tt>mvn-repo</tt> which is a local maven repository. +</p> +<p> +It can be used in your project <!--tt>settings.xml</tt> by including: +<div class="rdfxml"> +<localRepository>mvn-repo</localRepository> +</div> +or in you project--> POM, by including: +<div class="rdfxml"> + <repository> + <id>in-project</id> + <name>local maven repository</name> + <url>file://${project.basedir}/mvn-repo</url> + </repository> + +</div> +</p> +<p> +This is obtained by using maven-ant-tasks ant plug-ins, but it could +have been achieved from the command line by using maven directly: +<div class="terminal"> +$ mvn -Dmaven.repo.local=mvn-repo install:install-file -Dfile=lib/align.jar -DpomFile=lib/align.pom -Dpackaging=jar +... +</div> +</p> + +<h2>About POM files</h2><a name="pom"></a> + +<p> +We are using the <a href="http://maven.apache.org/pom.html">POM format</a>, not exactly as Maven but as a practical +way to record information about shipped libraries. We ship +<a href="lib.html">external libraries</a> because we want users to be +ready to work right away. +</p> +<p> +Included libraries and associated POM files are maintained by hand. +They do not contain dependency information because we think that the +way Maven maintains dependency information both in the POM file, in +the directory structure and in the JAR name is too much. Moreover, we +think that maintaining this information at the exact version level +defeats the purpose of modular software. +</p> +<p> +The Alignment API POM files themselves are generated on the fly from +ant from the templates found in the <tt>distrib</tt> repository. +</p> + +<h2>We need your help</h2> + +<p> +Any constructive feedback for improving the process, improving the +content of our POM files (especially if it is for allowing you to do +better things) is welcome. +</p> +<p> +If you know of a good way to replace some component of our local +repository by officially well maintained versions of global repository +we want to hear you. If you know how to generate better Alignment API +POM files, we want to hear you. +</p> +<p> +The best for us is if you can just do it (particularly in ant or +shell, but even maven command lines should be OK) and send us the procedure. +</p> +<p> +If you want to publish the Alignment API in a repository, then you are +welcome, but in the current state of Maven and its repositories, do +not count on us to maintain it. +</p> + +<small> +<hr /> +<center>http://alignapi.gforge.inria.fr/maven.html</center> +<hr /> +$Id$ +</small> +</body> +</html> diff --git a/html/relnotes.html b/html/relnotes.html index 89bbeacdb837f0d3fa77504a9f2d3b3aab66aab2..73121f12d9ba40f13104cc09e474e619e2c78ab1 100644 --- a/html/relnotes.html +++ b/html/relnotes.html @@ -38,14 +38,19 @@ The development of 4 versions continues. <p><ul compact="1"> -<li>Make URIs dependent on a urlprefix (server [4.5])</li> -<li>Provide several URIs for the same alignment (server [4.5])</li> - +<li>Adding <tt>ontowrap</tt> support in database store (server)</li> +<li>Adding Silk renderer (impl)</li> +<li>Modifying evaluators needing <tt>ObjectAlignment</tt> to convert them (impl)</li> +<li>All evaluators work in server (server)</li> +<li>Make URIs dependent on a urlprefix (server [4.6])</li> +<li>Provide several URIs for the same alignment (server [4.6])</li> +<li>Adopt, overall, slf4j (impl/server [4.6])</li> <li>Implement database store for EDOAL (server [4.6])</li> <li>Add simple "harder" test generator (gen [4.6])</li> <li>Add simple "hidden" test generator (gen [4.6])</li> <li>Add a <tt>dependsOn</tt> alignment property (api [4.6])</li> <li>Consolidate alignment based on <tt>dependsOn</tt> (loop checking, cell ingestion) (impl [4.6])</li> +<li>Use the OWLReasoner interface and HermiT for adding inference to Ontowrap (ontowrap [4.6])</li> <li>Add a JSON interface (server)</li> <li>Integrate tests from generator (test)</li> @@ -77,16 +82,16 @@ with a warning: <!--h2>Version 4.8 (1xxx): ??/??/201x - Al pesto</h2--> <!--h2>Version 4.7 (1xxx): ??/??/201x - Letraset</h2--> <!--h2>Version 4.6 (1xxx): ??/??/201X - Da lec'h all</h2--> -<!--h2>Version 4.5 (18xx): ??/??/2013 - Building 16</h2--> +<!--h2>Version 4.5 (18xx): ??/03/2013 - Building 16</h2--> <p><ul compact="1"> -<li>Upgraded to <span style="color: green">OWL API</span> to 3.4.2 (lib)</li> <li>Upgraded to <span style="color: green">IDDL</span> to 1.4 (lib)</li> +<li>Upgraded to <span style="color: green">OWL API</span> to 3.4.2 (lib)</li> <li>Replaced Pellet by <span style="color: green">HermiT</span> as default reasonner (lib)</li> -<li>Added <tt>ontowrap</tt> support in database store (server)</li> <li>Added several EDOAL-SPARQL renderers (impl)</li> <li>Added alignment selection per ontologies in list alignment interface (server)</li> <li>Added relation sensitiveness to evaluators (impl)</li> <li>Implemented transactions in database store (server)</li> +<li>Added generation of local <a href="maven.html">maven repository</a> in build.xml</li> <li>Bug in weighted (can be more than 1.) (impl)</li> <li>Fixed strong bug in the implementation of relaxed precision and recall (impl)</li> <li>Fixed a (non manifested) bug in cache management (server)</li> @@ -94,9 +99,10 @@ with a warning: <li>Fixed a bug with subsumption statements in <tt>OWLAxiomsRendererVisitor</tt> (impl)</li> <li>Simplified and rewritten <tt>SemPRecEvaluator</tt> (impl)</li> <li>Fixed all issues but IDDL in tutorial4 (impl)</li> +<li>Suppressed inclusion of slf4j-log4j (impl)</li> </ul></p> -<h2>Version 4.4 (1754): 17/07/2012 - Casa Cirilo</h2> +<a name="4.4"></a><h2>Version 4.4 (1754): 17/07/2012 - Casa Cirilo</h2> <p><ul compact="1"> <li><span style="color: red;">Deprecated</span> <tt>BasicParameters</tt>, @@ -121,7 +127,7 @@ with a warning: <li>Added minimal pom.xml for generated jar files (lib)</li> </ul></p> -<h2>Version 4.3 (1690): 22/02/2012 - Zimt</h2> +<a name="4.3"></a><h2>Version 4.3 (1690): 22/02/2012 - Zimt</h2> <p><span style="color: red;">BEWARE:</span> All command-line utilities are now found in the <span style="color: red;">cli</span> package @@ -156,7 +162,7 @@ with a warning: <li>Used more systematically <tt>finally</tt></li> </ul></p> -<h2>Version 4.2 (1618): 31/05/2011 - Tring</h2> +<a name="4.2"></a><h2>Version 4.2 (1618): 31/05/2011 - Tring</h2> <p><ul compact="1"> <li>Added minimal API implementation for embedded devices (android)</li> @@ -180,7 +186,7 @@ with a warning: <li>Suppressed <tt>PreAlignment</tt> (impl)</li> </ul></p> -<h2>Version 4.1 (1534): 13/10/2010 - Napjakmandu</h2> +<a name="4.1"></a><h2>Version 4.1 (1534): 13/10/2010 - Napjakmandu</h2> <p><ul compact="1"> <li>Integration of skoslite (home made SKOS API) (ontowrap)</li> @@ -212,7 +218,7 @@ with a warning: <li>Improved RDF Rendering layout (impl)</li> </ul></p> -<h2>Version 4.0 (1415): 31/03/2010 - Rouquine carmélite</h2> +<a name="4.0"></a><h2>Version 4.0 (1415): 31/03/2010 - Rouquine carmélite</h2> <p>The Alignment API is now compiled in Java 1.6 (older versions should still be able to run it). All <a href="lib.html">imported libraries</a> have been upgraded to their current versions. Only the upgrade from <span style="color: green">Jena 2.5 to 2.6</span> required a minor change (due to parameterised declarations: the API still works with 2.5 but needs 2.6 to compile). </p> @@ -278,7 +284,7 @@ with a warning: </ul> </p> -<h2>Version 3.6 (988): 27/05/2009 - Sabai sabai</h2> +<a name="3.6"></a><h2>Version 3.6 (988): 27/05/2009 - Sabai sabai</h2> <p><span style="color: red;">BEWARE:</span> Java WordNet Library (JWNL) has been upgraded to version 1.4.1rc2 (from 1.3rc3). This is included in the lib directory. @@ -314,7 +320,7 @@ If you want to stay with WordNet-2.0, you need to replace the jwnl.jar </ul> </p> -<h2>Version 3.5 (886): 21/10/2008 - La granja</h2> +<a name="3.5"></a><h2>Version 3.5 (886): 21/10/2008 - La granja</h2> <p> <ul compact="1"> @@ -340,7 +346,7 @@ If you want to stay with WordNet-2.0, you need to replace the jwnl.jar </ul> </p> -<h2>Version 3.4 (815): 31/08/2008 - Barbare</h2> +<a name="3.4"></a><h2>Version 3.4 (815): 31/08/2008 - Barbare</h2> <p> <ul compact="1"> @@ -378,7 +384,7 @@ If you want to stay with WordNet-2.0, you need to replace the jwnl.jar </ul> </p> -<h2>Version 3.3 (710): 24/04/2008 - O sole mio</h2> +<a name="3.3"></a><h2>Version 3.3 (710): 24/04/2008 - O sole mio</h2> <p><ul compact="1"> <li>Suppressed language dependent (OWLAPI) alignments (impl)</li> @@ -400,7 +406,7 @@ If you want to stay with WordNet-2.0, you need to replace the jwnl.jar <li>Corrected link to documentation (doc)</li> </ul></p> -<h2>Version 3.2 (666): 29/02/2008 - Blejsko jezero</h2> +<a name="3.2"></a><h2>Version 3.2 (666): 29/02/2008 - Blejsko jezero</h2> <p> <ul compact="1"> <li>Connection to Oyster directory (server)</li> @@ -425,7 +431,7 @@ If you want to stay with WordNet-2.0, you need to replace the jwnl.jar </ul> </p> -<h2>Version 3.1 (614): 05/02/2008 - Klippekort</h2> +<a name="3.1"></a><h2>Version 3.1 (614): 05/02/2008 - Klippekort</h2> <p><span style="color: red;">BEWARE:</span> For better conforming with RDF practice, we have @@ -480,7 +486,7 @@ Other improvements include: <li>Added a server-based tutorial (tutorial)</li> </ul></p> -<h2>Version 3.0 (436): 25/02/2007 - Hyderabad</h2> +<a name="3.0"></a><h2>Version 3.0 (436): 25/02/2007 - Hyderabad</h2> <p><span style="color: red;">BEWARE:</span> The main modification in this version is more independence from the @@ -527,7 +533,7 @@ The main modification in this version is more independence from the judged based on URI and not OWLAPI entities anymore.</li> </ul></p> -<h2>Version 2.5 (375): 30/12/2006 - Thalia</h2> +<a name="2.5"></a><h2>Version 2.5 (375): 30/12/2006 - Thalia</h2> <p><ul compact="1"> <li>Added Alignment server</li> @@ -540,7 +546,7 @@ The main modification in this version is more independence from the <li>Improved Weighted harmonic means computation in GroupEval</li> </ul></p> -<h2>Version 2.4 (302): 10/07/2006 - Cercedilla noches</h2> +<a name="2.4"></a><h2>Version 2.4 (302): 10/07/2006 - Cercedilla noches</h2> <p><ul compact="1"> <li>Added a <a href="tutorial">tutorial</a> in the html pages.</li> @@ -554,7 +560,7 @@ The main modification in this version is more independence from the <li>Suppressed a printout in MatrixMeasure</li> </ul></p> -<h2>Version 2.3 (271): 15/06/2006 - OAEI-2006 ready</h2> +<a name="2.3"></a><h2>Version 2.3 (271): 15/06/2006 - OAEI-2006 ready</h2> <p> <ul compact="1"> @@ -564,7 +570,7 @@ The main modification in this version is more independence from the <li><tt>GroupAlign</tt> default matcher becomes <tt>StringDistAlignment</tt>.</li> </ul></p> -<h2>Version 2.2 (263): 05/06/2006 - Onyeari's version a.k.a. may GForge be with you</h2> +<a name="2.2"></a><h2>Version 2.2 (263): 05/06/2006 - Onyeari's version a.k.a. may GForge be with you</h2> <p>Upgraded to <span style="color: green">OWL-API 06-04-12 (1.4.3)</span><br /> <span style="color: red;"></span> No problem encountered. @@ -589,7 +595,7 @@ The main modification in this version is more independence from the <li>GenPlot generates directly gnuplot output and LaTeX/PGF inclusion.</li> </ul></p> -<h2>Version 2.1: 17/02/2006 - pre GForge</h2> +<a name="2.1"></a><h2>Version 2.1: 17/02/2006 - pre GForge</h2> <p>New version featuring: <ul compact="1"> @@ -606,7 +612,7 @@ The main modification in this version is more independence from the <li>Corrected mistakes in align.owl and align.rdfs (thanks to Antoine Isaac);</li> </ul> -<h2>Version 2: 1/10/2005 - Raphael's version a.k.a. AC385 version</h2> +<a name="2.0"></a><h2>Version 2: 1/10/2005 - Raphael's version a.k.a. AC385 version</h2> <p><span style="color: red;">BEWARE:</span> <tt>Alignment</tt> methods <tt>getAlignCell1</tt>, <tt>getAlignCell2</tt>, <tt>getAlignedObject1</tt>, <tt>getAlignedObject2</tt>, <tt>getStrength1</tt>, <tt>getStrength2</tt>, <tt>getRelation1</tt> and <tt>getRelation2</tt> deprecated (implementation is still @@ -627,7 +633,7 @@ The main modification in this version is more independence from the <li>Added extension mechnism for alignments (any extra-annotation stored).</li> </ul> -<h2>Version 1.4: 04/07/2005 - OAEI 2005 facilities</h2> +<a name="1.4"></a><h2>Version 1.4: 04/07/2005 - OAEI 2005 facilities</h2> <p>New version featuring: <ul compact="1"> @@ -636,7 +642,7 @@ The main modification in this version is more independence from the <li>Added freeing of ontology from memory between tests in GroupAlign</li> </ul></p> -<h2>Version 1.3: 15/06/2005 - Ready for OAEI 2005</h2> +<a name="1.3"></a><h2>Version 1.3: 15/06/2005 - Ready for OAEI 2005</h2> <p>Upgraded to <span style="color: green">OWL-API 05-03-21 (1.4.2)</span><br /> <span style="color: red;">BEWARE:</span> if you experience problems @@ -646,7 +652,7 @@ because it requires and additional method: <tt>OWLRDFErrorHandler</tt> (see Procalign.java for the fix). </p> -<p>Compatible with Java 1.5</p> +<p>Compatible with <span style="color: green">Java 1.5</span></p> <p>New version featuring: <ul compact="1"> @@ -666,7 +672,7 @@ because it requires and additional method: <li>Started reengineering matrix-based distance alignments</li> </ul> -<h2>Version 1.2: 23/11/2004 - ISWC suggestions and improvements</h2> +<a name="1.2"></a><h2>Version 1.2: 23/11/2004 - ISWC suggestions and improvements</h2> <p>New version featuring: <ul compact="1"> @@ -677,7 +683,7 @@ because it requires and additional method: <li>Fully implemented the parser and the printer so that onto tags contains file info and uri tags contain URI info.</li> </ul></p> -<h2>Version 1.1: 5/11/2004 - Lessons from EON</h2> +<a name="1.1"></a><h2>Version 1.1: 5/11/2004 - Lessons from EON</h2> <p>New version featuring: <ul compact="1"> @@ -692,7 +698,7 @@ because it requires and additional method: <li>Provided an XSLT stylesheet for alignments;</li> </ul></p> -<h2>April 19th, 2004</h2> +<a name="1.01"></a><h2>April 19th, 2004</h2> <p>New version featuring: <ul compact="1"> @@ -719,9 +725,9 @@ because it requires and additional method: <li>Changed name: Evaluator.evaluate() --> Evaluator.eval();</li> </ul> -<h2>Version 1.0: 4/4/2004 - First complete version</h2> +<a name="1.0"></a><h2>Version 1.0: 4/4/2004 - First complete version</h2> -<p>This uses the 090304 (1.2.0) version of the OWL API.</p> +<p>This uses the 090304 (1.2.0) version of the <span style="color: green">OWL API</span>.</p> <p>New version featuring: <ul compact="1"> @@ -735,7 +741,7 @@ because it requires and additional method: </ul> </p> -<h2>January 2004</h2> +<a name="0.2"></a><h2>January 2004</h2> <p>Put under CVS at Sophia-Antipolis</p> <p>New version featuring: @@ -744,7 +750,7 @@ because it requires and additional method: </ul> </p> -<h2>Version 0.1: 12/12/2003 - First release</h2> +<a name="0.1"></a><h2>Version 0.1: 12/12/2003 - First release</h2> <address> <small> diff --git a/lib/google-translate/json-20090211.jar b/lib/google-translate/json.jar similarity index 100% rename from lib/google-translate/json-20090211.jar rename to lib/google-translate/json.jar diff --git a/lib/jade/jade-iiop.pom b/lib/jade/iiop.pom similarity index 100% rename from lib/jade/jade-iiop.pom rename to lib/jade/iiop.pom diff --git a/lib/jade/http.jar b/lib/jade/jade-http.jar similarity index 100% rename from lib/jade/http.jar rename to lib/jade/jade-http.jar diff --git a/lib/jade/jade.pom b/lib/jade/jade.pom index d02d9bbb1d85ac37d686ba3685f502689153a96c..80f98994bb7efdb68eabf6694080fa3f136d3772 100644 --- a/lib/jade/jade.pom +++ b/lib/jade/jade.pom @@ -3,7 +3,7 @@ <groupId>jade</groupId> <artifactId>jade</artifactId> - <version>3.3</version> <!-- or is it 3.7 ?--> + <version>3.3</version> <name>Java Agent Development Environment (JADE)</name> <description></description> <licenses> @@ -24,6 +24,6 @@ <artifactId></artifactId> <version></version> </dependency> - </dependencies> + </dependencies--> </project> diff --git a/lib/log4j/commons-logging.pom b/lib/log4j/commons-logging.pom index 2db2b67dd1f028b7528548fa7767df3f9ba86b5e..fd82951391d4e121724de00e0129d78aa4906ee9 100644 --- a/lib/log4j/commons-logging.pom +++ b/lib/log4j/commons-logging.pom @@ -29,505 +29,4 @@ </site> </distributionManagement> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <!-- - - Note that due to the special requirements of logging unit-tests, most - - tests are executed in the "integration-test" phase rather than the - - "test" phase. Please run "mvn integration-test" to run the full suite of - - available unit tests. - --> - <issueManagement> - <system>JIRA</system> - <url>http://issues.apache.org/jira/browse/LOGGING</url> - </issueManagement> - - <inceptionYear>2001</inceptionYear> - - <developers> - <developer> - <id>morgand</id> - <name>Morgan Delagrange</name> - <email>morgand at apache dot org</email> - <organization>Apache</organization> - <roles> - <role>Java Developer</role> - </roles> - </developer> - <developer> - <id>rwaldhoff</id> - <name>Rodney Waldhoff</name> - <email>rwaldhoff at apache org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>craigmcc</id> - <name>Craig McClanahan</name> - <email>craigmcc at apache org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>sanders</id> - <name>Scott Sanders</name> - <email>sanders at apache dot org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>rdonkin</id> - <name>Robert Burrell Donkin</name> - <email>rdonkin at apache dot org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>donaldp</id> - <name>Peter Donald</name> - <email>donaldp at apache dot org</email> - </developer> - <developer> - <id>costin</id> - <name>Costin Manolache</name> - <email>costin at apache dot org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>rsitze</id> - <name>Richard Sitze</name> - <email>rsitze at apache dot org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>baliuka</id> - <name>Juozas Baliuka</name> - <email>baliuka@apache.org</email> - <roles> - <role>Java Developer</role> - </roles> - </developer> - <developer> - <id>skitching</id> - <name>Simon Kitching</name> - <email>skitching@apache.org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>dennisl</id> - <name>Dennis Lundberg</name> - <email>dennisl@apache.org</email> - <organization>Apache Software Foundation</organization> - </developer> - <developer> - <id>bstansberry</id> - <name>Brian Stansberry</name> - </developer> - </developers> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1</developerConnection> - <url>http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1</url> - </scm> - - <build> - <sourceDirectory>src/java</sourceDirectory> - <testSourceDirectory>src/test</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test</directory> - <filtering>false</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </testResource> - </testResources> - - <plugins> - - <!-- - - The custom test framework requires the unit test code to be - - in a jarfile so it can control its place in the classpath. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>src/conf/MANIFEST.MF</manifestFile> - <!-- - - Copied from commons-parent-5, because X-Compile-Target-JDK is - - wrong there. Can be removed when we update to commons-parent-6. - --> - <manifestEntries> - <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK> - </manifestEntries> - </archive> - </configuration> - <executions> - <execution> - <id>testjar</id> - <phase>package</phase> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <jarName>commons-logging</jarName> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <!-- - - We want to create four jarfiles from this project: normal, tests, api - - and adapters. The first two are handled by the normal jar:jar target. - - Alas, the standard jar plugin doesn't have includes/excludes support - - in version 2.0, so antrun is used to create the other ones. - --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <id>apijar</id> - <phase>package</phase> - <configuration> - <tasks> - <property name="workdir" value="${project.build.directory}/rejar" /> - <property name="target" value="${project.artifactId}-api-${project.version}" /> - - <delete dir="${workdir}" failonerror="false" /> - <mkdir dir="${workdir}" /> - - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${workdir}" /> - <jar basedir="${workdir}" destfile="${project.build.directory}/${target}.jar" manifest="${basedir}/src/conf/MANIFEST.MF"> - <exclude name="org/apache/commons/logging/impl/Log4J*" /> - <exclude name="org/apache/commons/logging/impl/Avalon*" /> - <exclude name="org/apache/commons/logging/impl/Jdk13*" /> - <exclude name="org/apache/commons/logging/impl/LogKit*" /> - <exclude name="org/apache/commons/logging/impl/Servlet*" /> - <manifest> - <attribute name="Built-By" value="${user.name}" /> - <attribute name="X-Compile-Source-JDK" value="${maven.compile.source}" /> - <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}" /> - </manifest> - </jar> - </tasks> - - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>adaptersjar</id> - <phase>package</phase> - <configuration> - <tasks> - <property name="workdir" value="${project.build.directory}/rejar" /> - <property name="target" value="${project.artifactId}-adapters-${project.version}" /> - - <delete dir="${workdir}" failonerror="false" /> - <mkdir dir="${workdir}" /> - - <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${workdir}" /> - <jar basedir="${workdir}" destfile="${project.build.directory}/${target}.jar" manifest="${basedir}/src/conf/MANIFEST.MF"> - <exclude name="org/apache/commons/logging/*" /> - <exclude name="org/apache/commons/logging/impl/WeakHashtable*" /> - <exclude name="org/apache/commons/logging/impl/LogFactoryImpl*" /> - <manifest> - <attribute name="Built-By" value="${user.name}" /> - <attribute name="X-Compile-Source-JDK" value="${maven.compile.source}" /> - <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}" /> - </manifest> - </jar> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>site.resources</id> - <phase>site</phase> - <configuration> - <tasks> - <copy todir="${project.reporting.outputDirectory}"> - <fileset dir="${basedir}"> - <include name="RELEASE-NOTES.txt" /> - </fileset> - <!-- - - The logo should be moved to - - ${basedir}/src/site/resources/images - - once we can drop support for the Maven 1 site. - - When that is done this section can be removed. - --> - <fileset dir="${basedir}/xdocs"> - <include name="images/logo.png" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <!-- - - Attach the adapters and api jars to the normal artifact. This way - - they will be deployed when the normal artifact is deployed. - --> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar</file> - <type>jar</type> - <classifier>adapters</classifier> - </artifact> - <artifact> - <file>${project.build.directory}/${project.artifactId}-api-${project.version}.jar</file> - <type>jar</type> - <classifier>api</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-6</version> - <configuration> - <!-- - - The site needs to be built prior to deploy, - - because it is included in the assembly. - --> - <goals>site deploy</goals> - <!-- Pass these arguments to the deploy plugin. --> - <arguments>-Prelease</arguments> - </configuration> - </plugin> - - <plugin> - <!-- - - Many of JCL's tests use tricky techniques to place the generated - - JCL jarfiles on the classpath in various configurations. This means - - that the tests must be run *after* the "package" build phase. The - - normal test phase is therefore disabled here, and the test plugin - - rebound to the "integration-test" phase instead. - --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/AvalonLoggerTestCase.java</include> - </includes> - </configuration> - - <executions> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>**/*TestCase.java</include> - </includes> - <systemProperties> - <!-- - <property> - <name>org.apache.commons.logging.diagnostics.dest</name> - <value>STDOUT</value> - </property> - --> - <property> - <name>commons-logging</name> - <value>target/${project.build.finalName}.jar</value> - </property> - <property> - <name>commons-logging-api</name> - <value>target/${project.artifactId}-api-${project.version}.jar</value> - </property> - <property> - <name>commons-logging-adapters</name> - <value>target/${project.artifactId}-adapters-${project.version}.jar</value> - </property> - <property> - <name>testclasses</name> - <value>target/commons-logging-tests.jar</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-1</version> - <configuration> - <!-- Do not deploy the assemblies to the repository. --> - <attach>false</attach> - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - <descriptor>src/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5</version> - </plugin> - - </plugins> - </build> - - <profiles> - <!-- This profile can be removed when we update to commons-parent-5 --> - <profile> - <id>ci</id> - <distributionManagement> - <repository> - <id>apache.snapshots</id> - <name>Apache Development Snapshot Repository</name> - <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url> - </repository> - <snapshotRepository> - <id>apache.snapshots</id> - <name>Apache Development Snapshot Repository</name> - <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url> - </snapshotRepository> - </distributionManagement> - </profile> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <!-- Create the assemblies automatically during release. --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.3</version> - <configuration> - <!-- Pick up this configuration from settings.xml. --> - <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - <version>1.0.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - <version>4.1.3</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.3</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - </dependencies> - - <reporting> - <plugins> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>checkstyle.xml</configLocation> - </configuration> - </plugin> - --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <version>2.1.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0-beta-1</version> - </plugin> - </plugins> - </reporting> - - <properties> - <maven.compile.source>1.2</maven.compile.source> - <maven.compile.target>1.1</maven.compile.target> - </properties> </project> diff --git a/lib/oyster/oyster2.jar b/lib/oyster/oyster.jar similarity index 100% rename from lib/oyster/oyster2.jar rename to lib/oyster/oyster.jar diff --git a/tools/maven/maven-ant-tasks-2.1.3.jar b/tools/maven/maven-ant-tasks-2.1.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..bec446fff5f05d21bee64a25d037c46604d510e0 Binary files /dev/null and b/tools/maven/maven-ant-tasks-2.1.3.jar differ