Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 50082d65 authored by Jérôme Euzenat's avatar Jérôme Euzenat
Browse files

- got rid of Alignment API specifics

parent e34f7a08
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/wservice/AlignmentClient.java
+ 37
− 42
View file @ 50082d65
...@@ -25,12 +25,6 @@ ...@@ -25,12 +25,6 @@
* *
*/ */
import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.util.NullStream;
import org.semanticweb.owl.align.Parameters;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Enumeration; import java.util.Enumeration;
import java.io.PrintStream; import java.io.PrintStream;
...@@ -43,6 +37,7 @@ import java.net.URLConnection; ...@@ -43,6 +37,7 @@ import java.net.URLConnection;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.util.Properties;
import gnu.getopt.LongOpt; import gnu.getopt.LongOpt;
import gnu.getopt.Getopt; import gnu.getopt.Getopt;
...@@ -80,7 +75,7 @@ public class AlignmentClient { ...@@ -80,7 +75,7 @@ public class AlignmentClient {
public void run(String[] args) throws Exception { public void run(String[] args) throws Exception {
services = new Hashtable(); services = new Hashtable();
// Read parameters // Read parameters
Parameters params = readParameters( args ); Properties params = readParameters( args );
if ( SERVUrl == null ) SERVUrl = "http://" + HOST + ":" + HTML; if ( SERVUrl == null ) SERVUrl = "http://" + HOST + ":" + HTML;
SOAPUrl = new URL( SERVUrl + "/aserv" ); SOAPUrl = new URL( SERVUrl + "/aserv" );
RESTStr = SERVUrl + "/rest" ; RESTStr = SERVUrl + "/rest" ;
...@@ -114,13 +109,13 @@ public class AlignmentClient { ...@@ -114,13 +109,13 @@ public class AlignmentClient {
displayAnswer( answer ); displayAnswer( answer );
} }
public String createMessage( Parameters params ) throws Exception { public String createMessage( Properties params ) throws Exception {
String messageBody = ""; String messageBody = "";
String RESTParams = ""; String RESTParams = "";
String cmd = (String)params.getParameter( "command" ); String cmd = params.getProperty( "command" );
if ( cmd.equals("list" ) ) { if ( cmd.equals("list" ) ) {
// REST: HTML there is on listmethods => all methods, not good // REST: HTML there is on listmethods => all methods, not good
String arg = (String)params.getParameter( "arg1" ); String arg = (String)params.getProperty( "arg1" );
if ( arg.equals("methods" ) ){ if ( arg.equals("methods" ) ){
SOAPAction = "listmethodsRequest"; SOAPAction = "listmethodsRequest";
RESTAction = "listmethods"; RESTAction = "listmethods";
...@@ -143,8 +138,8 @@ public class AlignmentClient { ...@@ -143,8 +138,8 @@ public class AlignmentClient {
} else if ( cmd.equals("find" ) ) { } else if ( cmd.equals("find" ) ) {
SOAPAction = "findRequest"; SOAPAction = "findRequest";
RESTAction = "find"; RESTAction = "find";
String uri1 = (String)params.getParameter( "arg1" ); String uri1 = (String)params.getProperty( "arg1" );
String uri2 = (String)params.getParameter( "arg2" ); String uri2 = (String)params.getProperty( "arg2" );
if ( uri2 == null ){ if ( uri2 == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
...@@ -154,14 +149,14 @@ public class AlignmentClient { ...@@ -154,14 +149,14 @@ public class AlignmentClient {
} else if ( cmd.equals("match" ) ) { } else if ( cmd.equals("match" ) ) {
SOAPAction = "matchRequest"; SOAPAction = "matchRequest";
RESTAction = "match"; RESTAction = "match";
String uri1 = (String)params.getParameter( "arg1" ); String uri1 = (String)params.getProperty( "arg1" );
String uri2 = (String)params.getParameter( "arg2" ); String uri2 = (String)params.getProperty( "arg2" );
if ( uri2 == null ){ if ( uri2 == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
} }
String method = null; String method = null;
String arg3 = (String)params.getParameter( "arg3" ); String arg3 = (String)params.getProperty( "arg3" );
if ( arg3 != null ) { if ( arg3 != null ) {
method = uri1; uri1 = uri2; uri2 = arg3; method = uri1; uri1 = uri2; uri2 = arg3;
} }
...@@ -172,13 +167,13 @@ public class AlignmentClient { ...@@ -172,13 +167,13 @@ public class AlignmentClient {
RESTParams += "&method=" + method; RESTParams += "&method=" + method;
} }
//for wserver //for wserver
arg3 = (String)params.getParameter( "arg4" ); arg3 = (String)params.getProperty( "arg4" );
if ( arg3 != null ) { if ( arg3 != null ) {
messageBody += " <wserver>"+arg3+"</wserver>\n"; messageBody += " <wserver>"+arg3+"</wserver>\n";
RESTParams += "&paramn1=wserver&paramv1=" + arg3; RESTParams += "&paramn1=wserver&paramv1=" + arg3;
} }
//for wsmethod //for wsmethod
String arg4 = (String)params.getParameter( "arg5" ); String arg4 = (String)params.getProperty( "arg5" );
if ( arg4 != null ) { if ( arg4 != null ) {
messageBody += " <wsmethod>"+arg4+"</wsmethod>\n"; messageBody += " <wsmethod>"+arg4+"</wsmethod>\n";
RESTParams += "&paramn2=wsmethod&paramv2=" + arg4; RESTParams += "&paramn2=wsmethod&paramv2=" + arg4;
...@@ -189,14 +184,14 @@ public class AlignmentClient { ...@@ -189,14 +184,14 @@ public class AlignmentClient {
} else if ( cmd.equals("align" ) ) { } else if ( cmd.equals("align" ) ) {
SOAPAction = "align"; SOAPAction = "align";
RESTAction = "align"; RESTAction = "align";
String uri1 = (String)params.getParameter( "arg1" ); String uri1 = (String)params.getProperty( "arg1" );
String uri2 = (String)params.getParameter( "arg2" ); String uri2 = (String)params.getProperty( "arg2" );
if ( uri2 == null ){ if ( uri2 == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
} }
String method = null; String method = null;
String arg3 = (String)params.getParameter( "arg3" ); String arg3 = (String)params.getProperty( "arg3" );
if ( arg3 != null ) { if ( arg3 != null ) {
method = uri1; uri1 = uri2; uri2 = arg3; method = uri1; uri1 = uri2; uri2 = arg3;
} }
...@@ -208,7 +203,7 @@ public class AlignmentClient { ...@@ -208,7 +203,7 @@ public class AlignmentClient {
RESTParams += "&method=" + method; RESTParams += "&method=" + method;
} }
//for wserver //for wserver
arg3 = (String)params.getParameter( "arg4" ); arg3 = (String)params.getProperty( "arg4" );
if ( arg3 != null ) { if ( arg3 != null ) {
messageBody += " <wserver>"+arg3+"</wserver>\n"; messageBody += " <wserver>"+arg3+"</wserver>\n";
RESTParams += "&paramn1=wserver&paramv1=" + arg3; RESTParams += "&paramn1=wserver&paramv1=" + arg3;
...@@ -219,14 +214,14 @@ public class AlignmentClient { ...@@ -219,14 +214,14 @@ public class AlignmentClient {
} else if ( cmd.equals("trim" ) ) { } else if ( cmd.equals("trim" ) ) {
SOAPAction = "cutRequest"; SOAPAction = "cutRequest";
RESTAction = "cut"; RESTAction = "cut";
String id = (String)params.getParameter( "arg1" ); String id = (String)params.getProperty( "arg1" );
String thres = (String)params.getParameter( "arg2" ); String thres = (String)params.getProperty( "arg2" );
if ( thres == null ){ if ( thres == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
} }
String method = null; String method = null;
String arg3 = (String)params.getParameter( "arg3" ); String arg3 = (String)params.getProperty( "arg3" );
if ( arg3 != null ) { if ( arg3 != null ) {
method = thres; thres = arg3; method = thres; thres = arg3;
} }
...@@ -239,7 +234,7 @@ public class AlignmentClient { ...@@ -239,7 +234,7 @@ public class AlignmentClient {
} else if ( cmd.equals("invert" ) ) { } else if ( cmd.equals("invert" ) ) {
SOAPAction = "invertRequest"; SOAPAction = "invertRequest";
RESTAction = "invert"; RESTAction = "invert";
String uri = (String)params.getParameter( "arg1" ); String uri = (String)params.getProperty( "arg1" );
if ( uri == null ){ if ( uri == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
...@@ -249,7 +244,7 @@ public class AlignmentClient { ...@@ -249,7 +244,7 @@ public class AlignmentClient {
} else if ( cmd.equals("store" ) ) { } else if ( cmd.equals("store" ) ) {
SOAPAction = "storeRequest"; SOAPAction = "storeRequest";
RESTAction = "store"; RESTAction = "store";
String uri = (String)params.getParameter( "arg1" ); String uri = (String)params.getProperty( "arg1" );
if ( uri == null ){ if ( uri == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
...@@ -258,7 +253,7 @@ public class AlignmentClient { ...@@ -258,7 +253,7 @@ public class AlignmentClient {
RESTParams += "&id=" + uri ; RESTParams += "&id=" + uri ;
} else if ( cmd.equals("load" ) ) { } else if ( cmd.equals("load" ) ) {
String url = (String)params.getParameter( "arg1" ); String url = (String)params.getProperty( "arg1" );
RESTAction = "load"; RESTAction = "load";
messageBody= " <url>"+url+"</url>\n"; messageBody= " <url>"+url+"</url>\n";
uploadFile = url; uploadFile = url;
...@@ -300,8 +295,8 @@ public class AlignmentClient { ...@@ -300,8 +295,8 @@ public class AlignmentClient {
} else if ( cmd.equals( "retrieve" ) ) { } else if ( cmd.equals( "retrieve" ) ) {
SOAPAction = "retrieveRequest"; SOAPAction = "retrieveRequest";
RESTAction = "retrieve"; RESTAction = "retrieve";
String uri = (String)params.getParameter( "arg1" ); String uri = (String)params.getProperty( "arg1" );
String method = (String)params.getParameter( "arg2" ); String method = (String)params.getProperty( "arg2" );
if ( method == null ){ if ( method == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
...@@ -311,8 +306,8 @@ public class AlignmentClient { ...@@ -311,8 +306,8 @@ public class AlignmentClient {
} else if ( cmd.equals("metadata" ) ) { } else if ( cmd.equals("metadata" ) ) {
SOAPAction = "metadata"; SOAPAction = "metadata";
RESTAction = "metadata"; RESTAction = "metadata";
String uri = (String)params.getParameter( "arg1" ); String uri = (String)params.getProperty( "arg1" );
String key = (String)params.getParameter( "arg2" ); String key = (String)params.getProperty( "arg2" );
if ( key == null ){ if ( key == null ){
usage(); usage();
System.exit(-1); System.exit(-1);
...@@ -338,7 +333,7 @@ public class AlignmentClient { ...@@ -338,7 +333,7 @@ public class AlignmentClient {
return message; return message;
} }
public String sendRESTMessage( String message, Parameters param ) throws Exception { public String sendRESTMessage( String message, Properties param ) throws Exception {
URL RESTUrl = null; URL RESTUrl = null;
URLConnection connection = null; URLConnection connection = null;
HttpURLConnection httpConn = null; HttpURLConnection httpConn = null;
...@@ -419,7 +414,7 @@ public class AlignmentClient { ...@@ -419,7 +414,7 @@ public class AlignmentClient {
return answer; return answer;
} }
public String sendSOAPMessage( String message, Parameters param ) throws Exception { public String sendSOAPMessage( String message, Properties param ) throws Exception {
if ( debug > 1 ){ if ( debug > 1 ){
System.err.print("***** Send(SOAP) to "+SOAPUrl+" :: "+SOAPAction); System.err.print("***** Send(SOAP) to "+SOAPUrl+" :: "+SOAPAction);
System.err.println(" ==>"); System.err.println(" ==>");
...@@ -455,10 +450,10 @@ public class AlignmentClient { ...@@ -455,10 +450,10 @@ public class AlignmentClient {
return answer; return answer;
} }
public Parameters readParameters( String[] args ) throws java.net.MalformedURLException { public Properties readParameters( String[] args ) throws java.net.MalformedURLException {
Parameters params = new BasicParameters(); Properties params = new Properties();
params.setParameter( "host", HOST ); params.setProperty( "host", HOST );
// Read parameters // Read parameters
...@@ -500,7 +495,7 @@ public class AlignmentClient { ...@@ -500,7 +495,7 @@ public class AlignmentClient {
arg = g.getOptarg(); arg = g.getOptarg();
int index = arg.indexOf('='); int index = arg.indexOf('=');
if ( index != -1 ) { if ( index != -1 ) {
params.setParameter( arg.substring( 0, index), params.setProperty( arg.substring( 0, index),
arg.substring(index+1)); arg.substring(index+1));
} else { } else {
System.err.println("Bad parameter syntax: "+g); System.err.println("Bad parameter syntax: "+g);
...@@ -512,9 +507,9 @@ public class AlignmentClient { ...@@ -512,9 +507,9 @@ public class AlignmentClient {
} }
if (debug > 0) { if (debug > 0) {
params.setParameter("debug", new Integer(debug)); params.setProperty("debug", Integer.toString( debug ) );
} else if ( params.getParameter("debug") != null ) { } else if ( params.getProperty("debug") != null ) {
debug = Integer.parseInt((String)params.getParameter("debug")); debug = Integer.parseInt((String)params.getProperty("debug"));
} }
// Store the remaining arguments in param // Store the remaining arguments in param
...@@ -523,9 +518,9 @@ public class AlignmentClient { ...@@ -523,9 +518,9 @@ public class AlignmentClient {
usage(); usage();
System.exit(-1); System.exit(-1);
} else { } else {
params.setParameter("command", args[i++]); params.setProperty("command", args[i++]);
for ( int k = 1; i < args.length; i++,k++ ){ for ( int k = 1; i < args.length; i++,k++ ){
params.setParameter("arg"+k, args[i]); params.setProperty("arg"+k, args[i]);
} }
} }
return params; return params;
......
examples/wservice/README.TXT
+ 7
− 3
View file @ 50082d65
...@@ -44,9 +44,9 @@ java AlignmentClient list services -> XML ...@@ -44,9 +44,9 @@ java AlignmentClient list services -> XML
---------------------------------- ----------------------------------
USE WITH THE ALIGNMENT SERVER USE WITH THE ALIGNMENT SERVER
$ javac -cp .:../../lib/procalign.jar AlignmentClient.java $ javac -cp .:../../lib/getopt.jar AlignmentClient.java
$ java -cp .:../../lib/procalign.jar AlignmentClient match align http://alignapi.gforge.inria.fr/tutorial/myOnto.owl http://alignapi.gforge.inria.fr/tutorial/edu.mit.visus.bibtex.owl $ java -cp .:../../lib/getopt.jar AlignmentClient match align http://alignapi.gforge.inria.fr/tutorial/myOnto.owl http://alignapi.gforge.inria.fr/tutorial/edu.mit.visus.bibtex.owl
<SOAP-ENV:Envelope <SOAP-ENV:Envelope
xmlns='http://exmo.inrialpes.fr/align/service' xmlns='http://exmo.inrialpes.fr/align/service'
xml:base='http://exmo.inrialpes.fr/align/service' xml:base='http://exmo.inrialpes.fr/align/service'
...@@ -65,5 +65,9 @@ $ java -cp .:../../lib/procalign.jar AlignmentClient match align http://alignapi ...@@ -65,5 +65,9 @@ $ java -cp .:../../lib/procalign.jar AlignmentClient match align http://alignapi
---------------------------------- ----------------------------------
USE WITH A PARTICULAR ALIGNMENT SERVICE USE WITH A PARTICULAR ALIGNMENT SERVICE
$ java -cp .:../../lib/procalign.jar AlignmentClient -S http://aserv.inrialpes.fr/aserv align http://alignapi.gforge.inria.fr/tutorial/myOnto.owl http://alignapi.gforge.inria.fr/tutorial/edu.mit.visus.bibtex.owl $ java -cp .:../../lib/getopt.jar AlignmentClient -S http://aserv.inrialpes.fr/aserv align http://alignapi.gforge.inria.fr/tutorial/myOnto.owl http://alignapi.gforge.inria.fr/tutorial/edu.mit.visus.bibtex.owl
----------------------------------
FOR TESTING
$ java -cp .:../../lib/getopt.jar AlignmentClient list methods -S http://aserv.inrialpes.fr -r -d 4
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment