Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?view=diff&rev=546686&r1=546685&r2=546686 ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Tue Jun 12 17:33:27 2007 @@ -57,6 +57,7 @@ */ public void engage(CodeGenConfiguration configuration) throws CodeGenerationException { this.codeGenConfiguration = configuration; + if (!configuration.isParametersWrapped()) { // A check to avoid nasty surprises - Since unwrapping is not
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=546686&r1=546685&r2=546686 ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Tue Jun 12 17:33:27 2007 @@ -655,6 +655,7 @@ _operationClient.setCallback(new org.apache.axis2.client.async.Callback() { public void onComplete( org.apache.axis2.client.async.AsyncResult result) { + try{ java.lang.Object object = fromOM(result.getResponseEnvelope().getBody().getFirstElement(), <xsl:value-of select="$outputtype"/>.class, getEnvelopeNamespaces(result.getResponseEnvelope()) @@ -675,6 +676,9 @@ (<xsl:value-of select="$outputtype"/>)object); </xsl:otherwise> </xsl:choose> + } catch(org.apache.axis2.AxisFault e){ + callback.receiveError<xsl:value-of select="@name"/>(e); + } } Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?view=diff&rev=546686&r1=546685&r2=546686 ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Tue Jun 12 17:33:27 2007 @@ -235,9 +235,9 @@ msgContext.setProperty(org.apache.axis2.Constants.FAULT_NAME,"<xsl:value-of select="@localname"/>"); org.apache.axis2.AxisFault f = createAxisFault(e); - - f.setDetail(toOM(e.getFaultMessage(),false)); - + if (e.getFaultMessage() != null){ + f.setDetail(toOM(e.getFaultMessage(),false)); + } throw f; } </xsl:for-each> @@ -561,9 +561,9 @@ <xsl:if test="position()=1">}</xsl:if>catch (<xsl:value-of select="@name"/> e) { msgContext.setProperty(org.apache.axis2.Constants.FAULT_NAME,"<xsl:value-of select="@localname"/>"); org.apache.axis2.AxisFault f = createAxisFault(e); - - f.setDetail(toOM(e.getFaultMessage(),false)); - + if (e.getFaultMessage() != null){ + f.setDetail(toOM(e.getFaultMessage(),false)); + } throw f; } </xsl:for-each> Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl?view=diff&rev=546686&r1=546685&r2=546686 ============================================================================== --- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl Tue Jun 12 17:33:27 2007 @@ -822,12 +822,12 @@ <!-- shouldn't be needed when no actual binding, but called by fault conversion code so must be left in for now --> private static Object fromOM(org.apache.axiom.om.OMElement param, Class type, - java.util.Map extraNamespaces) { + java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{ try { org.jibx.runtime.impl.UnmarshallingContext ctx = getNewUnmarshalContext(param); return ctx.unmarshalElement(type); } catch (Exception e) { - throw new RuntimeException(e); + throw new org.apache.axis2.AxisFault(e.getMessage()); } } </xsl:template> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java?view=diff&rev=546686&r1=546685&r2=546686 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java Tue Jun 12 17:33:27 2007 @@ -66,6 +66,8 @@ * role (discarded) * </pre> */ + + public class AxisFault extends RemoteException { private static final long serialVersionUID = -374933082062124907L; Modified: webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl?view=diff&rev=546686&r1=546685&r2=546686 ============================================================================== --- webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl Tue Jun 12 17:33:27 2007 @@ -20,7 +20,8 @@ <xsl:for-each select="param[not(@type = preceding-sibling::param/@type) and @type!='']"> - private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent){ + private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent) + throws org.apache.axis2.AxisFault{ org.apache.axiom.om.impl.builder.StAXOMBuilder builder = new org.apache.axiom.om.impl.builder.StAXOMBuilder (org.apache.axiom.om.OMAbstractFactory.getOMFactory(),new org.apache.axis2.util.StreamWrapper(param.newXMLStreamReader())) ; org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement(); @@ -62,7 +63,7 @@ <xsl:for-each select="../../[EMAIL PROTECTED]'' and @direction='in' and @opname=$opname]/param"> <xsl:value-of select="@type"/> param<xsl:value-of select="position()"/>, </xsl:for-each><xsl:value-of select="$inputElementType"/> dummyWrappedType, - boolean optimizeContent){ + boolean optimizeContent) throws org.apache.axis2.AxisFault{ <xsl:value-of select="$inputElementType"/> wrappedType = <xsl:value-of select="$inputElementType"/>.Factory.newInstance(); @@ -95,7 +96,8 @@ </xsl:when> <xsl:otherwise> <!-- Assumption - the parameter is always an XMLBeans --> - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="$inputElementType"/> param, boolean optimizeContent){ + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="$inputElementType"/> param, boolean optimizeContent) + throws org.apache.axis2.AxisFault{ org.apache.axiom.soap.SOAPEnvelope envelope = factory.getDefaultEnvelope(); if (param != null){ envelope.getBody().addChild(toOM(param, optimizeContent)); @@ -123,7 +125,8 @@ <!-- Assumption - This is an XMLBeans element--> <xsl:if test="generate-id($outElement) = generate-id(key('paramsOut', $outElementType)[1])"> - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="../../[EMAIL PROTECTED]'' and @direction='out' and @opname=$opname]/@type"/> param, boolean optimizeContent){ + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="../../[EMAIL PROTECTED]'' and @direction='out' and @opname=$opname]/@type"/> param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { org.apache.axiom.soap.SOAPEnvelope envelope = factory.getDefaultEnvelope(); if (param != null){ envelope.getBody().addChild(toOM(param, optimizeContent)); @@ -179,7 +182,7 @@ public org.apache.xmlbeans.XmlObject fromOM( org.apache.axiom.om.OMElement param, java.lang.Class type, - java.util.Map extraNamespaces){ + java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{ try{ <xsl:for-each select="[EMAIL PROTECTED]'' and not(@primitive)]"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
