diff --git a/build.xml b/build.xml
index bb5f3f4529e0cdf21abea30388f4973474dd7588..8e0120c5161fa8f1966f0ae0162c934d00ea2fab 100644
--- a/build.xml
+++ b/build.xml
@@ -144,124 +144,116 @@
<!-- cover: emma seems really difficult
<taskdef resource="emma_ant.properties" classpathref="emma.lib" /-->
- <!-- tested: should be modularised -->
+ <!-- tested -->
<target name="jar" depends="compile" description="Create jar archives">
<echo message="Jarchiving..."/>
<copy file="distrib/LICENSE.TXT" tofile="classes/LICENSE.TXT" filtering="true"/>
- <delete file="lib/align.jar"/>
- <jar jarfile="lib/align.jar">
- <manifest>
- <attribute name="Built-Date" value="${date}"/>
- <attribute name="Specification-Title" value="Alignment API"/>
- <attribute name="Specification-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Name" value="Alignment API"/>
- <attribute name="Bundle-SymbolicName" value="alignapi"/>
- <attribute name="Bundle-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Copyright" value="INRIA, ${copyyear}"/>
- <attribute name="Bundle-Date" value="${date}"/>
- <attribute name="Bundle-License" value="GNU Lesser General Public License 2.1 or above"/>
- <attribute name="Export-package" value="org.semanticweb.owl.align"/>
- </manifest>
- <fileset dir="classes" includes="org/semanticweb/owl/align/*.class"/>
- <fileset dir="classes" includes="LICENSE.TXT"/>
- </jar>
- <copy file="distrib/align.pom" toFile="lib/align.pom">
+
+ <!-- align.jar -->
+ <fileset id="alignset" dir="classes">
+ <include name="org/semanticweb/owl/align/*.class"/>
+ </fileset>
+ <antcall target="onejar">
+ <param name="group" value="org.semanticweb.owl" />
+ <param name="file" value="align" />
+ <param name="desc" value="Alignment API" />
+ <param name="main" value="" />
+ <param name="pack" value="org.semanticweb.owl.align" />
+ <param name="impt" value="" />
+ <param name="path" value="" />
+ <reference refid="alignset" torefid="content" />
+ </antcall>
+
+ <!-- ontowrap.jar -->
+ <copy file="src/fr/inrialpes/exmo/ontowrap/skoslite/skos.rdf" tofile="classes/fr/inrialpes/exmo/ontowrap/skoslite/skos.rdf" />
+ <fileset id="wrapset" dir="classes">
+ <include name="fr/inrialpes/exmo/ontowrap/**/*.class" />
+ <include name="fr/inrialpes/exmo/ontowrap/**/*.rdf"/>
+ </fileset>
+ <antcall target="onejar">
+ <param name="group" value="fr.inrialpes.exmo" />
+ <param name="file" value="ontowrap" />
+ <param name="desc" value="Ontology wrapper" />
+ <param name="impt" value="" />
+ <param name="pack" value="fr.inrialpes.exmo.ontowrap,fr.inrialpes.exmo.ontowrap.jena25,fr.inrialpes.exmo.ontowrap.owlapi10,fr.inrialpes.exmo.ontowrap.owlapi30,fr.inrialpes.exmo.ontowrap.util" />
+ <param name="impt" value="" />
+ <param name="path" value="" />
+ <reference refid="wrapset" torefid="content" />
+ </antcall>
+
+ <!-- procalign.jar -->
+ <fileset id="procset" dir="classes">
+ <include name="fr/inrialpes/exmo/align/impl/**/*.class"/>
+ <include name="fr/inrialpes/exmo/align/parser/**/*.class"/>
+ <include name="fr/inrialpes/exmo/align/util/**/*.class"/>
+ <include name="fr/inrialpes/exmo/align/cli/**/*.class"/>
+ <include name="fr/inrialpes/exmo/align/gen/**/*.class"/>
+ <include name="fr/inrialpes/exmo/align/ling/**/*.class"/>
+ </fileset>
+ <antcall target="onejar">
+ <param name="group" value="fr.inrialpes.exmo.align" />
+ <param name="file" value="procalign" />
+ <param name="desc" value="Alignment API implementation" />
+ <param name="main" value="fr.inrialpes.exmo.align.cli.Procalign" />
+ <param name="pack" value="fr.inrialpes.exmo.align.impl,fr.inrialpes.exmo.align.impl.edoal,fr.inrialpes.exmo.align.impl.eval,fr.inrialpes.exmo.align.impl.method,fr.inrialpes.exmo.align.impl.rel,fr.inrialpes.exmo.align.impl.renderer,fr.inrialpes.exmo.align.ling,fr.inrialpes.exmo.align.parser,fr.inrialpes.exmo.align.util,fr.inrialpes.exmo.align.cli,fr.inrialpes.exmo.align.gen" />
+ <param name="impt" value="fr.inrialpes.exmo.ontowrap,fr.inrialpes.exmo.ontowrap.jena25,fr.inrialpes.exmo.ontowrap.owlapi10,fr.inrialpes.exmo.ontowrap.owlapi30,fr.inrialpes.exmo.ontowrap.util,org.semanticweb.owl.align" />
+ <param name="path" value="${jarclasspath}"/>
+ <reference refid="procset" torefid="content" />
+ </antcall>
+
+ <!-- alignsvc.jar -->
+ <fileset id="servset" dir="classes">
+ <include name="fr/inrialpes/exmo/align/service/**/*.class"/>
+ <include name="fr/inrialpes/exmo/align/service/**/*.wsdl"/>
+ <include name="fr/inrialpes/exmo/queryprocessor/**/*.class"/>
+ </fileset>
+ <copy file="src/fr/inrialpes/exmo/align/service/aserv.wsdl" tofile="classes/fr/inrialpes/exmo/align/service/aserv.wsdl" filtering="false"/>
+ <antcall target="onejar">
+ <param name="group" value="fr.inrialpes.exmo.align" />
+ <param name="file" value="alignsvc" />
+ <param name="desc" value="Alignment server" />
+ <param name="main" value="fr.inrialpes.exmo.align.service.AlignmentService" />
+ <param name="pack" value="fr.inrialpes.exmo.align.queryprocessor,fr.inrialpes.exmo.align.service,fr.inrialpes.exmo.align.service.jade,fr.inrialpes.exmo.align.service.jade.messageontology" />
+ <param name="path" value="procalign.jar jade/jade.jar jade/iiop.jar jade/http.jar jdbc/mysql-connector-java.jar jdbc/postgresql-jdbc4.jar servlet/servlet-api.jar jetty/jetty.jar jetty/jetty-util.jar xerces/xercesImpl.jar" />
+ <reference refid="servset" torefid="content" />
+ </antcall>
+ </target>
+
+ <target name="onejar" description="Create jar archives">
+ <echo message="Jarchiving..."/>
+ <delete file="lib/${file}.jar"/>
+ <!-- it may even be easier to generate the pom -->
+ <copy file="distrib/${file}.pom" toFile="lib/${file}.pom">
<filterset>
+ <filter token="GROUPID" value="${group}"/>
+ <filter token="ARTID" value="${file}"/>
<filter token="VERS" value="${version}"/>
<filter token="DATE" value="${date}"/>
<filter token="REV" value="${svn.rev}"/>
<filter token="COPYYEAR" value="${copyyear}"/>
</filterset>
</copy>
- <delete file="lib/ontowrap.jar"/>
- <jar jarfile="lib/ontowrap.jar">
+ <jar jarfile="lib/${file}.jar">
<manifest>
<attribute name="Built-Date" value="${date}"/>
- <attribute name="Specification-Title" value="Ontology wrapper"/>
+ <attribute name="Main-Class" value="${main}"/>
+ <attribute name="Class-Path" value="${path}"/>
+ <attribute name="Specification-Title" value="${desc}"/>
<attribute name="Specification-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Name" value="OntoWrap"/>
- <attribute name="Bundle-SymbolicName" value="ontowrap"/>
- <attribute name="Bundle-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Copyright" value="INRIA, ${copyyear}"/>
- <attribute name="Bundle-Date" value="${date}"/>
- <attribute name="Bundle-License" value="GNU Lesser Public License 2.1 or above"/>
- <attribute name="Export-package" value="fr.inrialpes.exmo.ontowrap,fr.inrialpes.exmo.ontowrap.jena25,fr.inrialpes.exmo.ontowrap.owlapi10,fr.inrialpes.exmo.ontowrap.owlapi30,fr.inrialpes.exmo.ontowrap.util"/>
- </manifest>
- <fileset dir="classes" includes="fr/inrialpes/exmo/ontowrap/**/*.class"/>
- <fileset dir="classes" includes="LICENSE.TXT"/>
- <fileset dir="src" includes="fr/inrialpes/exmo/ontowrap/**/*.rdf"/>
- </jar>
- <copy file="distrib/ontowrap.pom" toFile="lib/ontowrap.pom">
- <filterset>
- <filter token="VERS" value="${version}"/>
- <filter token="DATE" value="${date}"/>
- <filter token="REV" value="${svn.rev}"/>
- <filter token="COPYYEAR" value="${copyyear}"/>
- </filterset>
- </copy>
- <delete file="lib/procalign.jar"/>
- <jar jarfile="lib/procalign.jar">
- <manifest>
- <attribute name="Built-Date" value="${date}"/>
- <attribute name="Main-Class" value="fr.inrialpes.exmo.align.cli.Procalign"/>
- <attribute name="Class-Path" value="${jarclasspath}"/>
- <attribute name="Implementation-Title" value="Alignment API implementation"/>
- <attribute name="Implementation-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Name" value="Alignment API implementation"/>
- <attribute name="Bundle-SymbolicName" value="procalign"/>
+ <attribute name="Bundle-Name" value="${desc}"/>
+ <attribute name="Bundle-SymbolicName" value="${file}"/>
<attribute name="Bundle-Version" value="${version} (${svn.rev})"/>
<attribute name="Bundle-Copyright" value="INRIA, ${copyyear}"/>
<attribute name="Bundle-Date" value="${date}"/>
<attribute name="Bundle-License" value="GNU Lesser General Public License 2.1 or above"/>
- <attribute name="Export-package" value="fr.inrialpes.exmo.align.impl,fr.inrialpes.exmo.align.impl.edoal,fr.inrialpes.exmo.align.impl.eval,fr.inrialpes.exmo.align.impl.method,fr.inrialpes.exmo.align.impl.rel,fr.inrialpes.exmo.align.impl.renderer,fr.inrialpes.exmo.align.ling,fr.inrialpes.exmo.align.parser,fr.inrialpes.exmo.align.util,fr.inrialpes.exmo.align.cli,fr.inrialpes.exmo.align.gen"/>
- <attribute name="Import-package" value="fr.inrialpes.exmo.ontowrap,fr.inrialpes.exmo.ontowrap.jena25,fr.inrialpes.exmo.ontowrap.owlapi10,fr.inrialpes.exmo.ontowrap.owlapi30,fr.inrialpes.exmo.ontowrap.util,org.semanticweb.owl.align"/>
- </manifest>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/impl/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/parser/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/util/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/cli/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/gen/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/ling/**/*.class"/>
- <fileset dir="classes" includes="LICENSE.TXT"/>
- </jar>
- <copy file="distrib/procalign.pom" toFile="lib/procalign.pom">
- <filterset>
- <filter token="VERS" value="${version}"/>
- <filter token="DATE" value="${date}"/>
- <filter token="REV" value="${svn.rev}"/>
- <filter token="COPYYEAR" value="${copyyear}"/>
- </filterset>
- </copy>
- <delete file="lib/alignsvc.jar"/>
- <copy file="src/fr/inrialpes/exmo/align/service/aserv.wsdl" tofile="classes/fr/inrialpes/exmo/align/service/aserv.wsdl" filtering="false"/>
- <jar jarfile="lib/alignsvc.jar">
- <manifest>
- <attribute name="Built-Date" value="${date}"/>
- <attribute name="Main-Class" value="fr.inrialpes.exmo.align.service.AlignmentService"/>
- <attribute name="Class-Path" value="procalign.jar jade/jade.jar jade/iiop.jar jade/http.jar jdbc/mysql-connector-java.jar jdbc/postgresql-jdbc4.jar servlet/servlet-api.jar jetty/jetty.jar jetty/jetty-util.jar xerces/xercesImpl.jar"/>
- <attribute name="Implementation-Title" value="Alignment server"/>
- <attribute name="Implementation-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Name" value="Alignment server"/>
- <attribute name="Bundle-SymbolicName" value="alignsvc"/>
- <attribute name="Bundle-Version" value="${version} (${svn.rev})"/>
- <attribute name="Bundle-Copyright" value="INRIA, ${copyyear}"/>
- <attribute name="Bundle-Date" value="${date}"/>
- <attribute name="Bundle-License" value="GNU Lesser General Public License 2.1 or above"/>
- <attribute name="Export-package" value="fr.inrialpes.exmo.align.queryprocessor,fr.inrialpes.exmo.align.service,fr.inrialpes.exmo.align.service.jade,fr.inrialpes.exmo.align.service.jade.messageontology"/>
+ <attribute name="Export-package" value="${pack}"/>
+ <attribute name="Import-package" value="${impt}"/>
</manifest>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/service/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/service/**/*.wsdl"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/queryprocessor/**/*.class"/>
- <fileset dir="classes" includes="LICENSE.TXT"/>
+ <!-- This should be achieved with a metainf tag, but not working -->
+ <zipfileset file="classes/LICENSE.TXT" fullpath="META-INF/LICENSE.TXT" />
+ <zipfileset file="lib/${file}.pom" fullpath="META-INF/maven/${group}/${file}/pom.xml" />
+ <fileset refid="content" />
</jar>
- <copy file="distrib/alignsvc.pom" toFile="lib/alignsvc.pom">
- <filterset>
- <filter token="VERS" value="${version}"/>
- <filter token="DATE" value="${date}"/>
- <filter token="REV" value="${svn.rev}"/>
- <filter token="COPYYEAR" value="${copyyear}"/>
- </filterset>
- </copy>
</target>
<!-- tested -->
@@ -288,6 +280,22 @@
</manifest>
</jar>
</target>
+<!-- JE: May also be done this way... bundles all the necessary jars...
+<jar destfile="build/main/checksites.jar">
+ <fileset dir="build/main/classes"/>
+ <restrict>
+ <name name="**/*.class"/>
+ <archives>
+ <zips>
+ <fileset dir="lib/main" includes="**/*.jar"/>
+ </zips>
+ </archives>
+ </restrict>
+ <manifest>
+ <attribute name="Main-Class"
+ value="com.acme.checksites.Main"/>
+ </manifest>
+ </jar-->
<!-- tested -->
<target name="test" depends="init" description="Unit test code">
diff --git a/distrib/align.pom b/distrib/align.pom
index 423dec435c6d311f677f07d793c25b43c40a605f..d769d4f84e334f85252579b32d4e50fb53e31dd8 100644
--- a/distrib/align.pom
+++ b/distrib/align.pom
@@ -2,9 +2,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- WARNING: EXPERIMENTAL
+ These pom files are not functional, so far.
+ These are used for attaching useful information to our Jar files.
+ They are not generated by maven, and not complete.
+ For any improvement suggestion, put it in our bugtracker:
+ https://gforge.inria.fr/tracker/?group_id=117
+ and send us an email.
+ Tell us (a) what is needed, (b) why is it needed, and eventually
+ (c) how do you suggest to do it.
+ PS. "use maven" is not a useful suggestion.
+ -->
- <groupId>org.semanticweb.owl</groupId>
- <artifactId>align</artifactId>
+ <groupId>@GROUPID@</groupId>
+ <artifactId>@ARTID@</artifactId>
<version>@VERS@</version>
<!-- Rev @REV@ @DATE@ -->
<name>The Alignment API</name>
diff --git a/distrib/alignsvc.pom b/distrib/alignsvc.pom
index 736252dab0188494d8f88cadcf770a20eefea2c7..355e10d4287d79ae34d832a79281428cb3f8762a 100644
--- a/distrib/alignsvc.pom
+++ b/distrib/alignsvc.pom
@@ -2,9 +2,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- WARNING: EXPERIMENTAL
+ These pom files are not functional, so far.
+ These are used for attaching useful information to our Jar files.
+ They are not generated by maven, and not complete.
+ For any improvement suggestion, put it in our bugtracker:
+ https://gforge.inria.fr/tracker/?group_id=117
+ and send us an email.
+ Tell us (a) what is needed, (b) why is it needed, and eventually
+ (c) how do you suggest to do it.
+ PS. "use maven" is not a useful suggestion.
+ -->
- <groupId>fr.inrialpes.exmo.align.service</groupId>
- <artifactId>alignsvc</artifactId>
+ <groupId>@GROUPID@</groupId>
+ <artifactId>@ARTID@</artifactId>
<version>@VERS@</version>
<!-- Rev @REV@ @DATE@ -->
<name>Alignment server</name>
diff --git a/distrib/ontowrap.pom b/distrib/ontowrap.pom
index eae7e84786f25c5fef34fd1b9fbd933e38075418..8aa8b8fb758db8d75051bdacb3591b88b902ead6 100644
--- a/distrib/ontowrap.pom
+++ b/distrib/ontowrap.pom
@@ -2,9 +2,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- WARNING: EXPERIMENTAL
+ These pom files are not functional, so far.
+ These are used for attaching useful information to our Jar files.
+ They are not generated by maven, and not complete.
+ For any improvement suggestion, put it in our bugtracker:
+ https://gforge.inria.fr/tracker/?group_id=117
+ and send us an email.
+ Tell us (a) what is needed, (b) why is it needed, and eventually
+ (c) how do you suggest to do it.
+ PS. "use maven" is not a useful suggestion.
+ -->
- <groupId>fr.inrialpes.exmo</groupId>
- <artifactId>ontowrap</artifactId>
+ <groupId>@GROUPID@</groupId>
+ <artifactId>@ARTID@</artifactId>
<version>@VERS@</version>
<!-- Rev @REV@ @DATE@ -->
<name>Ontology wrapping API</name>
diff --git a/distrib/procalign.pom b/distrib/procalign.pom
index df9e747f5897863bf7d2cfcabf1aa5bc3cbf1265..1e85b001e6e417a7caf6aea80e666dc62dbeb174 100644
--- a/distrib/procalign.pom
+++ b/distrib/procalign.pom
@@ -2,9 +2,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- WARNING: EXPERIMENTAL
+ These pom files are not functional, so far.
+ These are used for attaching useful information to our Jar files.
+ They are not generated by maven, and not complete.
+ For any improvement suggestion, put it in our bugtracker:
+ https://gforge.inria.fr/tracker/?group_id=117
+ and send us an email.
+ Tell us (a) what is needed, (b) why is it needed, and eventually
+ (c) how do you suggest to do it.
+ PS. "use maven" is not a useful suggestion.
+ -->
- <groupId>fr.inrialpes.exmo.align.impl</groupId>
- <artifactId>procalign</artifactId>
+ <groupId>@GROUPID@</groupId>
+ <artifactId>@ARTID@</artifactId>
<version>@VERS@</version>
<!-- Rev @REV@ @DATE@ -->
<name>Reference implementation of the Alignment API</name>
diff --git a/html/relnotes.html b/html/relnotes.html
index 032edb196368043c219ce55e9a9e2b162172e76f..54b3ddcbb9cc0353b4ad40f1f1acbf3f173f8686 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -66,7 +66,7 @@ with a warning:
<!--h2>Version 4.5 (17xx): ??/??/2012 - Al pesto</h2-->
-<!--h2>Version 4.4 (17xx): ??/??/2012 - ?????????</h2-->
+<!--h2>Version 4.4 (17xx): 17/07/2012 - Casa cirilo</h2-->
<p><ul compact="1">
<li><span style="color: red;">Deprecated</span> <tt>BasicParameters</tt>,
diff --git a/lib/skosapi/skosapi.pom b/lib/skosapi/skosapi.pom
new file mode 100644
index 0000000000000000000000000000000000000000..64c6d0aebff251d350e704d77565b01a78a3454c
--- /dev/null
+++ b/lib/skosapi/skosapi.pom
@@ -0,0 +1,18 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.semanticweb</groupId>
+ <artifactId>skos</artifactId>
+ <version>2 (2011)</version>
+ <name>SKOS API</name>
+ <description>API for the SKOS W3C Recommendation</description>
+ <licenses>
+ <license>
+ <name>GNU LESSER GENERAL PUBLIC LICENSE Version 3, June 2007</name>
+ <url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
+ </license>
+ </licenses>
+
+ <url>http://skosapi.sourceforge.net</url>
+
+</project>