svn commit: r1343353 [2/2] - in /axis/axis2/java/core/trunk/modules: jaxws/src/org/apache/axis2/jaxws/message/util/impl/ saaj/src/org/apache/axis2/saaj/

2012-05-28 Thread veithen
Modified: 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1343353&r1=1343352&r2=1343353&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
 Mon May 28 18:27:54 2012
@@ -86,16 +86,16 @@ public class SOAPHeaderImpl extends SOAP
 throws SOAPException {
 OMNamespace ns = new NamespaceImpl(uri, prefix);
 SOAPHeaderBlock headerBlock = null;
-if (this.element.getOMFactory() instanceof SOAP11Factory) {
+if (this.target.getOMFactory() instanceof SOAP11Factory) {
 headerBlock = new SOAP11HeaderBlockImpl(localName, ns, 
omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
+
(SOAPFactory)this.target.getOMFactory());
 } else {
 headerBlock = new SOAP12HeaderBlockImpl(localName, ns, 
omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
+
(SOAPFactory)this.target.getOMFactory());
 }
 SOAPHeaderElementImpl soapHeaderElement = new 
SOAPHeaderElementImpl(headerBlock);
-element.setUserData(SAAJ_NODE, this, null);
-soapHeaderElement.element.setUserData(SAAJ_NODE, soapHeaderElement, 
null);
+target.setUserData(SAAJ_NODE, this, null);
+soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, 
null);
 soapHeaderElement.setParentElement(this);
 return soapHeaderElement;
 }
@@ -114,19 +114,19 @@ public class SOAPHeaderImpl extends SOAP
 OMNamespace ns = new NamespaceImpl(soapElement.getNamespaceURI(),
soapElement.getPrefix());
 SOAPHeaderBlock headerBlock = null;
-if (this.element.getOMFactory() instanceof SOAP11Factory) {
+if (this.target.getOMFactory() instanceof SOAP11Factory) {
 headerBlock = new 
SOAP11HeaderBlockImpl(soapElement.getLocalName(), ns,
 omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
+
(SOAPFactory)this.target.getOMFactory());
 } else {
 headerBlock = new 
SOAP12HeaderBlockImpl(soapElement.getLocalName(), ns,
 omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
+
(SOAPFactory)this.target.getOMFactory());
 
 }
 SOAPHeaderElementImpl soapHeaderElement = new 
SOAPHeaderElementImpl(headerBlock);
-element.setUserData(SAAJ_NODE, this, null);
-soapHeaderElement.element.setUserData(SAAJ_NODE, soapHeaderElement, 
null);
+target.setUserData(SAAJ_NODE, this, null);
+soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, 
null);
 soapHeaderElement.setParentElement(this);
 return soapHeaderElement;
 }
@@ -136,22 +136,22 @@ public class SOAPHeaderImpl extends SOAP
 OMNamespace ns = new NamespaceImpl(child.getNamespaceURI(),
child.getPrefix());
 SOAPHeaderBlock headerBlock = null;
-if (this.element.getOMFactory() instanceof SOAP11Factory) {
+if (this.target.getOMFactory() instanceof SOAP11Factory) {
 headerBlock = new SOAP11HeaderBlockImpl(child.getLocalName(), ns,
 omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
+
(SOAPFactory)this.target.getOMFactory());
 } else {
 headerBlock = new SOAP12HeaderBlockImpl(child.getLocalName(), ns,
 omSOAPHeader,
-
(SOAPFactory)this.element.getOMFactory());
+
(SOAPFactory)this.target.getOMFactory());
 
 }
  
-element.setUserData(SAAJ_NODE, this, null);
+target.setUserData(SAAJ_NODE, this, null);
 
 SOAPHeaderElementImpl soapHeaderElement = new 
SOAPHeaderElementImpl(headerBlock);
 copyContents(soapHeaderElement, child);
-soapHeaderElement.element.setUserData(SAAJ_NODE, soapHeaderElement, 
null);
+soapHeaderElement.target.setUserData(SAAJ_NOD

svn commit: r1343399 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java

2012-05-28 Thread veithen
Author: veithen
Date: Mon May 28 21:35:18 2012
New Revision: 1343399

URL: http://svn.apache.org/viewvc?rev=1343399&view=rev
Log:
Quick fix for build failure (not exactly sure what this code is trying to do).

Modified:

axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java

Modified: 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1343399&r1=1343398&r2=1343399&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
 Mon May 28 21:35:18 2012
@@ -20,7 +20,6 @@
 package org.apache.axis2.saaj;
 
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.dom.ChildNode;
 import org.apache.axiom.om.impl.dom.NodeImpl;
 import org.apache.axiom.om.impl.dom.TextImpl;
 import org.apache.axiom.soap.SOAPFactory;
@@ -196,7 +195,7 @@ public class SOAPEnvelopeImpl extends SO
 doomText.setNextOMSibling((OMNode)firstChild);
 doomText.setPreviousOMSibling(null);
 target.setFirstChild(doomText);
-((ChildNode)firstChild).setPreviousOMSibling(doomText);
+((NodeImpl)firstChild).setPreviousOMSibling(doomText);
 }
 return this;
 }




svn commit: r1343543 - in /axis/axis2/java/core/trunk/modules/adb: src/org/apache/axis2/databinding/utils/ConverterUtil.java test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

2012-05-28 Thread sagara
Author: sagara
Date: Tue May 29 05:25:09 2012
New Revision: 1343543

URL: http://svn.apache.org/viewvc?rev=1343543&view=rev
Log:
Applied patch for AXIS2-5331. 

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1343543&r1=1343542&r2=1343543&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Tue May 29 05:25:09 2012
@@ -333,6 +333,10 @@ public class ConverterUtil {
 return o.toString();
 }
 
+public static String convertToString(BigDecimal o) {
+return o.toPlainString();
+}
+
 public static String convertToString(Double o) {
 return o.toString();
 }

Modified: 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1343543&r1=1343542&r2=1343543&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 Tue May 29 05:25:09 2012
@@ -21,6 +21,7 @@ package org.apache.axis2.databinding.uti
 
 import junit.framework.TestCase;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -53,6 +54,15 @@ public class ConverterUtilTest extends T
 
 }
 
+public void testBigDecimal() {
+String inputString = "0.00";
+BigDecimal decimal = new BigDecimal(inputString);
+String outputString = ConverterUtil.convertToString(decimal);
+System.out.println("BigDecimal==> " + outputString);
+
+assertEquals(inputString, outputString);
+}
+
 /** integer arrays */
 public void testInt() {
 List l = new ArrayList();