[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Jul  7 12:02:47 EDT 2004
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared
In directory pub.open-bio.org:/tmp/cvs-serv32166/shared

Modified Files:
	MobyPrefixResolver.java 
Log Message:
Fixed issues with SOAP payload parsing related to namespaces and encoding schemes, works with Axis 1.1beta without warnings too

moby-live/Java/src/main/org/biomoby/shared MobyPrefixResolver.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrefixResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrefixResolver.java	2004/04/21 17:26:46	1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyPrefixResolver.java	2004/07/07 16:02:47	1.2
@@ -21,9 +21,13 @@
 public class MobyPrefixResolver implements PrefixResolver{
     public static final String MOBY_XML_NAMESPACE = "http://www.biomoby.org/moby";
     public static final String MOBY_XML_PREFIX = "moby";
+    public static final String MOBY_TRANSPORT_NAMESPACE = "http://biomoby.org/";
+    public static final String MOBY_TRANSPORT_PREFIX = "mobyt";
     public static final String XSI_NAMESPACE1999 = "http://www.w3.org/1999/XMLSchema-instance";
     public static final String XSI_NAMESPACE2001 = "http://www.w3.org/2001/XMLSchema-instance";
     public static final String XSI_PREFIX = "xsi";
+    public static final String XSI1999_PREFIX = "xsi1999";
+    public static final String XSI2001_PREFIX = "xsi2001";
 
     /**
      * We don't really implement this as it can be extremely complicated.
@@ -57,8 +61,17 @@
 	else if(MOBY_XML_PREFIX.equals(prefix)){
 	    return MOBY_XML_NAMESPACE;
 	}
+	else if(MOBY_TRANSPORT_PREFIX.equals(prefix)){
+	    return MOBY_TRANSPORT_NAMESPACE;
+	}
 	else if(XSI_PREFIX.equals(prefix)){
-	    return XSI_NAMESPACE1999;  //Crappy Perl XML Schema namespace usage is out of date
+	    return XSI_NAMESPACE1999;  //Crappy Perl XML Schema namespace usage is out of date, use it by default
+	}
+	else if(XSI1999_PREFIX.equals(prefix)){
+	    return XSI_NAMESPACE1999;  
+	}
+	else if(XSI2001_PREFIX.equals(prefix)){
+	    return XSI_NAMESPACE2001;  //Used by Axis
 	}
 	else{
 	    return "";  // Indicates that we don't have a mapping for this prefix