Mentions légales du service

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

- improved namespace location (especially for REST messages)

parent d8595af6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/fr/inrialpes/exmo/align/service/WSAServProfile.java
+ 24
− 24
View file @ fdb80e35
...@@ -203,7 +203,9 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -203,7 +203,9 @@ public class WSAServProfile implements AlignmentServiceProfile {
Properties newparameters = null; Properties newparameters = null;
Message answer = null; Message answer = null;
boolean restful = (param.getProperty("restful")==null)?false:true; boolean restful = (param.getProperty("restful")==null)?false:true;
String msg=""; String svcNS = "\n xml:base='"+Namespace.ALIGNSVC.prefix+"'"+
"\n xmlns='"+Namespace.ALIGNSVC.prefix+"'";
String msg = "";
// Set parameters if necessary // Set parameters if necessary
if ( restful ) { if ( restful ) {
...@@ -239,7 +241,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -239,7 +241,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
if ( perf.equals("WSDL") || method.equals("wsdl") || method.equals("wsdlRequest") ) { if ( perf.equals("WSDL") || method.equals("wsdl") || method.equals("wsdlRequest") ) {
msg += wsdlAnswer( !restful ); msg += wsdlAnswer( !restful );
} else if ( method.equals("listalignmentsRequest") || method.equals("listalignments") ) { } else if ( method.equals("listalignmentsRequest") || method.equals("listalignments") ) {
msg += " <listalignmentsResponse>\n <alignmentList>\n"; msg += " <listalignmentsResponse"+svcNS+">\n <alignmentList>\n";
if ( newparameters.getProperty("msgid") != null ) { if ( newparameters.getProperty("msgid") != null ) {
msg += " <in-reply-to>"+newparameters.getProperty("msgid")+"</in-reply-to>\n"; msg += " <in-reply-to>"+newparameters.getProperty("msgid")+"</in-reply-to>\n";
} }
...@@ -250,27 +252,27 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -250,27 +252,27 @@ public class WSAServProfile implements AlignmentServiceProfile {
msg += " </alignmentList>\n </listalignmentsResponse>\n"; msg += " </alignmentList>\n </listalignmentsResponse>\n";
// -> List of URI // -> List of URI
} else if ( method.equals("listmethodsRequest") || method.equals("listmethods") ) { // -> List of String } else if ( method.equals("listmethodsRequest") || method.equals("listmethods") ) { // -> List of String
msg += getClasses( "listmethodsResponse", manager.listmethods(), newparameters ); msg += getClasses( "listmethodsResponse", svcNS, manager.listmethods(), newparameters );
} else if ( method.equals("listrenderersRequest") || method.equals("listrenderers") ) { // -> List of String } else if ( method.equals("listrenderersRequest") || method.equals("listrenderers") ) { // -> List of String
msg += getClasses( "listrenderersResponse", manager.listrenderers(), newparameters ); msg += getClasses( "listrenderersResponse", svcNS, manager.listrenderers(), newparameters );
} else if ( method.equals("listservicesRequest") || method.equals("listservices") ) { // -> List of String } else if ( method.equals("listservicesRequest") || method.equals("listservices") ) { // -> List of String
msg += getClasses( "listservicesResponse", manager.listservices(), newparameters ); msg += getClasses( "listservicesResponse", svcNS, manager.listservices(), newparameters );
} else if ( method.equals("listevaluatorsRequest") || method.equals("listevaluators") ) { // -> List of String } else if ( method.equals("listevaluatorsRequest") || method.equals("listevaluators") ) { // -> List of String
msg += getClasses( "listevaluatorsResponse", manager.listevaluators(), newparameters ); msg += getClasses( "listevaluatorsResponse", svcNS, manager.listevaluators(), newparameters );
} else if ( method.equals("storeRequest") || method.equals("store") ) { // URI -> URI } else if ( method.equals("storeRequest") || method.equals("store") ) { // URI -> URI
if ( newparameters.getProperty( "id" ) == null ) { if ( newparameters.getProperty( "id" ) == null ) {
answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null); answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null);
} else { } else {
answer = manager.store( new Message(newId(),(Message)null,myId,serverURL,newparameters.getProperty( "id" ), newparameters) ); answer = manager.store( new Message(newId(),(Message)null,myId,serverURL,newparameters.getProperty( "id" ), newparameters) );
} }
msg += " <storeResponse>\n"+answer.SOAPString()+" </storeResponse>\n"; msg += " <storeResponse"+svcNS+">\n"+answer.SOAPString()+" </storeResponse>\n";
} else if ( method.equals("invertRequest") || method.equals("invert") ) { // URI -> URI } else if ( method.equals("invertRequest") || method.equals("invert") ) { // URI -> URI
if ( newparameters.getProperty( "id" ) == null ) { if ( newparameters.getProperty( "id" ) == null ) {
answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null); answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null);
} else { } else {
answer = manager.inverse( new Message(newId(),(Message)null,myId,serverURL, newparameters.getProperty( "id" ), newparameters) ); answer = manager.inverse( new Message(newId(),(Message)null,myId,serverURL, newparameters.getProperty( "id" ), newparameters) );
} }
msg += " <invertResponse>\n"+answer.SOAPString()+" </invertResponse>\n"; msg += " <invertResponse"+svcNS+">\n"+answer.SOAPString()+" </invertResponse>\n";
} else if ( method.equals("trimRequest") || method.equals("trim") ) { // URI * string * float -> URI } else if ( method.equals("trimRequest") || method.equals("trim") ) { // URI * string * float -> URI
if ( newparameters.getProperty( "id" ) == null ) { if ( newparameters.getProperty( "id" ) == null ) {
answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null); answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null);
...@@ -282,7 +284,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -282,7 +284,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
} }
answer = manager.trim( new Message(newId(),(Message)null,myId,serverURL,newparameters.getProperty( "id" ), newparameters) ); answer = manager.trim( new Message(newId(),(Message)null,myId,serverURL,newparameters.getProperty( "id" ), newparameters) );
} }
msg += " <trimResponse>\n"+answer.SOAPString()+" </trimResponse>\n"; msg += " <trimResponse"+svcNS+">\n"+answer.SOAPString()+" </trimResponse>\n";
} else if ( method.equals("matchRequest") || method.equals("match") ) { // URL * URL * URI * String * boolean * (newparameters) -> URI } else if ( method.equals("matchRequest") || method.equals("match") ) { // URL * URL * URI * String * boolean * (newparameters) -> URI
if ( newparameters.getProperty( "onto1" ) == null ) { if ( newparameters.getProperty( "onto1" ) == null ) {
answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null); answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null);
...@@ -291,7 +293,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -291,7 +293,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
} else { } else {
answer = manager.align( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) ); answer = manager.align( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) );
} }
msg += " <matchResponse>\n"+answer.SOAPString()+"</matchResponse>\n"; msg += " <matchResponse"+svcNS+">\n"+answer.SOAPString()+"</matchResponse>\n";
} else if ( method.equals("align") ) { // URL * URL * (newparameters) -> URI } else if ( method.equals("align") ) { // URL * URL * (newparameters) -> URI
// This is a dummy method for emulating a WSAlignement service // This is a dummy method for emulating a WSAlignement service
if ( newparameters.getProperty( "onto1" ) == null ) { if ( newparameters.getProperty( "onto1" ) == null ) {
...@@ -320,7 +322,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -320,7 +322,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
} }
} }
} }
msg += " <alignResponse>\n"; msg += " <alignResponse"+svcNS+">\n";
if ( answer instanceof ErrorMsg ) { if ( answer instanceof ErrorMsg ) {
msg += answer.SOAPString(); msg += answer.SOAPString();
} else { } else {
...@@ -335,7 +337,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -335,7 +337,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
} else { } else {
answer = manager.existingAlignments( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) ); answer = manager.existingAlignments( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) );
} }
msg += " <findResponse>\n"+answer.SOAPString()+" </findResponse>\n"; msg += " <findResponse"+svcNS+">\n"+answer.SOAPString()+" </findResponse>\n";
} else if ( method.equals("retrieveRequest") || method.equals("retrieve")) { // URI * method -> XML } else if ( method.equals("retrieveRequest") || method.equals("retrieve")) { // URI * method -> XML
if ( newparameters.getProperty( "id" ) == null ) { if ( newparameters.getProperty( "id" ) == null ) {
answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null); answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null);
...@@ -345,7 +347,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -345,7 +347,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
newparameters.setProperty( "embedded", "true" ); newparameters.setProperty( "embedded", "true" );
answer = manager.render( new Message(newId(),(Message)null,myId,serverURL, "", newparameters) ); answer = manager.render( new Message(newId(),(Message)null,myId,serverURL, "", newparameters) );
} }
msg += " <retrieveResponse>\n"; msg += " <retrieveResponse"+svcNS+">\n";
if ( answer instanceof ErrorMsg ) { if ( answer instanceof ErrorMsg ) {
msg += answer.SOAPString(); msg += answer.SOAPString();
} else { } else {
...@@ -362,7 +364,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -362,7 +364,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
newparameters.setProperty( "method", "fr.inrialpes.exmo.align.impl.renderer.XMLMetadataRendererVisitor"); newparameters.setProperty( "method", "fr.inrialpes.exmo.align.impl.renderer.XMLMetadataRendererVisitor");
answer = manager.render( new Message(newId(),(Message)null,myId,serverURL, "", newparameters) ); answer = manager.render( new Message(newId(),(Message)null,myId,serverURL, "", newparameters) );
} }
msg += " <metadataResponse>\n"+answer.SOAPString()+"\n </metadataResponse>\n"; msg += " <metadataResponse"+svcNS+">\n"+answer.SOAPString()+"\n </metadataResponse>\n";
} else if ( method.equals("loadRequest") || method.equals("load") ) { // URL -> URI } else if ( method.equals("loadRequest") || method.equals("load") ) { // URL -> URI
if ( newparameters.getProperty( "url" ) == null && if ( newparameters.getProperty( "url" ) == null &&
param.getProperty( "filename" ) != null ) { param.getProperty( "filename" ) != null ) {
...@@ -373,7 +375,7 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -373,7 +375,7 @@ public class WSAServProfile implements AlignmentServiceProfile {
answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null); answer = new NonConformParameters(0,(Message)null,myId,"",message,(Properties)null);
} }
answer = manager.load( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) ); answer = manager.load( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) );
msg += " <loadResponse>\n"+answer.SOAPString()+" </loadResponse>\n"; msg += " <loadResponse"+svcNS+">\n"+answer.SOAPString()+" </loadResponse>\n";
/* /*
// JE2009: This has never been in use. // JE2009: This has never been in use.
} else if ( method.equals("loadfileRequest") ) { // XML -> URI } else if ( method.equals("loadfileRequest") ) { // XML -> URI
...@@ -382,22 +384,20 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -382,22 +384,20 @@ public class WSAServProfile implements AlignmentServiceProfile {
} else { } else {
answer = manager.load( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) ); answer = manager.load( new Message(newId(),(Message)null,myId,serverURL,"", newparameters) );
} }
msg += " <loadResponse>\n"+answer.SOAPString()+" </loadResponse>\n"; msg += " <loadResponse"+svcNS+">\n"+answer.SOAPString()+" </loadResponse>\n";
*/ */
} else if ( method.equals("translateRequest") ) { // XML * URI -> XML } else if ( method.equals("translateRequest") ) { // XML * URI -> XML
// Not done yet // Not done yet
msg += " <translateResponse>\n"+" </translateResponse>\n"; msg += " <translateResponse "+svcNS+">\n"+" </translateResponse>\n";
} else { } else {
msg += " <UnRecognizedAction />\n"; msg += " <UnRecognizedAction "+svcNS+"/>\n";
} }
if ( restful ) { if ( restful ) {
return msg; return msg;
} else { } else {
return "<"+Namespace.SOAP_ENV.shortCut+":Envelope\n" + return "<"+Namespace.SOAP_ENV.shortCut+":Envelope\n" +
" xmlns='"+Namespace.ALIGNSVC.prefix+"'\n" + " xmlns:"+Namespace.SOAP_ENV.shortCut+"='"+Namespace.SOAP_ENV.prefix+"'\n"+
" xml:base='"+Namespace.ALIGNSVC.prefix+"'\n" +
" xmlns:"+Namespace.SOAP_ENV.shortCut+"='"+Namespace.SOAP_ENV.prefix+"'\n" +
" xmlns:"+Namespace.XSI.shortCut+"='"+Namespace.XSI.prefix+"'\n" + " xmlns:"+Namespace.XSI.shortCut+"='"+Namespace.XSI.prefix+"'\n" +
" xmlns:"+Namespace.XSD.shortCut+"='"+Namespace.XSD.uri+"'>\n" + " xmlns:"+Namespace.XSD.shortCut+"='"+Namespace.XSD.uri+"'>\n" +
" <"+Namespace.SOAP_ENV.shortCut+":Body>\n"+msg+" </"+Namespace.SOAP_ENV.shortCut+":Body>\n" + " <"+Namespace.SOAP_ENV.shortCut+":Body>\n"+msg+" </"+Namespace.SOAP_ENV.shortCut+":Body>\n" +
...@@ -453,8 +453,8 @@ public class WSAServProfile implements AlignmentServiceProfile { ...@@ -453,8 +453,8 @@ public class WSAServProfile implements AlignmentServiceProfile {
return res; return res;
} }
private String getClasses( String tag, Set<String> classlist, Properties param ){ private String getClasses( String tag, String ns, Set<String> classlist, Properties param ){
String res = " <"+tag+">\n <classList>\n"; String res = " <"+tag+ns+">\n <classList>\n";
if ( param.getProperty("msgid") != null ) { if ( param.getProperty("msgid") != null ) {
res += " <in-reply-to>"+param.getProperty("msgid")+"</in-reply-to>\n"; res += " <in-reply-to>"+param.getProperty("msgid")+"</in-reply-to>\n";
} }
......
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