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/04/08 09:56:11 UTC
svn commit: r392493 - in /webservices/axis2/trunk/java:
etc/project.properties modules/core/conf/axis2.xml
modules/core/src/org/apache/axis2/deployment/axis2_default.xml
modules/core/src/org/apache/axis2/engine/AxisEngine.java
modules/security/project.xml
Author: chinthaka
Date: Sat Apr 8 00:56:09 2006
New Revision: 392493
URL: http://svn.apache.org/viewcvs?rev=392493&view=rev
Log:
- making axis2 to depend on axiom SNAPSHOT
- changing dom jar to depend on axiom version
- adding a flag to the axis2.xml so that sending of stacktrace with the soap fault can be controlled
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/core/conf/axis2.xml
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/security/project.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=392493&r1=392492&r2=392493&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Sat Apr 8 00:56:09 2006
@@ -88,7 +88,7 @@
#for JAM
annogen.version=0.1.0
ant.version=1.6.5
-axiom.version=1.0-RC1
+axiom.version=SNAPSHOT
axis.wsdl4j.version=1.2
backport_util_concurrent.version=2.0_01_pd
bcprov.version=jdk13-131
Modified: webservices/axis2/trunk/java/modules/core/conf/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/conf/axis2.xml?rev=392493&r1=392492&r2=392493&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/conf/axis2.xml Sat Apr 8 00:56:09 2006
@@ -5,6 +5,8 @@
<parameter name="hotdeployment" locked="false">true</parameter>
<parameter name="hotupdate" locked="false">false</parameter>
<parameter name="enableMTOM" locked="false">true</parameter>
+ <parameter name="sendStacktraceDetailsWithFaults" locked="false">false</parameter>
+
<!-- Uncomment this to enable REST support -->
<!-- <parameter name="enableREST" locked="false">true</parameter>-->
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml?rev=392493&r1=392492&r2=392493&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml Sat Apr 8 00:56:09 2006
@@ -5,6 +5,8 @@
<parameter name="hotdeployment" locked="false">true</parameter>
<parameter name="hotupdate" locked="false">false</parameter>
<parameter name="enableMTOM" locked="false">true</parameter>
+ <parameter name="sendStacktraceDetailsWithFaults" locked="false">false</parameter>
+
<!-- Uncomment this to enable REST support -->
<!-- <parameter name="enableREST" locked="false">true</parameter>-->
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=392493&r1=392492&r2=392493&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Sat Apr 8 00:56:09 2006
@@ -42,6 +42,7 @@
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.TransportSender;
@@ -387,6 +388,9 @@
}
}
+ Parameter param = context.getParameter("sendStacktraceDetailsWithFaults");
+ boolean sendStacktraceDetailsWithFaults = param != null && ((String) param.getValue()).equalsIgnoreCase("true");
+
Object faultDetail = context.getProperty(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
if (faultDetail != null) {
fault.setDetail((SOAPFaultDetail) faultDetail);
@@ -399,11 +403,11 @@
OMElement detail = axisFault.getDetail();
if (detail != null) {
fault.getDetail().addDetailEntry(detail);
- }else {
+ }else if(sendStacktraceDetailsWithFaults){
fault.setException(axisFault);
}
}
- }else if (fault.getException() == null) {
+ }else if (fault.getException() == null && sendStacktraceDetailsWithFaults) {
if (e instanceof Exception) {
fault.setException((Exception) e);
} else {
Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=392493&r1=392492&r2=392493&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Sat Apr 8 00:56:09 2006
@@ -39,7 +39,7 @@
<dependency>
<groupId>ws-commons</groupId>
<artifactId>axiom-dom</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>axis2</groupId>