[wsmx-commits] components/communicationmanager/src/main/org/deri/infrawebs/sfs/adapter ShuttleServiceAdapter.java, 1.5, 1.6 ShuttleWSMLTranslator.java, 1.3, 1.4

[James S. <jam...@us...>]

Update of /cvsroot/wsmx/components/communicationmanager/src/main/org/deri/infrawebs/sfs/adapter
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19871/communicationmanager/src/main/org/deri/infrawebs/sfs/adapter

Modified Files:
	ShuttleServiceAdapter.java ShuttleWSMLTranslator.java 
Log Message:
- support for XML to WSML translation for the Shuttle Service

Index: ShuttleWSMLTranslator.java
===================================================================
RCS file: /cvsroot/wsmx/components/communicationmanager/src/main/org/deri/infrawebs/sfs/adapter/ShuttleWSMLTranslator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ShuttleWSMLTranslator.java	14 Dec 2006 12:45:34 -0000	1.3
--- ShuttleWSMLTranslator.java	20 Dec 2006 13:47:43 -0000	1.4
***************
*** 21,24 ****
--- 21,25 ----
  import org.w3c.dom.Document;
  import org.wsmo.common.Identifier;
+ import org.wsmo.execution.common.nonwsmo.WSMLDocument;
  
  /**
***************
*** 44,48 ****
  	}
  
! 	public void testShuttleBookingRequest() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_INPUT_NS
--- 45,49 ----
  	}
  
! 	public void testWSMLShuttleBookingRequest() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_INPUT_NS
***************
*** 57,61 ****
  	}
  
! 	public void testShuttleRequest() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_INPUT_NS
--- 58,62 ----
  	}
  
! 	public void testWSMLShuttleRequest() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_INPUT_NS
***************
*** 70,74 ****
  	}
  
! 	public void testAvailableShuttles() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_OUTPUT_NS
--- 71,75 ----
  	}
  
! 	public void testWSMLAvailableShuttles() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_OUTPUT_NS
***************
*** 83,87 ****
  	}
  
! 	public void testConfirmShuttle() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_OUTPUT_NS
--- 84,88 ----
  	}
  
! 	public void testWSMLConfirmShuttle() {
  		Identifier id = factory
  				.createIRI(ShuttleServiceAdapter.SHUTTLE_BOOKING_OUTPUT_NS
***************
*** 95,106 ****
  			System.out.println(id.toString() + " not found");
  	}
  
  	public static void main(String[] args) {
  		ShuttleWSMLTranslator test = new ShuttleWSMLTranslator();
! 		test.testShuttleBookingRequest();
! 		test.testShuttleRequest();
! 		test.testAvailableShuttles();
! 		test.testConfirmShuttle();
  	}
- 
  }
--- 96,134 ----
  			System.out.println(id.toString() + " not found");
  	}
+ 	
+ 	public void testXMLShuttleBookingRequest(){
+ 		String doc = loadXMLAsString(this.inputMsgsLocation, "shuttleBookingRequest.xml");
+ 		WSMLDocument wsml = shuttleAdapter.getWSML(doc);
+ 		System.out.println(wsml.getContent());
+ 	}
+ 
+ 	public void testXMLShuttleRequest(){
+ 		String doc = loadXMLAsString(this.inputMsgsLocation, "shuttleRequest.xml");
+ 		WSMLDocument wsml = shuttleAdapter.getWSML(doc);
+ 		System.out.println(wsml.getContent());
+ 	}
+ 	
+ 	public void testXMLAvailableShuttles(){
+ 		String doc = loadXMLAsString(this.outputMsgsLocation, "availableShuttles.xml");
+ 		WSMLDocument wsml = shuttleAdapter.getWSML(doc);
+ 		System.out.println(wsml.getContent());
+ 	}
+ 	
+ 	public void testXMLConfirmShuttle(){
+ 		String doc = loadXMLAsString(this.outputMsgsLocation, "confirmShuttle.xml");
+ 		WSMLDocument wsml = shuttleAdapter.getWSML(doc);
+ 		System.out.println(wsml.getContent());
+ 	}
  
  	public static void main(String[] args) {
  		ShuttleWSMLTranslator test = new ShuttleWSMLTranslator();
! 		test.testWSMLShuttleBookingRequest();
! 		test.testWSMLShuttleRequest();
! 		test.testWSMLAvailableShuttles();
! 		test.testWSMLConfirmShuttle();
! 		test.testXMLShuttleBookingRequest();
! 		test.testXMLShuttleRequest();
! 		test.testXMLAvailableShuttles();
! 		test.testXMLConfirmShuttle();
  	}
  }

Index: ShuttleServiceAdapter.java
===================================================================
RCS file: /cvsroot/wsmx/components/communicationmanager/src/main/org/deri/infrawebs/sfs/adapter/ShuttleServiceAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ShuttleServiceAdapter.java	20 Dec 2006 11:10:29 -0000	1.5
--- ShuttleServiceAdapter.java	20 Dec 2006 13:47:43 -0000	1.6
***************
*** 91,102 ****
  	public WSMLDocument getWSML(String document) {
  		// NOTE: There's some hard-coding checking here
- 		
  		String xslFileName = "";
  		
  		if(document.contains("<shuttleBookingRequest") || document.contains("<shuttleRequest")){
! 			//Deal with inputs -> Use shuttleInput.xsl
  			xslFileName = "shuttleInput.xsl";
  		}else if(document.contains("<availableShuttles") || document.contains("<shuttleBooking")){
! 			//Deal with outputs -> Use shuttleOutput.xsl
  			xslFileName = "shuttleOutput.xsl";
  		}
--- 91,101 ----
  	public WSMLDocument getWSML(String document) {
  		// NOTE: There's some hard-coding checking here
  		String xslFileName = "";
  		
  		if(document.contains("<shuttleBookingRequest") || document.contains("<shuttleRequest")){
! 			//Deal with inputs -> Use carRentalInput.xsl
  			xslFileName = "shuttleInput.xsl";
  		}else if(document.contains("<availableShuttles") || document.contains("<shuttleBooking")){
! 			//Deal with outputs -> Use carRentalOutput.xsl
  			xslFileName = "shuttleOutput.xsl";
  		}
***************
*** 214,218 ****
  			Iterator attrIterator) {
  		String sDoc = "<shuttleBookingRequest xmlns=\""
! 				+ ShuttleServiceAdapter.WS_NS + "\" id=\""
  				+ ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
--- 213,217 ----
  			Iterator attrIterator) {
  		String sDoc = "<shuttleBookingRequest xmlns=\""
! 				+ ShuttleServiceAdapter.WS_NS + "\" instanceId=\""
  				+ ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
***************
*** 265,269 ****
  			Iterator attrIterator) {
  		String sDoc = "<shuttleRequest xmlns=\"" + ShuttleServiceAdapter.WS_NS
! 				+ "\" id=\"" + ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
  			IRI att = (IRI) attrIterator.next();
--- 264,268 ----
  			Iterator attrIterator) {
  		String sDoc = "<shuttleRequest xmlns=\"" + ShuttleServiceAdapter.WS_NS
! 				+ "\" instanceId=\"" + ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
  			IRI att = (IRI) attrIterator.next();
***************
*** 301,305 ****
  			LinkedHashMap attributes, Iterator attrIterator) {
  		String sDoc = "<availableShuttles xmlns=\""
! 				+ FlightServiceAdapter.WS_NS + "\" id=\""
  				+ ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
--- 300,304 ----
  			LinkedHashMap attributes, Iterator attrIterator) {
  		String sDoc = "<availableShuttles xmlns=\""
! 				+ ShuttleServiceAdapter.WS_NS + "\" instanceId=\""
  				+ ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
***************
*** 329,334 ****
  	private String handleConfirmShuttle(Instance i, LinkedHashMap attributes,
  			Iterator attrIterator) {
! 		String sDoc = "<shuttleBooking xmlns=\"" + HotelServiceAdapter.WS_NS
! 				+ "\" id=\"" + ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
  			IRI att = (IRI) attrIterator.next();
--- 328,333 ----
  	private String handleConfirmShuttle(Instance i, LinkedHashMap attributes,
  			Iterator attrIterator) {
! 		String sDoc = "<shuttleBooking xmlns=\"" + ShuttleServiceAdapter.WS_NS
! 				+ "\" instanceId=\"" + ((IRI) i.getIdentifier()).getLocalName() + "\">";
  		while (attrIterator.hasNext()) {
  			IRI att = (IRI) attrIterator.next();