svn commit: r1066001 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Author: ruwan
Date: Tue Feb 1 11:27:06 2011
New Revision: 1066001
URL: http://svn.apache.org/viewvc?rev=1066001&view=rev
Log:
Fixing the issue AXIS2-3296, and minor reformatting + adding docs
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1066001&r1=1066000&r2=1066001&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Tue Feb 1 11:27:06 2011
@@ -22,7 +22,6 @@ package org.apache.axis2.util;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -68,6 +67,10 @@ public class MessageContextBuilder {
/**
* Creates a new 'response' message context based on a 'request' message
context
* Only deals with properties/fields that are the same for both 'normal'
and fault responses.
+ *
+ * @param inMessageContext context for which the response will be created
+ * @return response message context for the given in message context
+ * @throws org.apache.axis2.AxisFault error in creating the response
message context
*/
private static MessageContext createResponseMessageContext(MessageContext
inMessageContext)
throws AxisFault {
@@ -116,6 +119,10 @@ public class MessageContextBuilder {
/**
* Creates a MessageContext for use with a non-fault response based on an
request MessageContext
+ *
+ * @param inMessageContext for the out message context to be created
+ * @return created out message context from the given in message context
+ * @throws org.apache.axis2.AxisFault error in creating the out message
context
*/
public static MessageContext createOutMessageContext(MessageContext
inMessageContext)
throws AxisFault {
@@ -485,6 +492,7 @@ public class MessageContextBuilder {
log.debug("faultCode != null");
}
fault.setCode((SOAPFaultCode) faultCode);
+soapFaultCode = ((SOAPFaultCode) faultCode).getText();
} else if (soapException != null) {
if(log.isDebugEnabled()){
log.debug("soapException != null");
@@ -542,6 +550,7 @@ public class MessageContextBuilder {
}
if (axisFault.getFaultCodeElement() != null) {
fault.setCode(axisFault.getFaultCodeElement());
+soapFaultCode = axisFault.getFaultCodeElement().getText();
} else {
QName faultCodeQName = axisFault.getFaultCode();
if (faultCodeQName != null) {
@@ -770,7 +779,7 @@ public class MessageContextBuilder {
if(log.isDebugEnabled()){
log.debug("stripping old prefix and adding the new one - "
+ prefix);
}
-// Strip the orginal prefix
+// Strip the original prefix
int index = soapFaultCode.indexOf(':') + 1;
soapFaultCode = soapFaultCode.substring(index);
// Use the correct prefix for the outgoing soap envelope
namespace
@@ -782,15 +791,14 @@ public class MessageContextBuilder {
}
return soapFaultCode;
}
-
-
-
/**
* By the time the exception comes here it can be wrapped by so many
levels. This will crip down
* to the root cause and get the initial error depending on the property
*
- * @param e
+ * @param e exception to get the string representation
+ * @param context current message context for which the exception occurred
+ * @return generated fault reason as a string
*/
private static String getFaultReasonFromException(Throwable e,
MessageContext context) {
Throwable throwable = e;
@@ -806,11 +814,4 @@ public class MessageContextBuilder {
return throwable.getMessage();
}
-private static String getSenderFaultCode(OMNamespace soapNamespace) {
-return
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespace.getNamespaceURI())
-? SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":"
-+ SOAP12Constants.FAULT_CODE_SENDER
-: SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":"
-+ SOAP11Constants.FAULT_CODE_SENDER;
svn commit: r1066003 - in /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl: codegen/emitter/ template/java/
Author: veithen
Date: Tue Feb 1 11:27:59 2011
New Revision: 1066003
URL: http://svn.apache.org/viewvc?rev=1066003&view=rev
Log:
Temporarily reverted r1065907 (AXIS2-4914) because it causes a regression.
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=1066003&r1=1066002&r2=1066003&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Tue Feb 1 11:27:59 2011
@@ -2279,20 +2279,11 @@ public class AxisServiceBasedMultiLangua
String localPart = axisOperation.getName().getLocalPart();
if (this.codeGenConfiguration.isUseOperationName()) {
-String temp = JavaUtils.xmlNameToJava(localPart);
-addAttribute(doc, "name", temp, methodElement);
-// we need first character capitalized version at times,
-// to preserve the CamelCase name generation
-addAttribute(doc,"firstCharCapitalizedName",
-JavaUtils.capitalizeFirstChar(temp), methodElement);
+addAttribute(doc, "name", JavaUtils.xmlNameToJava(localPart),
methodElement);
} else {
-String temp = JavaUtils.xmlNameToJavaIdentifier(localPart);
-addAttribute(doc, "name", temp , methodElement);
-// we need first character capitalized version at times,
-// to preserve the CamelCase name generation
-addAttribute(doc,"firstCharCapitalizedName",
-JavaUtils.capitalizeFirstChar(temp), methodElement);
+addAttribute(doc, "name",
JavaUtils.xmlNameToJavaIdentifier(localPart), methodElement);
}
+
addAttribute(doc, "originalName", localPart, methodElement);
addAttribute(doc, "namespace",
axisOperation.getName().getNamespaceURI(), methodElement);
addAttribute(doc, "style", (String) getBindingPropertyFromOperation(
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl?rev=1066003&r1=1066002&r2=1066003&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
Tue Feb 1 11:27:59 2011
@@ -79,7 +79,7 @@
* auto generated Axis2 call back method for method
* override this method for handling normal response from
operation
*/
- public void receiveResult(
+ public void receiveResult(
result
@@ -99,7 +99,7 @@
* auto generated Axis2 Error handler
* override this method for handling error response from
operation
*/
-public void receiveError(java.lang.Exception e) {
+public void receiveError(java.lang.Exception e) {
}
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=1066003&r1=1066002&r2=1066003&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
svn commit: r1066007 - in /axis/axis2/java/core/trunk/modules/tool: axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java axis2-mar-maven-plugin/src/main/java/org/apache/axis2/
Author: veithen
Date: Tue Feb 1 11:39:50 2011
New Revision: 1066007
URL: http://svn.apache.org/viewvc?rev=1066007&view=rev
Log:
Eliminated two deprecation warnings emitted by maven-plugin-plugin.
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java?rev=1066007&r1=1066006&r2=1066007&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
Tue Feb 1 11:39:50 2011
@@ -59,7 +59,7 @@ public class AarMojo extends AbstractAar
/**
* The Jar archiver.
*
- * @parameter
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+ * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
* @required
*/
private JarArchiver jarArchiver;
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java?rev=1066007&r1=1066006&r2=1066007&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
Tue Feb 1 11:39:50 2011
@@ -60,7 +60,7 @@ public class MarMojo extends AbstractMar
/**
* The Jar archiver.
*
- * @parameter
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+ * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
* @required
*/
private JarArchiver jarArchiver;
svn commit: r1066021 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: veithen
Date: Tue Feb 1 12:05:18 2011
New Revision: 1066021
URL: http://svn.apache.org/viewvc?rev=1066021&view=rev
Log:
Upgrade to latest version of maven-plugin-plugin, just in case the
InvalidPluginDescriptorException seen in downstream projects is caused by an
issue in that plugin.
Modified:
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1066021&r1=1066020&r2=1066021&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue Feb 1 12:05:18 2011
@@ -102,7 +102,6 @@
1.2.15
2.2
2.0.8
-2.5
1.1
2.0.7
1.4.9
@@ -992,7 +991,7 @@
maven-plugin-plugin
-2.5
+2.6
maven-rar-plugin
@@ -1072,11 +1071,6 @@
-org.apache.maven.plugins
-maven-plugin-plugin
-${maven.plugin.version}
-
-
maven-clean-plugin
false
svn commit: r1066028 - /axis/axis2/java/transports/trunk/modules/jms/pom.xml
Author: supun Date: Tue Feb 1 12:27:31 2011 New Revision: 1066028 URL: http://svn.apache.org/viewvc?rev=1066028&view=rev Log: adding dynamic import to the jms bundle Modified: axis/axis2/java/transports/trunk/modules/jms/pom.xml Modified: axis/axis2/java/transports/trunk/modules/jms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/pom.xml?rev=1066028&r1=1066027&r2=1066028&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/jms/pom.xml Tue Feb 1 12:27:31 2011 @@ -101,6 +101,7 @@ javax.xml.namespace; version=0.0.0, *; resolution:=optional +*
svn commit: r1066083 - in /axis/axis2/java/core/branches/1_5: ./ modules/adb/src/org/apache/axis2/databinding/utils/ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modu
Author: veithen Date: Tue Feb 1 16:28:29 2011 New Revision: 1066083 URL: http://svn.apache.org/viewvc?rev=1066083&view=rev Log: AXIS2-4402: Merged r787379 to the 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 1 16:28:29 2011 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,103 2694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170 -/webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,896320,902271,904660,904780,905980,908318 +/webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151
