You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by ae...@apache.org on 2006/08/31 05:45:53 UTC

svn commit: r438761 - /webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java

Author: aeberbac
Date: Wed Aug 30 20:45:53 2006
New Revision: 438761

URL: http://svn.apache.org/viewvc?rev=438761&view=rev
Log:
updated to run with new architecture

Modified:
    webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java

Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java?rev=438761&r1=438760&r2=438761&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxySynthesizer.java Wed Aug 30 20:45:53 2006
@@ -55,7 +55,7 @@
 {
 	static ConfigurationDataDescriptor[] REQUIRED_PARAMETERS = 
 		new ConfigurationDataDescriptor[] {
-			ConfigurationData.CAPABILITIES_MAP_CONFIGURATION,
+			
 		};
 	
     private static final String SERVICE_NAME = "MyService";
@@ -63,6 +63,10 @@
 	private static final String TARGET_NS_ATTR = "targetNamespace";
         
     private LocalEnvironment _environment = new LocalEnvironment(false);
+
+	private int _prefixCounter = 0;
+
+	private HashMap _prefixes = new HashMap();
         
     private String createProxyClass(ResourceInspector inspector, 
                                     String interfaceName, 
@@ -358,6 +362,11 @@
             if (!inspector.isBasicResourceOperation(name))
                 generateMethod(writer, inspector, name, justSignature);
         }
+
+        
+        if(inspector.getProperties() == null) {
+        	return;
+        }
         
         i = inspector.getProperties().iterator();
         int index = 0;
@@ -443,10 +452,10 @@
     private void generateProperties(StringBuffer writer, 
                                     ResourceInspector inspector)
     {
-        Collection properties = inspector.getProperties();
+    	Collection properties = inspector.getProperties();
         
         writer.append("\n\tQName[] PROPERTIES = {\n");
-        
+
         Iterator i = properties.iterator();
         
         while (i.hasNext())
@@ -701,6 +710,7 @@
         writer.append("import org.apache.muse.ws.addressing.soap.SoapFault;\n");
         writer.append("import java.util.Date;\n");
         writer.append("import java.util.HashMap;\n");
+        writer.append("import java.net.URI;\n");
         writer.append("import java.util.Map;\n\n");
 
         writer.append("import javax.xml.namespace.QName;\n\n");
@@ -732,13 +742,30 @@
         }
         
         writer.append(name);
+        writer.append("\", \"");
+        
+        writer.append(getPrefix(uri));
         writer.append("\")");
     }
     
-    private void generateRemoteFooter(StringBuffer writer, 
+    private String getPrefix(String uri) {
+		String prefix = (String)_prefixes.get(uri);
+		
+		if(prefix == null) {
+			prefix = "pfx" + _prefixCounter++;
+			_prefixes.put(uri, prefix);
+		}
+
+		return prefix;
+	}
+
+	private void generateRemoteFooter(StringBuffer writer, 
                                       ResourceInspector inspector)
     {
-        generateProperties(writer, inspector);
+        if(inspector.getProperties() != null) {
+        	generateProperties(writer, inspector);
+        }
+                
         writer.append("}\n");        
     }
     
@@ -760,6 +787,7 @@
         writer.append("import java.util.Date;\n\n");
         writer.append("import org.apache.muse.ws.addressing.soap.SoapFault;\n\n");
         writer.append("import javax.xml.namespace.QName;\n\n");
+        writer.append("import java.net.URI;\n");
         writer.append("import org.w3c.dom.Element;\n\n");
         
         writer.append("import org.apache.muse.ws.addressing.EndpointReference;\n");
@@ -1049,26 +1077,30 @@
     }
 	
 	public ConfigurationData synthesize(ConfigurationData data) throws Exception {
-        Document wsdlDoc = (Document) data.getParameter(ConfigurationData.WSDL_DOCUMENT);
-        Element wsdlDef = XmlUtils.getFirstElement(wsdlDoc);
-        
-        WsdlUtils.removeSchemaReferences(wsdlDef);
-        
-        ResourceInspector inspector = new ResourceInspector();
-        inspector.run(wsdlDef, _environment);
-        
-        //TODO later
-//        Element rmd = getMetadata(wsdlPath, wsdlDef, inspector);
-        
-//        if (rmd != null)
-//            inspector.setMetadata(rmd);
-        
-        String interfaceName = createInterface(wsdlDoc);
+        Document[] wsdlDocuments = (Document[]) data.getParameter(ConfigurationData.WSDL_DOCUMENT_LIST);
+        Map[] filesMaps = new HashMap[wsdlDocuments.length];	
         
-        Map files = generate(interfaceName, inspector);
+        for(int i = 0; i < wsdlDocuments.length; i++) {        
+        	Element wsdlDef = XmlUtils.getFirstElement(wsdlDocuments[i]);
+        	WsdlUtils.removeSchemaReferences(wsdlDef);
+            
+            ResourceInspector inspector = new ResourceInspector();
+            inspector.run(wsdlDef, _environment);
+            
+            //TODO later
+//          Element rmd = getMetadata(wsdlPath, wsdlDef, inspector);
+          
+//          if (rmd != null)
+//              inspector.setMetadata(rmd);
+            
+            String interfaceName = createInterface(wsdlDocuments[i]);
+            
+            filesMaps[i] = generate(interfaceName, inspector);            
+        }
         
         ConfigurationData configuration = (ConfigurationData)data.clone();
-        configuration.addParameter(ConfigurationData.FILES_MAP, files);
+        configuration.addParameter(ConfigurationData.FILES_MAP_LIST, filesMaps);
+        
         return configuration;
 	}
 	



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org