You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2006/09/26 11:56:52 UTC
svn commit: r449966 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/java/
kernel/src/org/apache/axis2/engine/ xmlbeans/test/org/apache/axis2/xmlbeans/
Author: chinthaka
Date: Tue Sep 26 02:56:51 2006
New Revision: 449966
URL: http://svn.apache.org/viewvc?view=rev&rev=449966
Log:
Fixed #2, #3 and #4 of http://issues.apache.org/jira/browse/AXIS2-917#action_12437071.
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java
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=449966&r1=449965&r2=449966
==============================================================================
--- 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 Sep 26 02:56:51 2006
@@ -125,7 +125,7 @@
*/
public <xsl:value-of select="@name"/>(org.apache.axis2.context.ConfigurationContext configurationContext,
java.lang.String targetEndpoint)
- throws java.lang.Exception {
+ throws org.apache.axis2.AxisFault {
//To populate AxisService
populateAxisService();
populateFaults();
@@ -181,7 +181,7 @@
/**
* Default Constructor
*/
- public <xsl:value-of select="@name"/>() throws java.lang.Exception {
+ public <xsl:value-of select="@name"/>() throws org.apache.axis2.AxisFault {
<xsl:for-each select="endpoint">
<xsl:choose>
<xsl:when test="position()=1">
@@ -197,7 +197,7 @@
/**
* Constructor taking the target endpoint
*/
- public <xsl:value-of select="@name"/>(java.lang.String targetEndpoint) throws java.lang.Exception {
+ public <xsl:value-of select="@name"/>(java.lang.String targetEndpoint) throws org.apache.axis2.AxisFault {
this(null,targetEndpoint);
}
@@ -382,8 +382,8 @@
try{
java.lang.String exceptionClassName = (java.lang.String)faultExeptionClassNameMap.get(faultElt.getQName());
java.lang.Class exceptionClass = java.lang.Class.forName(exceptionClassName);
- java.rmi.RemoteException ex=
- (java.rmi.RemoteException)exceptionClass.newInstance();
+ java.lang.Exception ex=
+ (java.lang.Exception) exceptionClass.newInstance();
//message class
java.lang.String messageClassName = (java.lang.String)faultMessageMap.get(faultElt.getQName());
java.lang.Class messageClass = java.lang.Class.forName(messageClassName);
@@ -397,7 +397,7 @@
}
</xsl:for-each>
- throw ex;
+ throw new java.rmi.RemoteException(ex.getMessage(), ex);
}catch(java.lang.ClassCastException e){
// we cannot intantiate the class - throw the original Axis fault
throw f;
@@ -829,7 +829,7 @@
<!-- write the classes for the exceptions if there are any present -->
<xsl:for-each select="fault-list/fault">
- public static class <xsl:value-of select="@shortName"/> extends java.rmi.RemoteException{
+ public static class <xsl:value-of select="@shortName"/> extends java.lang.Exception{
private <xsl:value-of select="@type"/> faultMessage;
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=449966&r1=449965&r2=449966
==============================================================================
--- 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 Sep 26 02:56:51 2006
@@ -188,7 +188,7 @@
return returnMap;
}
- private org.apache.axis2.AxisFault createAxisFault(java.rmi.RemoteException e) {
+ private org.apache.axis2.AxisFault createAxisFault(java.lang.Exception e) {
org.apache.axis2.AxisFault f;
Throwable cause = e.getCause();
if (cause != null) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl?view=diff&rev=449966&r1=449965&r2=449966
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl Tue Sep 26 02:56:51 2006
@@ -52,7 +52,7 @@
<!-- write the classes for the exceptions if there are any present -->
<xsl:for-each select="fault-list/fault">
- public static class <xsl:value-of select="@shortName"/> extends java.rmi.RemoteException{
+ public static class <xsl:value-of select="@shortName"/> extends java.lang.Exception{
private <xsl:value-of select="@type"/> faultMessage;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?view=diff&rev=449966&r1=449965&r2=449966
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl Tue Sep 26 02:56:51 2006
@@ -61,7 +61,7 @@
<xsl:if test="not(@skeletonInterfaceName)">
<!-- write the classes for the exceptions if there are any present -->
<xsl:for-each select="fault-list/fault">
- public static class <xsl:value-of select="@shortName"/> extends java.rmi.RemoteException{
+ public static class <xsl:value-of select="@shortName"/> extends java.lang.Exception{
private <xsl:value-of select="@type"/> faultMessage;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=449966&r1=449965&r2=449966
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Tue Sep 26 02:56:51 2006
@@ -565,7 +565,7 @@
*/
public void receiveFault(MessageContext msgContext) throws AxisFault {
- log.info(Messages.getMessage("receivederrormessage",
+ log.debug(Messages.getMessage("receivederrormessage",
msgContext.getMessageID()));
ConfigurationContext confContext = msgContext.getConfigurationContext();
ArrayList preCalculatedPhases =
Modified: webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java?view=diff&rev=449966&r1=449965&r2=449966
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java Tue Sep 26 02:56:51 2006
@@ -22,7 +22,6 @@
import org.apache.axis2.wsdl.util.CommandLineOption;
import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
import org.apache.axis2.wsdl.util.CommandLineOptionParser;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target;
import org.apache.tools.ant.taskdefs.Javac;
@@ -37,7 +36,6 @@
public static final String OUTPUT_LOCATION_BASE = "./out_put_classes";
public static final String OUTPUT_LOCATION_PREFIX = "/test";
protected static int folderCount = 0;
- // public static final String OUTPUT_LOCATION_BASE = "C:\\GeneratedCode\\test4\\src";
public static final String WSDL_BASE_DIR = "test-resources/";
public static final String CLASSES_DIR = "/target/classes/";
private String[] moduleNames={"xml","common","core"};
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org