diff --git a/html/aserv.html b/html/aserv.html
index c8517ca14102e7974ffd77f4da16e157f4046328..9bea625b9fe801e920328f0906d8aec84941eaa7 100644
--- a/html/aserv.html
+++ b/html/aserv.html
@@ -9,6 +9,11 @@
<h1 class="titre">Setting up an Alignment Server</h1>
+<p>
+The Alignment server is an online service on which alignments may
+be manipulated (created, modified, displayed).
+In order to persistently store alignments, it has to be coupled to a storage service, such as a database.
+</p>
<p>An extensive presentation of the Alignment API can be
found
at <a href="http://alignapi.gforge.inria.fr">http://alignapi.gforge.inria.fr</a>
@@ -18,9 +23,15 @@
<h2>Requirements</h2>
-<p>Using the Alignment server requires an SQL database server.
+<p>
+The Alignment server is usually paired with a storage service such as an SQL database server.
We see here how to
use <a href="http://dev.mysql.com/doc/refman">mysql</a> or <a href="https://www.postgresql.org/">Postgres</a>.</p>
+<p>
+Although there is support for alignment servers without persistent
+storage, at the moment, using a data base is compulsory (contact us if
+you want this to be different).
+</p>
<h3>Creating the database for MySQL</h3>
diff --git a/html/impl.html b/html/impl.html
index dd4baaa979a94886d4030d2f9f92e9681564c310..0fd46a0c1c04b6cbbdddb1444df39d33b93318b3 100644
--- a/html/impl.html
+++ b/html/impl.html
@@ -1102,6 +1102,7 @@ Ontologies and their Applications, Salvador de Bahia (BR), 2008
The Alignment API is used for evaluating process matching systems in
the open Process Model Matching Contest. It is used for representing
alignments and references and to measure results provided by participants.
+The process model matching contest has since been integrated to <a href="http://oaei.ontologymatching.org/2016/">OAEI</a>.
<br /><small>
Goncalo Antunes, Marzieh Bakhshandeh, Jose Borbinha, Joao Cardoso,
Sharam Dadashnia, Chiara Di Francescomarino, Mauro Dragoni, Peter
diff --git a/html/rest.html b/html/rest.html
index 03dce6617b7be127f99b5b79521e27fff41c8011..7fb2887a5fbd78ab80a2502da694b05e2698add5 100644
--- a/html/rest.html
+++ b/html/rest.html
@@ -460,7 +460,7 @@ span, prop; default: hard).
</p>
<h3><span style="background-color: lightblue;">store</span><a name="store"></a></h3>
-<p>Stores an alignment on the server.</p>
+<p>Stores an alignment in the persistent storage of the server.</p>
<p>URL: http://aserv.inrialpes.fr/rest/ <b>store</b> ? <b>id</b> = <URI></p>
<p>Parameters:
<br /><b>id:</b> the URI of the alignment to be stored.
@@ -476,7 +476,7 @@ span, prop; default: hard).
</p>
<h3><span style="background-color: lightgreen;">storenetwork</span><a name="store"></a></h3>
-<p>Stores a network of ontologies on the server.</p>
+<p>Stores a network of ontologies in the persistent storage of the server.</p>
<p>URL: http://aserv.inrialpes.fr/rest/ <b>storenetwork</b> ? <b>id</b> = <URI></p>
<p>Parameters:
<br /><b>id:</b> the URI of the network of ontologies to be stored.
diff --git a/html/server.html b/html/server.html
index 88d597410a643a73d60a8395d8676c9c529be44b..f2e740d3cb815cb9dd4716406213bb4b1d45fb2b 100644
--- a/html/server.html
+++ b/html/server.html
@@ -11,7 +11,8 @@
<h1 class="titre">Alignment Server</h1>
<p>
-The goal of the Alignment server is that different actors can share available alignments and methods for finding alignments. Such a server enables to match ontologies, store the resulting alignment, store manually provided alignments, extract merger, transformer, mediators from those alignments.
+The goal of the Alignment server is that different actors can share
+available alignments, networks of ontologies and ontology matching methods. Such a server enables to match ontologies, store the resulting alignment, store manually provided alignments, extract merger, transformer, mediators from those alignments.
</p>
<p>
We present here the architecture of the Alignment server and its first
@@ -36,8 +37,16 @@ The Alignment server is built around the Alignment API that is seated on top of
<p>
The server architecture is made of three layers (shown in the figure):
<dl>
-<dt>A storage system</dt><dd>providing persistent storage and retrieval of alignments. It implements only basic storage and runtime memory caching functions. The storage is made through a DBMS interface and can be replaced by any database management system as soon as it is supported by jdbc.</dd>
-<dt>A protocol manager</dt><dd>which handles the server protocol. It accepts the queries from plug-in interfaces and uses the server resources for answering them. It uses the storage system for caching results.</dd>
+<dt>A storage system</dt><dd>providing persistent storage and
+ retrieval of alignments and networks.
+It is used in two occasions: when explicitely calling the store
+ operation to store and alignment or a network persistently, and
+ when launching a server to load the persistency stored resources.
+<!--It implements only basic storage and
+ runtime memory caching functions.--> The storage is made through a
+ DBMS interface and can be replaced by any database management
+ system as soon as it is supported by jdbc.</dd>
+<dt>A protocol manager</dt><dd>which handles the server protocol. It accepts the queries from plug-in interfaces and uses the server resources for answering them. It uses the storage system for <!--caching-->storing results.</dd>
<dt>Protocol plugs-in</dt><dd>which accept incoming queries in a particular communication system and invoke the protocol manager in order to satisfy them. These plugs-in are ideally stateless and only translator for the external queries.</dd>
</dl>
</p>
@@ -51,7 +60,7 @@ Currently, four plug-ins are available for the server:
</p>
<p>
-There is no constraint that the alignments are computed online or off-line (i.e., they are stored in the alignment store) or that they are processed by hand or automatically. This kind of information can however be stored together with the alignment in order for the client to be able to discriminate among them.
+There is no constraint that the alignments are computed on-line or off-line (i.e., they are stored in the alignment store) or that they are processed by hand or automatically. This kind of information can however be stored together with the alignment in order for the client to be able to discriminate among them.
For applications, the server can be available:
<dl>
<dt>at design time</dt><dd>through invocation by design and engineering environments: It can be integrated either as an Eclipse plug-in that embarks the Alignment API or as an Eclipse plug-in that connects through web services to some alignment server.</dd>
@@ -112,10 +121,11 @@ This infrastructure is able to store and retrieve alignments as well as providin
<p>
Services that are provided by the Alignment server are:
<ul>
-<li>storing alignments, whether they are provided by automatic means or by hand;</li>
+<li>storing alignments and networks of ontologies, whether they are provided by automatic means or by hand;</li>
<li>storing annotations in order for the clients to evaluate alignments and to decide to use one of them or to start from it (this starts with the information about the matching algorithms, the justifications for correspondences that can be used in agent argumentation, as well as properties of the alignment);</li>
<li>producing alignments on the fly through various algorithms that can be extended and parametrised;</li>
-<li>manipulating alignments by inverting them, applying thresholds;</li>
+<li>manipulating alignments and networks of ontologies by inverting
+ them, applying thresholds, etc.;</li>
<li>generating knowledge processors such as mediators, transformations, translators, rules as well as to process these processors if necessary;</li>
<li>finding similar ontologies and contacting other such services in order to ask them for operations that the current service cannot provide by itself.</li>
</ul>
@@ -185,25 +195,31 @@ The hierarchy of message types and the content of these messages are:
<pre>
Message
|- Success
-| |- AlignmentId -> alignment id
-| |- AlignmentIds -> alignment ids
-| |- EntityList -> entity URIs
-| |- OntologyURI -> ontology URI
-| |- TranslatedMessage -> translated message
-| |- RenderedAlignment -> rendering
-| |- AlignmentMetadata -> metadata
-| |- EvalResult -> evaluation results
+| |- AlignmentId -> alignment id
+| |- AlignmentIds -> alignment ids
+| |- OntologyNetworkId -> ontology network id
+| |- EntityList -> entity URIs
+| |- OntologyURI -> ontology URI
+| |- TranslatedMessage -> translated message
+| |- RenderedAlignment -> alignment rendering
+| |- RenderedNetwork -> ontology network rendering
+| |- AlignmentMetadata -> metadata
+| |- EvalResult -> evaluation results
|- ErrorMsg
-| |- UnreachableOntology -> faulty Ontology URI
-| |- UnreachableAlignment -> faulty alignment URI
-| |- UnknownAlignment -> faulty alignment id
-| |- UnknownMethod -> faulty method (Java method)
-| |- NonConformParameters -> unspecified
-| |- RunTimeError -> error message
+| |- UnreachableOntology -> faulty Ontology URI
+| |- UnreachableAlignment -> faulty alignment URI
+| |- UnreachableOntologyNetwork -> faulty alignment URI
+| |- UnknownAlignment -> faulty alignment id
+| |- UnknownOntologyNetwork -> faulty ontology network id
+| |- UnknownMethod -> faulty method (Java method)
+| |- NonConformParameters -> unspecified
+| |- CannotStoreAlignment -> error with storage
+| |- RunTimeError -> error message
<!-- Not used
-| |- CannotRenderAlignment ->
-| |- EvaluationId ->
+| |- CannotRenderAlignment ->
+| |- EvaluationId ->
-->
+
</pre>
<center><b>Message classes returned by <tt>AServProtocolManager</tt> and their
content.</b></center>
diff --git a/src/fr/inrialpes/exmo/align/service/AlignmentService.java b/src/fr/inrialpes/exmo/align/service/AlignmentService.java
index a87fdf078927dd373c285c7811211b96b441bf3f..80f7727cf022b422d6cdd0e2058f1cf00a9d823b 100644
--- a/src/fr/inrialpes/exmo/align/service/AlignmentService.java
+++ b/src/fr/inrialpes/exmo/align/service/AlignmentService.java
@@ -142,6 +142,9 @@ public class AlignmentService extends CommonCLI {
public void run() { close(); } });
// Connect database
+ // It may be useful to create a switch to use a simple volatilCache: nodb
+ // This requires simple but deeper changes
+ // (do not put as default for compatibility)
if ( DBMS.equals("postgres") ) {
logger.debug("postgres driver");
if ( DBPORT == null ) DBPORT = "5432";