Author: veithen
Date: Sun May 6 11:34:36 2012
New Revision: 1334605
URL: http://svn.apache.org/viewvc?rev=1334605&view=rev
Log:
Merged latest changes from trunk.
Modified:
axis/axis2/java/core/branches/AXIOM-420/ (props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/
(props changed)
axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/AXIOM-420/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1334572-1334585
Modified:
axis/axis2/java/core/branches/AXIOM-420/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIOM-420/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java?rev=1334605&r1=1334604&r2=1334605&view=diff
==============================================================================
---
axis/axis2/java/core/branches/AXIOM-420/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
(original)
+++
axis/axis2/java/core/branches/AXIOM-420/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
Sun May 6 11:34:36 2012
@@ -288,12 +288,12 @@ public abstract class AbstractTestCase e
public static void testSerializeDeserialize(ADBBean bean, ADBBean
expectedResult) throws Exception {
testSerializeDeserializeUsingStAX(bean, expectedResult);
testSerializeDeserializeUsingOMStAXWrapper(bean, expectedResult);
-
testSerializeDeserializeWrapped(bean, expectedResult);
testSerializeDeserializeUsingMTOM(bean, expectedResult, true);
testSerializeDeserializeUsingMTOM(bean, expectedResult, false);
testSerializeDeserializeUsingMTOMWithoutOptimize(bean, expectedResult);
testSerializeDeserializePrettified(bean, expectedResult);
+ testReconstructFromGetXMLStreamReader(bean, expectedResult);
try {
Class.forName("helper." + bean.getClass().getName());
@@ -312,6 +312,7 @@ public abstract class AbstractTestCase e
testSerializeDeserializeUsingMTOM(helperModeBean,
helperModeExpectedResult, false);
testSerializeDeserializeUsingMTOMWithoutOptimize(helperModeBean,
helperModeExpectedResult);
testSerializeDeserializePrettified(helperModeBean,
helperModeExpectedResult);
+ testReconstructFromGetXMLStreamReader(helperModeBean,
helperModeExpectedResult);
}
// Deserialization approach 1: use an XMLStreamReader produced by the StAX
parser.
@@ -395,6 +396,11 @@ public abstract class AbstractTestCase e
StAXUtils.createXMLStreamReader(new
ByteArrayInputStream(baos.toByteArray()))));
}
+ private static void testReconstructFromGetXMLStreamReader(Object bean,
Object expectedResult) throws Exception {
+ OMElement omElement = ADBBeanUtil.getOMElement(bean);
+ assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(),
omElement.getXMLStreamReader()));
+ }
+
/**
* Assert that serializing the given bean should result in an {@link
ADBException}.
*
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181:r1334572-1334585*
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:r1334572-1334585
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport:r1334572-1334585*
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http:r1334572-1334585*
Propchange:
axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:r1334572-1334585
