[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Mon Aug 17 17:10:40 EDT 2009
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util
In directory dev.open-bio.org:/tmp/cvs-serv25557/src/main/ca/ucalgary/services/util

Modified Files:
	WSDLConfig.java MobySpecWrapper.java 
Log Message:
Replaced mobyServiceName2MobyXPathMap in WSDLConfig with more generic mobyServiceName2MobyParamRenameMap in MobySpecWrapper
moby-live/Java/src/main/ca/ucalgary/services/util WSDLConfig.java,1.6,1.7 MobySpecWrapper.java,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/WSDLConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/WSDLConfig.java	2009/06/09 19:14:52	1.6
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/WSDLConfig.java	2009/08/17 21:10:40	1.7
@@ -60,7 +60,6 @@
     private Map<String,String> mobyServiceName2Encoding; //literal or encoded
     private Map<String,Map<String,String>> mobyServiceName2InputXSDTypes;
     private Map<String,Map<String,String>> mobyServiceName2OutputXSDTypes;
-    private Map<String,Map<String,String>> mobyServiceName2MobyXPathMap;
     private LSIDResolver lsidResolver;
 
     private static Logger logger = Logger.getLogger("ca.ucalgary.services.util.WSDLConfig");
@@ -99,7 +98,6 @@
 	mobyServiceName2OpOutput = new HashMap<String,QName>();
 	mobyServiceName2InputXSDTypes = new HashMap<String,Map<String,String>>();
 	mobyServiceName2OutputXSDTypes = new HashMap<String,Map<String,String>>();
-	mobyServiceName2MobyXPathMap = new HashMap<String,Map<String,String>>();
 	mobyServiceName2TargetNamespaceURI = new HashMap<String,String>();
 
 	lsidResolver = new LSIDResolver();	
@@ -1230,17 +1228,6 @@
 	mobyServiceName2OutputXSDTypes.put(currentService, types);
     }
 
-    public Map<String,String> getMobyParams2DocXPaths(){
-	return mobyServiceName2MobyXPathMap.get(currentService);
-    }
-
-    /**
-     * Primarily for use by systems that allow renaming of params, since SAWSDL doesn't directly
-     */
-    public void setMobyParams2DocXPaths(Map<String,String> moby2xpaths){
-	mobyServiceName2MobyXPathMap.put(currentService, moby2xpaths);
-    }
-
     public String getTargetNamespaceURI(){
 	return mobyServiceName2TargetNamespaceURI.get(currentService);
     }

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/MobySpecWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/MobySpecWrapper.java	2009/06/09 19:16:41	1.3
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/services/util/MobySpecWrapper.java	2009/08/17 21:10:40	1.4
@@ -27,6 +27,7 @@
     private Map<String,Map<String,String>> serviceOutputs;
     private Map<String,Map<String,String>> serviceOutputFormats;
     private Map<String,Map<String,String>> fixedParams;
+    private Map<String,Map<String,String>> mobyServiceName2MobyParamRenameMap;
     private Map<String,MobyUnitTest[]> unitTests;
 
     public MobySpecWrapper(){
@@ -44,9 +45,21 @@
 	serviceInputFormats = new HashMap<String,Map<String,String>>();
 	serviceSecondaryFormats = new HashMap<String,Map<String,String>>();
 	serviceOutputFormats = new HashMap<String,Map<String,String>>();	
+	mobyServiceName2MobyParamRenameMap = new HashMap<String,Map<String,String>>();
 	unitTests = new HashMap<String,MobyUnitTest[]>();
     }
 
+    public Map<String,String> getMobyParams2ServiceParams(){
+	return mobyServiceName2MobyParamRenameMap.get(currentService);
+    }
+
+    /**
+     * Primarily for use by systems that allow renaming of params, since SAWSDL doesn't directly
+     */
+    public void setMobyParams2ServiceParams(Map<String,String> mobyName2serviceName){
+	mobyServiceName2MobyParamRenameMap.put(currentService, mobyName2serviceName);
+    }
+
     public String[] getServiceNames(){
 	return providerURIs.keySet().toArray(new String[providerURIs.size()]);
     }