You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2007/06/26 10:27:46 UTC
svn commit: r550736 - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/template/
jaxbri/src/org/apache/axis2/jaxbri/template/
xmlbeans/src/org/apache/axis2/xmlbeans/template/
Author: amilas
Date: Tue Jun 26 01:27:45 2007
New Revision: 550736
URL: http://svn.apache.org/viewvc?view=rev&rev=550736
Log:
fixed the issue Axis2-2852 and fixed some issues with exception handling
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?view=diff&rev=550736&r1=550735&r2=550736
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl Tue Jun 26 01:27:45 2007
@@ -25,7 +25,7 @@
<xsl:value-of select="@type"/>.MY_QNAME,
org.apache.axiom.om.OMAbstractFactory.getOMFactory());
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:when>
<xsl:when test="@type = 'org.apache.axiom.om.OMElement'">
@@ -36,7 +36,7 @@
return param.getOMElement(<xsl:value-of select="@type"/>.MY_QNAME,
org.apache.axiom.om.OMAbstractFactory.getOMFactory());
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:otherwise>
</xsl:choose>
@@ -103,7 +103,7 @@
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
}
@@ -125,7 +125,7 @@
<xsl:value-of select="$inputElementType"/>.MY_QNAME,factory));
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:when>
<xsl:when test="$inputElementType = 'org.apache.axiom.om.OMElement'">
@@ -140,7 +140,7 @@
emptyEnvelope.getBody().addChild(param.getOMElement(<xsl:value-of select="$inputElementType"/>.MY_QNAME,factory));
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:otherwise>
</xsl:choose>
@@ -247,7 +247,7 @@
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
}
</xsl:if>
@@ -388,7 +388,7 @@
}
</xsl:for-each>
} catch (java.lang.Exception e) {
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
return null;
}
Modified: webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?view=diff&rev=550736&r1=550735&r2=550736
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl Tue Jun 26 01:27:45 2007
@@ -46,11 +46,14 @@
<xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
<xsl:if test="@type!=''">
- private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, org.apache.axiom.soap.SOAPFactory factory, boolean optimizeContent) {
+ private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent)
+ throws org.apache.axis2.AxisFault {
try {
javax.xml.bind.JAXBContext context = <xsl:value-of select="translate(@type,'.','_')"/>;
javax.xml.bind.Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+ marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+
+ org.apache.axiom.om.OMFactory factory = org.apache.axiom.om.OMAbstractFactory.getOMFactory();
JaxbRIDataSource source = new JaxbRIDataSource( <xsl:value-of select="@type"/>.class,
param,
@@ -61,14 +64,15 @@
null);
return factory.createOMElement(source, "<xsl:value-of select="qname/@localname"/>", namespace);
} catch (javax.xml.bind.JAXBException bex){
- throw new RuntimeException(bex);
+ throw org.apache.axis2.AxisFault.makeFault(bex);
}
}
- private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="@type"/> param, boolean optimizeContent) {
+ private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="@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, factory, optimizeContent));
+ envelope.getBody().addChild(toOM(param, optimizeContent));
}
return envelope;
}
@@ -86,14 +90,14 @@
private java.lang.Object 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 {
javax.xml.bind.JAXBContext context = classContextMap.get(type);
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
return unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), type).getValue();
} catch (javax.xml.bind.JAXBException bex){
- throw new RuntimeException(bex);
+ throw org.apache.axis2.AxisFault.makeFault(bex);
}
}
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=550736&r1=550735&r2=550736
==============================================================================
--- 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 26 01:27:45 2007
@@ -199,7 +199,7 @@
</xsl:for-each>
}catch(java.lang.Exception e){
- throw new RuntimeException("Data binding error",e);
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org