Modified: axis/axis2/java/core/branches/AXIOM-420/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIOM-420/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java?rev=1334574&r1=1334573&r2=1334574&view=diff ============================================================================== --- axis/axis2/java/core/branches/AXIOM-420/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java (original) +++ axis/axis2/java/core/branches/AXIOM-420/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java Sun May 6 08:55:09 2012 @@ -28,8 +28,6 @@ import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.impl.serialize.StreamingOMSerializer; import org.apache.axiom.om.util.Base64; import org.apache.axiom.om.util.StAXUtils; -import org.apache.axis2.databinding.ADBBean; -import org.apache.axis2.databinding.ADBException; import org.apache.axis2.databinding.utils.Constants; import org.apache.axis2.util.StreamWrapper; import org.custommonkey.xmlunit.XMLTestCase; @@ -61,281 +59,198 @@ public class ADBXMLStreamReaderTest exte } /** complex array scenario */ - public void testComplexObjectArrayScenario() { - try { - String expectedXML = - "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + - "<Foo>Some Text</Foo>" + - "<Dependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</Dependent>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<Bar>Some More Text</Bar><" + - "/ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - propertyList.add("Foo"); - propertyList.add("Some Text"); - propertyList.add(new QName("Dependent")); - DummyADBBean dummyBean = new DummyADBBean(); - propertyList.add(dummyBean); - - ADBBean[] adbBeans = new ADBBean[4]; - for (int i = 0; i < 4; i++) { - adbBeans[i] = new DummyADBBean(); - } - for (int i = 0; i < adbBeans.length; i++) { - propertyList.add(new QName("AdditionalDependent")); - propertyList.add(adbBeans[i]); - - } - - propertyList.add("Bar"); - propertyList.add("Some More Text"); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl(new QName( - "http://testComplexStringArrayScenario.org";, "TestComplexStringArrayScenario", - "ns1"), propertyList.toArray(), null); - String actualXML = getStringXML(pullParser); - - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); + public void testComplexObjectArrayScenario() throws Exception { + String expectedXML = + "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + + "<Foo>Some Text</Foo>" + + "<Dependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</Dependent>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<Bar>Some More Text</Bar><" + + "/ns1:TestComplexStringArrayScenario>"; + + ArrayList propertyList = new ArrayList(); + propertyList.add("Foo"); + propertyList.add("Some Text"); + propertyList.add(new QName("Dependent")); + DummyBean dummyBean = new DummyBean(); + propertyList.add(dummyBean); + + DummyBean[] beans = new DummyBean[4]; + for (int i = 0; i < 4; i++) { + beans[i] = new DummyBean(); + } + for (int i = 0; i < beans.length; i++) { + propertyList.add(new QName("AdditionalDependent")); + propertyList.add(beans[i]); + } + + propertyList.add("Bar"); + propertyList.add("Some More Text"); + + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl(new QName( + "http://testComplexStringArrayScenario.org";, "TestComplexStringArrayScenario", + "ns1"), propertyList.toArray(), null); + String actualXML = getStringXML(pullParser); + + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** complex array scenario with nulls in between */ - public void testComplexObjectArrayScenarioWithNulls() { - try { - String expectedXML = - "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<AdditionalDependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</AdditionalDependent>" + - "<AdditionalDependent xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";>" + - "</AdditionalDependent>" + - "<Bar>Some More Text</Bar><" + - "/ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - - ADBBean[] adbBeans = new ADBBean[4]; - for (int i = 0; i < 4; i++) { - adbBeans[i] = new DummyADBBean(); - } - - adbBeans[3] = null; - - for (int i = 0; i < adbBeans.length; i++) { - propertyList.add(new QName("AdditionalDependent")); - propertyList.add(adbBeans[i]); - - } - - propertyList.add("Bar"); - propertyList.add("Some More Text"); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl(new QName( - "http://testComplexStringArrayScenario.org";, "TestComplexStringArrayScenario", - "ns1"), propertyList.toArray(), null); - String actualXML = getStringXML(pullParser); - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); + public void testComplexObjectArrayScenarioWithNulls() throws Exception { + String expectedXML = + "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<AdditionalDependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</AdditionalDependent>" + + "<AdditionalDependent xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";>" + + "</AdditionalDependent>" + + "<Bar>Some More Text</Bar><" + + "/ns1:TestComplexStringArrayScenario>"; + + ArrayList propertyList = new ArrayList(); + + DummyBean[] beans = new DummyBean[4]; + for (int i = 0; i < 4; i++) { + beans[i] = new DummyBean(); } - } - /** Empty array */ - public void testComplexObjectArrayScenarioEmptyArray() { - try { - String expectedXML = - "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + - "<Foo>Some Text</Foo>" + - "<Dependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</Dependent>" + - "<Bar>Some More Text</Bar><" + - "/ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - propertyList.add("Foo"); - propertyList.add("Some Text"); - propertyList.add(new QName("Dependent")); - DummyADBBean dummyBean = new DummyADBBean(); - propertyList.add(dummyBean); + beans[3] = null; - String[] array = new String[] {}; + for (int i = 0; i < beans.length; i++) { propertyList.add(new QName("AdditionalDependent")); - propertyList.add(array); + propertyList.add(beans[i]); - propertyList.add("Bar"); - propertyList.add("Some More Text"); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testComplexStringArrayScenario.org";, - "TestComplexStringArrayScenario", "ns1"), - propertyList.toArray(), - null); - String actualXML = getStringXML(pullParser); - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); } - } - /** test a complex array list */ - public void testComplexArrayList() { - try { + propertyList.add("Bar"); + propertyList.add("Some More Text"); - String exptectedXML = "<Person><Name>FooOne</Name><Organization>Apache</Organization>" + - "<Dependent><Name>FooTwo</Name><Age>25</Age><Sex>Male</Sex><Depemdent>" + - "<Name>FooTwo</Name><Age>25</Age><Sex>Male</Sex><Depemdent><Name>FooTwo</Name>" + - "<Age>25</Age><Sex>Male</Sex></Depemdent></Depemdent></Dependent>" + - "<test:Dependent xmlns:test=\"http://whatever.com\";><Name>FooTwo</Name><Age>25</Age>" + - "<Sex>Male</Sex><Depemdent><Name>FooTwo</Name><Age>25</Age><Sex>Male</Sex>" + - "</Depemdent></test:Dependent></Person>"; - - - ArrayList propertyList = new ArrayList(); - propertyList.add("Name"); - propertyList.add("FooOne"); - - propertyList.add("Organization"); - propertyList.add("Apache"); - - propertyList.add(new QName("Dependent")); - DummyADBBean dummyBean = new DummyADBBean(); - DummyADBBean nextdummyBean = dummyBean.addAnotherBean(); - nextdummyBean.addAnotherBean(); - propertyList.add(dummyBean); - - propertyList.add(new QName("http://whatever.com";, "Dependent", "test")); - dummyBean = new DummyADBBean(); - dummyBean.addAnotherBean(); - propertyList.add(dummyBean); - - QName projectQName = new QName("Person"); - XMLStreamReader pullParser = - new ADBXMLStreamReaderImpl(projectQName, propertyList.toArray(), null); - - Document actualDom = newDocument(getStringXML(pullParser)); - Document expectedDocument = newDocument(exptectedXML); - assertXMLEqual(actualDom, expectedDocument); - } catch (ParserConfigurationException e) { - fail("Exception in parsing documents " + e); - } catch (SAXException e) { - fail("Exception in parsing documents " + e); - } catch (IOException e) { - fail("Exception in parsing documents " + e); - } catch (XMLStreamException e) { - fail("Exception in parsing documents " + e); - } + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl(new QName( + "http://testComplexStringArrayScenario.org";, "TestComplexStringArrayScenario", + "ns1"), propertyList.toArray(), null); + String actualXML = getStringXML(pullParser); + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } - public static class DummyADBBean implements ADBBean { + /** Empty array */ + public void testComplexObjectArrayScenarioEmptyArray() throws Exception { + String expectedXML = + "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + + "<Foo>Some Text</Foo>" + + "<Dependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</Dependent>" + + "<Bar>Some More Text</Bar><" + + "/ns1:TestComplexStringArrayScenario>"; + ArrayList propertyList = new ArrayList(); + propertyList.add("Foo"); + propertyList.add("Some Text"); + propertyList.add(new QName("Dependent")); + DummyBean dummyBean = new DummyBean(); + propertyList.add(dummyBean); - public DummyADBBean() { - propertyList.add("Name"); - propertyList.add("FooTwo"); - propertyList.add("Age"); - propertyList.add("25"); - propertyList.add("Sex"); - propertyList.add("Male"); - } + String[] array = new String[] {}; + propertyList.add(new QName("AdditionalDependent")); + propertyList.add(array); + + propertyList.add("Bar"); + propertyList.add("Some More Text"); + + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testComplexStringArrayScenario.org";, + "TestComplexStringArrayScenario", "ns1"), + propertyList.toArray(), + null); + String actualXML = getStringXML(pullParser); + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); + } - public DummyADBBean addAnotherBean() { - propertyList.add(new QName("Depemdent")); - DummyADBBean dummyBean = new DummyADBBean(); - propertyList.add(dummyBean); - return dummyBean; - } + /** test a complex array list */ + public void testComplexArrayList() throws Exception { + String exptectedXML = "<Person><Name>FooOne</Name><Organization>Apache</Organization>" + + "<Dependent><age>25</age><dependent><age>25</age><dependent><age>25</age>" + + "<name>FooTwo</name><sex>Male</sex></dependent><name>FooTwo</name><sex>Male</sex>" + + "</dependent><name>FooTwo</name><sex>Male</sex></Dependent>" + + "<test:Dependent xmlns:test=\"http://whatever.com\";><test:age>25</test:age>" + + "<test:dependent><test:age>25</test:age><test:name>FooTwo</test:name>" + + "<test:sex>Male</test:sex></test:dependent><test:name>FooTwo</test:name>" + + "<test:sex>Male</test:sex></test:Dependent></Person>"; - public XMLStreamReader getPullParser(QName adbBeanQName) { - return new ADBXMLStreamReaderImpl(adbBeanQName, propertyList.toArray(), null); - } - public OMElement getOMElement(QName parentQName, OMFactory factory) throws ADBException { - throw new UnsupportedOperationException("Unimplemented method"); - } + ArrayList propertyList = new ArrayList(); + propertyList.add("Name"); + propertyList.add("FooOne"); - public void serialize(final QName parentQName, - XMLStreamWriter xmlWriter) - throws XMLStreamException, ADBException { - serialize(parentQName,xmlWriter,false); - } + propertyList.add("Organization"); + propertyList.add("Apache"); - public void serialize(final QName parentQName, - XMLStreamWriter xmlWriter, - boolean serializeType) - throws XMLStreamException, ADBException { - throw new UnsupportedOperationException("Unimplemented method"); - } + propertyList.add(new QName("Dependent")); + DummyBean dummyBean = new DummyBean(); + DummyBean nextdummyBean = dummyBean.addAnotherBean(); + nextdummyBean.addAnotherBean(); + propertyList.add(dummyBean); + + propertyList.add(new QName("http://whatever.com";, "Dependent", "test")); + dummyBean = new DummyBean(); + dummyBean.addAnotherBean(); + propertyList.add(dummyBean); + + QName projectQName = new QName("Person"); + XMLStreamReader pullParser = + new ADBXMLStreamReaderImpl(projectQName, propertyList.toArray(), null); + + Document actualDom = newDocument(getStringXML(pullParser)); + Document expectedDocument = newDocument(exptectedXML); + assertXMLEqual(actualDom, expectedDocument); } - public void testWithOMElements() throws XMLStreamException { + public void testWithOMElements() throws Exception { String expectedXML = "<OMElementTest><axis2:FirstOMElement xmlns:axis2=\"http://ws.apache.org/namespaces/axis2\";>" + "<axis2:SecondOMElement></axis2:SecondOMElement></axis2:FirstOMElement><Foo>Some Text</Foo>" + - "<Dependent><Name>FooTwo</Name><Age>25</Age><Sex>Male</Sex></Dependent>" + + "<Dependent><age>25</age><name>FooTwo</name><sex>Male</sex></Dependent>" + "<axis2:SecondOMElement xmlns:axis2=\"http://ws.apache.org/namespaces/axis2\";>" + "</axis2:SecondOMElement></OMElementTest>"; @@ -357,7 +272,7 @@ public class ADBXMLStreamReaderTest exte propertyList.add("Foo"); propertyList.add("Some Text"); propertyList.add(new QName("Dependent")); - DummyADBBean dummyBean = new DummyADBBean(); + DummyBean dummyBean = new DummyBean(); propertyList.add(dummyBean); // lets add one more element @@ -368,243 +283,174 @@ public class ADBXMLStreamReaderTest exte XMLStreamReader pullParser = new ADBXMLStreamReaderImpl(new QName("OMElementTest"), propertyList.toArray(), null); String stringXML = getStringXML(pullParser); - try { - Document actualDom = newDocument(stringXML); - Document expectedDocument = newDocument(expectedXML); - assertXMLEqual(actualDom, expectedDocument); - } catch (ParserConfigurationException e) { - fail("Exception in parsing documents " + e); - } catch (SAXException e) { - fail("Exception in parsing documents " + e); - } catch (IOException e) { - fail("Exception in parsing documents " + e); - } - + Document actualDom = newDocument(stringXML); + Document expectedDocument = newDocument(expectedXML); + assertXMLEqual(actualDom, expectedDocument); } /** Test a completely null element */ - public void testNullableAttribute() { - try { - - /* - This is what I expect : - - */ - String exptectedXML = - "<Person xmlns=\"\"><Name xmlns=\"\">FooOne</Name><DependentOne xmlns=\"\" " + - "xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" + - "</Person>"; - - ArrayList propertyList = new ArrayList(); - propertyList.add("Name"); - propertyList.add("FooOne"); - propertyList.add(new QName("DependentOne")); - propertyList.add(null); - - QName projectQName = new QName("Person"); - XMLStreamReader pullParser = - new ADBXMLStreamReaderImpl(projectQName, propertyList.toArray(), null); - - Document actualDom = newDocument(getStringXML(pullParser)); - Document expectedDocument = newDocument(exptectedXML); - assertXMLEqual(actualDom, expectedDocument); - } catch (ParserConfigurationException e) { - fail("Exception in parsing documents " + e); - } catch (SAXException e) { - fail("Exception in parsing documents " + e); - } catch (IOException e) { - fail("Exception in parsing documents " + e); - } catch (XMLStreamException e) { - fail("Exception in parsing documents " + e); - } + public void testNullableAttribute() throws Exception { + /* + This is what I expect : + + */ + String exptectedXML = + "<Person xmlns=\"\"><Name xmlns=\"\">FooOne</Name><DependentOne xmlns=\"\" " + + "xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" + + "</Person>"; + ArrayList propertyList = new ArrayList(); + propertyList.add("Name"); + propertyList.add("FooOne"); + propertyList.add(new QName("DependentOne")); + propertyList.add(null); + + QName projectQName = new QName("Person"); + XMLStreamReader pullParser = + new ADBXMLStreamReaderImpl(projectQName, propertyList.toArray(), null); + + Document actualDom = newDocument(getStringXML(pullParser)); + Document expectedDocument = newDocument(exptectedXML); + assertXMLEqual(actualDom, expectedDocument); } /** Test a simple array */ - public void testSimpleStringArrayScenario() { - try { - String expectedXML = - "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + - "<StringInfo><array>Some Text 0</array>" + - "<array>Some Text 1</array>" + - "<array>Some Text 2</array>" + - "<array>Some Text 3</array></StringInfo>" + - "</ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - - String[] stringArray = new String[4]; - for (int i = 0; i < 4; i++) { - stringArray[i] = "Some Text " + i; - } - propertyList.add("StringInfo"); - propertyList.add(stringArray); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testComplexStringArrayScenario.org";, - "TestComplexStringArrayScenario", "ns1"), - propertyList.toArray(), null); - String actualXML = getStringXML(pullParser); - - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (XMLStreamException e) { - fail("Error has occurred " + e); + public void testSimpleStringArrayScenario() throws Exception { + String expectedXML = + "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + + "<StringInfo><array>Some Text 0</array>" + + "<array>Some Text 1</array>" + + "<array>Some Text 2</array>" + + "<array>Some Text 3</array></StringInfo>" + + "</ns1:TestComplexStringArrayScenario>"; + + ArrayList propertyList = new ArrayList(); + + String[] stringArray = new String[4]; + for (int i = 0; i < 4; i++) { + stringArray[i] = "Some Text " + i; } + propertyList.add("StringInfo"); + propertyList.add(stringArray); + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testComplexStringArrayScenario.org";, + "TestComplexStringArrayScenario", "ns1"), + propertyList.toArray(), null); + String actualXML = getStringXML(pullParser); + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** Test a simple array with null's inbetween */ - public void testSimpleStringArrayScenarioWithNulls() { - try { - String expectedXML = - "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + - "<StringInfo><array>Some Text 0</array>" + - "<array xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" + - "<array>Some Text 2</array>" + - "<array>Some Text 3</array></StringInfo>" + - "</ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - - String[] stringArray = new String[4]; - for (int i = 0; i < 4; i++) { - stringArray[i] = "Some Text " + i; - } - stringArray[1] = null; - - propertyList.add("StringInfo"); - propertyList.add(stringArray); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testComplexStringArrayScenario.org";, - "TestComplexStringArrayScenario", "ns1"), - propertyList.toArray(), null); - String actualXML = getStringXML(pullParser); - - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (XMLStreamException e) { - fail("Error has occurred " + e); + public void testSimpleStringArrayScenarioWithNulls() throws Exception { + String expectedXML = + "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + + "<StringInfo><array>Some Text 0</array>" + + "<array xsi:nil=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>" + + "<array>Some Text 2</array>" + + "<array>Some Text 3</array></StringInfo>" + + "</ns1:TestComplexStringArrayScenario>"; + + ArrayList propertyList = new ArrayList(); + + String[] stringArray = new String[4]; + for (int i = 0; i < 4; i++) { + stringArray[i] = "Some Text " + i; } + stringArray[1] = null; + + propertyList.add("StringInfo"); + propertyList.add(stringArray); + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testComplexStringArrayScenario.org";, + "TestComplexStringArrayScenario", "ns1"), + propertyList.toArray(), null); + String actualXML = getStringXML(pullParser); + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** test the mixed content */ - public void testComplexStringArrayScenarioWithMixedContent() { - try { - String expectedXML = - "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + - "<Foo>Some Text</Foo>" + - "<Dependent>" + - "<Name>FooTwo</Name>" + - "<Age>25</Age>" + - "<Sex>Male</Sex>" + - "</Dependent>" + - "<StringInfo><array>Some Text 0</array>" + - "<array>Some Text 1</array>" + - "<array>Some Text 2</array>" + - "<array>Some Text 3</array></StringInfo>" + - "<Bar>Some More Text</Bar>" + - "</ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - propertyList.add("Foo"); - propertyList.add("Some Text"); - propertyList.add(new QName("Dependent")); - DummyADBBean dummyBean = new DummyADBBean(); - propertyList.add(dummyBean); - - String[] stringArray = new String[4]; - for (int i = 0; i < 4; i++) { - stringArray[i] = "Some Text " + i; - } - propertyList.add("StringInfo"); - propertyList.add(stringArray); - - propertyList.add("Bar"); - propertyList.add("Some More Text"); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testComplexStringArrayScenario.org";, - "TestComplexStringArrayScenario", "ns1"), - propertyList.toArray(), - null); - String actualXML = getStringXML(pullParser); - - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); + public void testComplexStringArrayScenarioWithMixedContent() throws Exception { + String expectedXML = + "<ns1:TestComplexStringArrayScenario xmlns:ns1=\"http://testComplexStringArrayScenario.org\";>" + + "<Foo>Some Text</Foo>" + + "<Dependent>" + + "<age>25</age>" + + "<name>FooTwo</name>" + + "<sex>Male</sex>" + + "</Dependent>" + + "<StringInfo><array>Some Text 0</array>" + + "<array>Some Text 1</array>" + + "<array>Some Text 2</array>" + + "<array>Some Text 3</array></StringInfo>" + + "<Bar>Some More Text</Bar>" + + "</ns1:TestComplexStringArrayScenario>"; + + ArrayList propertyList = new ArrayList(); + propertyList.add("Foo"); + propertyList.add("Some Text"); + propertyList.add(new QName("Dependent")); + DummyBean dummyBean = new DummyBean(); + propertyList.add(dummyBean); + + String[] stringArray = new String[4]; + for (int i = 0; i < 4; i++) { + stringArray[i] = "Some Text " + i; } + propertyList.add("StringInfo"); + propertyList.add(stringArray); + propertyList.add("Bar"); + propertyList.add("Some More Text"); + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testComplexStringArrayScenario.org";, + "TestComplexStringArrayScenario", "ns1"), + propertyList.toArray(), + null); + String actualXML = getStringXML(pullParser); + + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** Test a simple array with one element nil */ - public void testComplexStringArrayScenarioWithNull() { - try { - String expectedXML = "<ns1:TestComplexStringArrayScenario " + - "xmlns:ns1=\"http://testComplexStringArrayScenario.org\"; " + - ">" + - "<StringInfo><array>Some Text 0</array>" + - "<array xsi:nil=\"true\" " + - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";></array>" + - "<array>Some Text 2</array>" + - "<array>Some Text 3</array></StringInfo>" + - "</ns1:TestComplexStringArrayScenario>"; - - ArrayList propertyList = new ArrayList(); - - String[] stringArray = new String[4]; - for (int i = 0; i < 4; i++) { - if (i != 1) stringArray[i] = "Some Text " + i; - } - stringArray[1] = null; - - propertyList.add("StringInfo"); - propertyList.add(stringArray); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testComplexStringArrayScenario.org";, - "TestComplexStringArrayScenario", "ns1"), - propertyList.toArray(), null); - String actualXML = getStringXML(pullParser); - - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (XMLStreamException e) { - fail("Error has occurred " + e); + public void testComplexStringArrayScenarioWithNull() throws Exception { + String expectedXML = "<ns1:TestComplexStringArrayScenario " + + "xmlns:ns1=\"http://testComplexStringArrayScenario.org\"; " + + ">" + + "<StringInfo><array>Some Text 0</array>" + + "<array xsi:nil=\"true\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";></array>" + + "<array>Some Text 2</array>" + + "<array>Some Text 3</array></StringInfo>" + + "</ns1:TestComplexStringArrayScenario>"; + + ArrayList propertyList = new ArrayList(); + + String[] stringArray = new String[4]; + for (int i = 0; i < 4; i++) { + if (i != 1) stringArray[i] = "Some Text " + i; } + stringArray[1] = null; + + propertyList.add("StringInfo"); + propertyList.add(stringArray); + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testComplexStringArrayScenario.org";, + "TestComplexStringArrayScenario", "ns1"), + propertyList.toArray(), null); + String actualXML = getStringXML(pullParser); + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** @@ -612,7 +458,7 @@ public class ADBXMLStreamReaderTest exte * * @throws XMLStreamException */ - public void testAttributes() throws XMLStreamException { + public void testAttributes() throws Exception { String expectedXML = "<emp:Employee xmlns:emp=\"http://ec.org/software\"; Attr2=\"Value 2\" " + @@ -636,48 +482,28 @@ public class ADBXMLStreamReaderTest exte String stringXML = getStringXML(new ADBXMLStreamReaderImpl(elementQName, null, omAttribList.toArray())); - try { - Document actualDom = newDocument(stringXML); - Document expectedDocument = newDocument(expectedXML); - assertXMLEqual(actualDom, expectedDocument); - } catch (ParserConfigurationException e) { - fail("Exception in parsing documents " + e); - } catch (SAXException e) { - fail("Exception in parsing documents " + e); - } catch (IOException e) { - fail("Exception in parsing documents " + e); - } - - + Document actualDom = newDocument(stringXML); + Document expectedDocument = newDocument(expectedXML); + assertXMLEqual(actualDom, expectedDocument); } /** A text only element */ - public void testElementText() { + public void testElementText() throws Exception { String expectedXML = "<ns1:testElementText xmlns:ns1=\"http://testElementText.org\";>" + "This is some Text for the element</ns1:testElementText>"; - try { - ArrayList properties = new ArrayList(); - properties.add(ADBXMLStreamReader.ELEMENT_TEXT); - properties.add("This is some Text for the element"); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testElementText.org";, "testElementText", "ns1"), - properties.toArray(), null); - - String actualXML = getStringXML(pullParser); - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - e.printStackTrace(); - fail("Error has occurred " + e); - } + + ArrayList properties = new ArrayList(); + properties.add(ADBXMLStreamReader.ELEMENT_TEXT); + properties.add("This is some Text for the element"); + + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testElementText.org";, "testElementText", "ns1"), + properties.toArray(), null); + + String actualXML = getStringXML(pullParser); + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /// todo Fails due to a bug in WSTX writer @@ -724,43 +550,34 @@ public class ADBXMLStreamReaderTest exte // } /** test for qualified attributes */ - public void testUnQualifiedAttributes() { + public void testUnQualifiedAttributes() throws Exception { String expectedXML = "<ns1:testElementText xmlns:ns1=\"http://testElementText.org\"; MyUnQualifiedAttribute=\"MyAttributeValue\">" + "<ns2:QualifiedElement xmlns:ns2=\"http://testQElementText.org\";>" + "This is some Text for the element</ns2:QualifiedElement></ns1:testElementText>"; - try { - ArrayList properties = new ArrayList(); - properties.add(new QName("http://testQElementText.org";, "QualifiedElement", "ns2")); - properties.add("This is some Text for the element"); - - String[] attributes = new String[2]; - attributes[0] = "MyUnQualifiedAttribute"; - attributes[1] = "MyAttributeValue"; - - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testElementText.org";, "testElementText", "ns1"), - properties.toArray(), - attributes); - - String actualXML = getStringXML(pullParser); - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); - } + + ArrayList properties = new ArrayList(); + properties.add(new QName("http://testQElementText.org";, "QualifiedElement", "ns2")); + properties.add("This is some Text for the element"); + + String[] attributes = new String[2]; + attributes[0] = "MyUnQualifiedAttribute"; + attributes[1] = "MyAttributeValue"; + + + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testElementText.org";, "testElementText", "ns1"), + properties.toArray(), + attributes); + + String actualXML = getStringXML(pullParser); + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** test for base64 */ - public void testBase64EncodedText() { + public void testBase64EncodedText() throws Exception { String textTobeSent = "33344MthwrrewrIOTEN)(&**^E(W)EW"; @@ -768,57 +585,39 @@ public class ADBXMLStreamReaderTest exte "<ns2:QualifiedElement xmlns:ns2=\"http://testQElementText.org\";>" + Base64.encode(textTobeSent.getBytes()) + "</ns2:QualifiedElement></ns1:testElementText>"; - try { - ArrayList properties = new ArrayList(); - properties.add(new QName("http://testQElementText.org";, "QualifiedElement", "ns2")); - properties.add(new DataHandler(new ByteArrayDataSource(textTobeSent.getBytes()))); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testElementText.org";, "testElementText", "ns1"), - properties.toArray(), - null); - - String actualXML = getStringXML(pullParser); - - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); - } + + ArrayList properties = new ArrayList(); + properties.add(new QName("http://testQElementText.org";, "QualifiedElement", "ns2")); + properties.add(new DataHandler(new ByteArrayDataSource(textTobeSent.getBytes()))); + + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testElementText.org";, "testElementText", "ns1"), + properties.toArray(), + null); + + String actualXML = getStringXML(pullParser); + + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /** test the qualified elements A qulified element has been associated with a namespace */ - public void testQualifiedElement() { + public void testQualifiedElement() throws Exception { String expectedXML = "<ns1:testElementText xmlns:ns1=\"http://testElementText.org\";>" + "<ns2:QualifiedElement xmlns:ns2=\"http://testQElementText.org\";>" + "This is some Text for the element</ns2:QualifiedElement></ns1:testElementText>"; - try { - ArrayList properties = new ArrayList(); - properties.add(new QName("http://testQElementText.org";, "QualifiedElement", "ns2")); - properties.add("This is some Text for the element"); - - XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( - new QName("http://testElementText.org";, "testElementText", "ns1"), - properties.toArray(), - null); - - String actualXML = getStringXML(pullParser); - assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); - } catch (ParserConfigurationException e) { - fail("Error has occurred " + e); - } catch (SAXException e) { - fail("Error has occurred " + e); - } catch (IOException e) { - fail("Error has occurred " + e); - } catch (Exception e) { - fail("Error has occurred " + e); - } + + ArrayList properties = new ArrayList(); + properties.add(new QName("http://testQElementText.org";, "QualifiedElement", "ns2")); + properties.add("This is some Text for the element"); + + XMLStreamReader pullParser = new ADBXMLStreamReaderImpl( + new QName("http://testElementText.org";, "testElementText", "ns1"), + properties.toArray(), + null); + + String actualXML = getStringXML(pullParser); + assertXMLEqual(newDocument(expectedXML), newDocument(actualXML)); } /**
Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,6 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181:1334386-1334571* +/webservices/axis/trunk/java/modules/kernel/src/org/apache/axis2/jsr181:37391-264829* +/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/jsr181:453183-475225* +/webservices/axis2/branches/java/new-trunk/modules/kernel/src/org/apache/axis2/jsr181:475226-475354* +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181:264830-453182*,475355-804715* Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/kernel/src/org/apache/axis2/jsr181/package-info.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:1295540 +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:475355-804715 Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,6 @@ +/axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport:1295540 +/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport:1334386-1334571* +/webservices/axis/trunk/java/modules/webapp/src/main/java/org/apache/axis2/transport:37391-264829* +/webservices/axis2/branches/java/1_1/modules/webapp/src/main/java/org/apache/axis2/transport:453183-475225* +/webservices/axis2/branches/java/new-trunk/modules/webapp/src/main/java/org/apache/axis2/transport:475226-475354* +/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/transport:264830-453182*,475355-804665* Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,6 @@ +/axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http:1295540 +/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http:1334386-1334571* +/webservices/axis/trunk/java/modules/webapp/src/main/java/org/apache/axis2/transport/http:37391-264829* +/webservices/axis2/branches/java/1_1/modules/webapp/src/main/java/org/apache/axis2/transport/http:453183-475225* +/webservices/axis2/branches/java/new-trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http:475226-475354* +/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/transport/http:264830-453182*,475355-804665* Propchange: axis/axis2/java/core/branches/AXIOM-420/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun May 6 08:55:09 2012 @@ -0,0 +1,3 @@ +/axis/axis2/java/core/branches/1_6/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:1295540 +/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:1334386-1334571 +/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:475355-804665
