cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r440644 [2/2] - in /incubator/cxf/trunk/tools: common/src/main/java/org/apache/cxf/tools/common/ common/src/main/java/org/apache/cxf/tools/common/model/ common/src/main/java/org/apache/cxf/tools/util/ wsdl2java/src/main/java/org/apache/cxf/...
Date Wed, 06 Sep 2006 07:40:24 GMT
Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ParameterProcessor.java?view=diff&rev=440644&r1=440643&r2=440644
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ParameterProcessor.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ParameterProcessor.java
Wed Sep  6 00:40:23 2006
@@ -44,9 +44,9 @@
 import org.apache.cxf.tools.util.ProcessorUtil;
 
 public class ParameterProcessor extends AbstractProcessor {
-
-    public ParameterProcessor(ProcessorEnvironment penv) {
-        super(penv);
+   
+    public ParameterProcessor(ProcessorEnvironment penv) {      
+           super(penv);
     }
 
     public void process(JavaMethod method, Message inputMessage, Message outputMessage,
@@ -90,12 +90,13 @@
         parameter.setPartName(part.getName());
         parameter.setQName(ProcessorUtil.getElementName(part));
 
-        parameter.setClassName(ProcessorUtil.getFullClzName(part, env, this.collector));
+        parameter.setClassName(ProcessorUtil.getFullClzName(part, env, this.collector, true));
 
         if (style == JavaType.Style.INOUT || style == JavaType.Style.OUT) {
             parameter.setHolder(true);
             parameter.setHolderName(javax.xml.ws.Holder.class.getName());
-            parameter.setHolderClass(ProcessorUtil.getFullClzName(part, env, true, this.collector));
+            
+            parameter.setHolderClass(ProcessorUtil.getFullClzName(part, env, this.collector,
true));
         }
         parameter.setStyle(style);
         return parameter;
@@ -145,12 +146,12 @@
         String type = part == null ? "void" : ProcessorUtil.resolvePartType(part, this.env);
  
         String namespace = part == null ? null : ProcessorUtil.resolvePartNamespace(part);
-
+              
         JavaReturn returnType = new JavaReturn(name, type, namespace);
         returnType.setQName(ProcessorUtil.getElementName(part));
         returnType.setStyle(JavaType.Style.OUT);
         if (namespace != null && type != null && !"void".equals(type)) {
-            returnType.setClassName(ProcessorUtil.getFullClzName(part, env, this.collector));
+            returnType.setClassName(ProcessorUtil.getFullClzName(part, env, this.collector,
false));
         }
         method.setReturn(returnType);
     }
@@ -175,8 +176,8 @@
             return;
         }
         Part part = inputParts.iterator().next();
-
-        List<? extends Property> block = ProcessorUtil.getBlock(part, env);
+        
+        List<? extends Property> block = dataBinder.getBlock(part);
         if (block != null) {
             if (block.size() == 0) {
                 // complete
@@ -255,11 +256,11 @@
         List<? extends Property> outputBlock = null;
         
         if (inputPart != null) {
-            inputBlock = ProcessorUtil.getBlock(inputPart, env);
+            inputBlock = dataBinder.getBlock(inputPart);
         }       
         
         if (outputPart != null) {
-            outputBlock = ProcessorUtil.getBlock(outputPart, env);
+            outputBlock = dataBinder.getBlock(outputPart);
         }
 
         if (outputBlock == null || outputBlock.size() == 0) {

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java?view=diff&rev=440644&r1=440643&r2=440644
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
Wed Sep  6 00:40:23 2006
@@ -1013,7 +1013,7 @@
             processor.process();
         } catch (Exception e) {
             assertTrue("Invalid wsdl should be diagnoised", e.getMessage()
-                .indexOf("Invalid WSDL, wsdl:operation") > -1);
+                .indexOf("Invalid WSDL,wsdl:operation") > -1);
         }
 
     }



Mime
View raw message