From ba53f20dfa0dba722bf05700f7cc4beaa96178e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Wed, 8 Jun 2016 09:01:14 +0000
Subject: [PATCH] - Fixed a problem with Jade when running a server with no X
server running (serv)
---
html/relnotes.html | 2 ++
src/fr/inrialpes/exmo/align/impl/BasicAlignment.java | 8 --------
.../exmo/align/service/AServProtocolManager.java | 2 ++
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/html/relnotes.html b/html/relnotes.html
index 58ddbbf7..8dfe172f 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -60,7 +60,9 @@ with a warning:
<!--h2>Version 4.9 (2xxx): ??/??/201X - Letraset</h2-->
<p><ul compact="1">
+<li>Fixed a problem with Jade when running a server with no X server running (serv)</li>
<li>Moved all shell examples from csh to bash (html)</li>
+<li>Clarified EDOAL documentation (html)</li>
<li>Fixed all Javadoc generation warnings (distrib)</li>
</ul></p>
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
index 385685a0..067aa9df 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
@@ -257,14 +257,6 @@ public class BasicAlignment implements Alignment, Extensible {
} catch ( ClassNotFoundException cnfex ) {
throw new AlignmentException( "Unknown relation class : "+classname, cnfex );
}
- // Taken care of by init()
- /*
- try {
- Class[] cArg = { String.class };
- relationCreationMethod = relationType.getMethod( "createRelation", cArg);
- } catch ( NoSuchMethodException nsmex ) {
- throw new AlignmentException ( "Cannot create relation of required type", nsmex );
- }*/
};
public Class<? extends Relation> getRelationType() {
diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index 212f8aff..cf3c692e 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -1525,6 +1525,8 @@ public class AServProtocolManager implements Service {
|| classname.startsWith( "org.apache.xml" )
|| classname.startsWith( "org.apache.html" )
|| classname.startsWith( "org.apache.wml" )
+ // jade.tools.rma.StartDialog raises problems
+ || classname.startsWith( "jade." )
) return false;
Class<?> cl = Class.forName(classname);
int mod = cl.getModifiers();
--
GitLab