You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2007/06/17 14:11:57 UTC
svn commit: r548033 [3/11] - in /webservices/axis2/branches/java/jaxws21: ./
etc/ modules/adb-codegen/ modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/s...
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java Sun Jun 17 05:11:16 2007
@@ -32,8 +32,8 @@
TestBoolean1 testBoolean = new TestBoolean1();
testBoolean.setTestBoolean1(true);
- OMElement omElement = testBoolean.getOMElement(TestBoolean1.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testBoolean.getOMElement(TestBoolean1.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -49,8 +49,8 @@
testBoolean.setParam1(false);
testBoolean.setAttribute1(true);
- OMElement omElement = testBoolean.getOMElement(TestBoolean2.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testBoolean.getOMElement(TestBoolean2.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChiceTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChiceTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/choice/ChiceTest.java Sun Jun 17 05:11:16 2007
@@ -33,8 +33,8 @@
testChoise.setChoice1("test 2");
testChoise.setChoice2(5);
- OMElement omElement = testChoise.getOMElement(TestChoise.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testChoise.getOMElement(TestChoise.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java Sun Jun 17 05:11:16 2007
@@ -80,7 +80,6 @@
assertEquals(resultType.getAttribute1(), "attribute1");
assertEquals(resultType.getAttribute2(), new QName("http://tempuri.org/defaultnamepaces", "attribute2"));
} catch (XMLStreamException e) {
-
fail();
} catch (Exception e) {
e.printStackTrace();
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/EnumerationTest.java Sun Jun 17 05:11:16 2007
@@ -36,8 +36,8 @@
countPlacesInRect.setUpperleft("upperleft");
countPlacesInRect.setPtype(PlaceType.River);
- OMElement omElement = countPlacesInRect.getOMElement(CountPlacesInRect.MY_QNAME,OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = countPlacesInRect.getOMElement(CountPlacesInRect.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java Sun Jun 17 05:11:16 2007
@@ -40,8 +40,8 @@
extendedComplexType.setParentElement1("test1");
extendedComplexType.setParentElement2("test2");
- OMElement omElement = testComplexElement.getOMElement(TestComplexElement.MY_QNAME, OMAbstractFactory.getSOAP11Factory());
try {
+ OMElement omElement = testComplexElement.getOMElement(TestComplexElement.MY_QNAME, OMAbstractFactory.getSOAP11Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java Sun Jun 17 05:11:16 2007
@@ -39,8 +39,8 @@
fullName.setAttribute2(SimpleType.Factory.fromString("ATTRIBUTE",""));
- OMElement omElement = fullName.getOMElement(FullName.MY_QNAME, OMAbstractFactory.getSOAP11Factory());
- try {
+ try {
+ OMElement omElement = fullName.getOMElement(FullName.MY_QNAME, OMAbstractFactory.getSOAP11Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/group/GroupTest.java Sun Jun 17 05:11:16 2007
@@ -40,9 +40,9 @@
testSequenceGroup.setSequenceParam2("sequenceParam2");
testGroupSequenceElement.setTestSequenceGroup(testSequenceGroup);
- OMElement omElement =
- testGroupSequenceElement.getOMElement(TestSequenceGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testGroupSequenceElement.getOMElement(TestSequenceGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader =
@@ -74,9 +74,10 @@
testSequenceNestedGroupElement.setTestSequenceNestedGroup(testSequenceNestedGroup);
- OMElement omElement =
- testSequenceNestedGroupElement.getOMElement(TestSequenceNestedGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testSequenceNestedGroupElement.getOMElement(TestSequenceNestedGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
+
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader =
@@ -101,9 +102,9 @@
testChoiceGroup.setChoiceParam1("choiceParam1");
testGroupChoiceElement.setTestChoiceGroup(testChoiceGroup);
- OMElement omElement =
- testGroupChoiceElement.getOMElement(TestChoiceGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testGroupChoiceElement.getOMElement(TestChoiceGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader =
@@ -132,9 +133,9 @@
testChoiceNestedGroupElement.setTestChoiceNestedGroup(testChoiceNestedGroup);
- OMElement omElement =
- testChoiceNestedGroupElement.getOMElement(testChoiceNestedGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testChoiceNestedGroupElement.getOMElement(testChoiceNestedGroupElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader =
@@ -153,9 +154,9 @@
testAttributeGroup.setAttribute1("Attribute1");
testAttributeGroup.setParam1("Param1");
- OMElement omElement =
- testAttributeGroup.getOMElement(TestAttributeGroupElement.MY_QNAME,OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testAttributeGroup.getOMElement(TestAttributeGroupElement.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -176,9 +177,9 @@
testNestedAttributeGroupElement.setAttribute2("Attribute2");
testNestedAttributeGroupElement.setParam1("Param1");
- OMElement omElement =
- testNestedAttributeGroupElement.getOMElement(TestNestedAttributeGroupElement.MY_QNAME,OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testNestedAttributeGroupElement.getOMElement(TestNestedAttributeGroupElement.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java Sun Jun 17 05:11:16 2007
@@ -39,9 +39,9 @@
testInnerSequence1Choice_type2.setChoice2(5);
testSequence.setTestInnerSequence1Choice_type2(testInnerSequence1Choice_type2);
- OMElement omElement = testSequence.getOMElement(TestInnerSequence1.MY_QNAME,
- OMAbstractFactory.getSOAP12Factory());
try {
+ OMElement omElement = testSequence.getOMElement(TestInnerSequence1.MY_QNAME,
+ OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OMelement ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -69,9 +69,9 @@
testInnerSequence2Choice_type1.setChoice1(new String[]{"choice1", "choice2"});
testSequence.setTestInnerSequence2Choice_type1(testInnerSequence2Choice_type1);
- OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
- OMAbstractFactory.getSOAP12Factory());
try {
+ OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
+ OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OMelement ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -92,9 +92,9 @@
testInnerSequence2Choice_type1.setChoice2(new int[]{2, 4});
testSequence.setTestInnerSequence2Choice_type1(testInnerSequence2Choice_type1);
- OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
- OMAbstractFactory.getSOAP12Factory());
- try {
+ try {
+ OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
+ OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OMelement ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -115,9 +115,9 @@
testInnerSequence3Choice_type0.setChoice1(new String[]{"choice1", null, "choice2"});
testSequence.setTestInnerSequence3Choice_type0(testInnerSequence3Choice_type0);
- OMElement omElement = testSequence.getOMElement(TestInnerSequence3.MY_QNAME,
- OMAbstractFactory.getSOAP12Factory());
- try {
+ try {
+ OMElement omElement = testSequence.getOMElement(TestInnerSequence3.MY_QNAME,
+ OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OMelement ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -139,9 +139,9 @@
testSequence.setTestInnerSequence3Choice_type0(testInnerSequence3Choice_type0);
- OMElement omElement = testSequence.getOMElement(TestInnerSequence3.MY_QNAME,
- OMAbstractFactory.getSOAP12Factory());
- try {
+ try {
+ OMElement omElement = testSequence.getOMElement(TestInnerSequence3.MY_QNAME,
+ OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OMelement ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java Sun Jun 17 05:11:16 2007
@@ -40,8 +40,8 @@
testInnerParticle1.setTestInnerParticle1Sequence_type0(testInnerParticle1Sequence_type0);
testInnerParticle1.setParam4("Param4");
- OMElement omElement = testInnerParticle1.getOMElement(TestInnerParticle1.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testInnerParticle1.getOMElement(TestInnerParticle1.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -68,9 +68,9 @@
testInnerParticle2.setTestInnerParticle2Choice_type5(testInnerParticle2Choice_type1);
testInnerParticle2.setParam4("Param4");
- OMElement omElement =
- testInnerParticle2.getOMElement(TestInnerParticle2.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testInnerParticle2.getOMElement(TestInnerParticle2.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -91,9 +91,9 @@
TestInnerParticle3 testInnerParticle3 = new TestInnerParticle3();
testInnerParticle3.setParam1("Param1");
- OMElement omElement =
- testInnerParticle3.getOMElement(TestInnerParticle3.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testInnerParticle3.getOMElement(TestInnerParticle3.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -115,9 +115,9 @@
testInnerParticle3Choice_type1.setParam3("Param3");
testInnerParticle3.setTestInnerParticle3Choice_type1(testInnerParticle3Choice_type1);
- OMElement omElement =
- testInnerParticle3.getOMElement(TestInnerParticle3.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testInnerParticle3.getOMElement(TestInnerParticle3.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -143,9 +143,9 @@
testInnerParticle3.setTestInnerParticle3Choice_type1(testInnerParticle3Choice_type1);
testInnerParticle3.setParam4("Param4");
- OMElement omElement =
- testInnerParticle3.getOMElement(TestInnerParticle3.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testInnerParticle3.getOMElement(TestInnerParticle3.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -164,9 +164,9 @@
TestInnerParticle4 testInnerParticle4 = new TestInnerParticle4();
testInnerParticle4.setParam1("Param1");
- OMElement omElement =
- testInnerParticle4.getOMElement(TestInnerParticle4.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testInnerParticle4.getOMElement(TestInnerParticle4.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -190,9 +190,9 @@
testInnerParticle4Sequence_type2.setParam3("Param3");
testInnerParticle4.setTestInnerParticle4Sequence_type2(testInnerParticle4Sequence_type2);
- OMElement omElement =
- testInnerParticle4.getOMElement(TestInnerParticle4.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testInnerParticle4.getOMElement(TestInnerParticle4.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -214,9 +214,9 @@
TestInnerParticle4 testInnerParticle4 = new TestInnerParticle4();
testInnerParticle4.setParam4("Param4");
- OMElement omElement =
- testInnerParticle4.getOMElement(TestInnerParticle4.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement =
+ testInnerParticle4.getOMElement(TestInnerParticle4.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -248,9 +248,9 @@
testInnerParticle5.setTestInnerParticle5Sequence_type4(testInnerParticle2Choice_type1);
testInnerParticle5.setParam6("Param6");
- OMElement omElement =
- testInnerParticle5.getOMElement(TestInnerParticle5.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testInnerParticle5.getOMElement(TestInnerParticle5.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/list/ListTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/list/ListTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/list/ListTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/list/ListTest.java Sun Jun 17 05:11:16 2007
@@ -36,9 +36,9 @@
testListStringElement.setTestListStringElement(testListString);
testListString.setString(new String[]{"string1","string2"});
- OMElement omElement = testListStringElement.getOMElement(TestListStringElement.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testListStringElement.getOMElement(TestListStringElement.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -59,8 +59,8 @@
new QName("http://www.google","test3")});
testListQNameElement.setTestListQNameElement(testListQName);
- OMElement omElement = testListQNameElement.getOMElement(TestListQNameElement.MY_QNAME,OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testListQNameElement.getOMElement(TestListQNameElement.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -86,8 +86,8 @@
testString3.setTestString("test");
testListOurs.setTestString(new TestString[]{testString1,testString2,testString3});
- OMElement omElement = testListOursElement.getOMElement(TestListOursElement.MY_QNAME,OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testListOursElement.getOMElement(TestListOursElement.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -107,9 +107,9 @@
superTestListStringElement.setSuperTestListStringElement(superTestListString);
superTestListString.setString(new String[]{"test1","test2","test3"});
- OMElement omElement = superTestListStringElement.getOMElement(SuperTestListStringElement.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = superTestListStringElement.getOMElement(SuperTestListStringElement.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -130,9 +130,9 @@
innerListSimpleType.setInnerListSimpleType_type0(list);
- OMElement omElement = testInnerListSimpleType.getOMElement(TestInnerListSimpleType.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testInnerListSimpleType.getOMElement(TestInnerListSimpleType.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/particalmaxoccurs/ParticalMaxOccursTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/particalmaxoccurs/ParticalMaxOccursTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/particalmaxoccurs/ParticalMaxOccursTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/particalmaxoccurs/ParticalMaxOccursTest.java Sun Jun 17 05:11:16 2007
@@ -50,9 +50,9 @@
testParticalMaxOccursType1.setTestParticalSequenceMaxOccursType1Sequence(testSequences);
- OMElement omElement = testParticalMaxOccures1.getOMElement(TestParticalSequenceMaxOccurs1.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testParticalMaxOccures1.getOMElement(TestParticalSequenceMaxOccurs1.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -87,9 +87,9 @@
testParticalMaxOccursType2.setTestParticalSequenceMaxOccursType2Sequence(testSequences);
- OMElement omElement = testParticalMaxOccures2.getOMElement(TestParticalSequenceMaxOccurs2.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalMaxOccures2.getOMElement(TestParticalSequenceMaxOccurs2.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -126,9 +126,9 @@
testParticalMaxOccursType3.setTestParticalSequenceMaxOccursType3Sequence(testSequences);
- OMElement omElement = testParticalMaxOccures3.getOMElement(TestParticalSequenceMaxOccurs3.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalMaxOccures3.getOMElement(TestParticalSequenceMaxOccurs3.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -167,9 +167,9 @@
testParticalSequenceMaxOccursType4Sequence[2] = new TestParticalSequenceMaxOccursType4Sequence();
testParticalSequenceMaxOccursType4Sequence[2].setParm3(getNewCustomType());
- OMElement omElement = testParticalSequenceMaxOccurs4.getOMElement(TestParticalSequenceMaxOccurs4.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalSequenceMaxOccurs4.getOMElement(TestParticalSequenceMaxOccurs4.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -221,9 +221,9 @@
testParticalSequenceMaxOccursType5Sequence[2].setParm1(new TestCustomType[]{getNewCustomType()});
testParticalSequenceMaxOccursType5Sequence[2].setParm3(new TestCustomType[]{getNewCustomType()});
- OMElement omElement = testParticalSequenceMaxOccurs5.getOMElement(TestParticalSequenceMaxOccurs5.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalSequenceMaxOccurs5.getOMElement(TestParticalSequenceMaxOccurs5.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -272,9 +272,9 @@
testParticalMaxOccursType6.setAttribute1("Attribute1");
testParticalMaxOccursType6.setAttribute2("Attribute2");
- OMElement omElement = testParticalMaxOccures6.getOMElement(TestParticalSequenceMaxOccurs6.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalMaxOccures6.getOMElement(TestParticalSequenceMaxOccurs6.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -301,9 +301,9 @@
testParticalChoiceMaxOccursType.setParm1("Param1");
- OMElement omElement =
- testParticalChoiceMaxOccurs.getOMElement(TestParticalChoiceMaxOccurs.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement =
+ testParticalChoiceMaxOccurs.getOMElement(TestParticalChoiceMaxOccurs.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM string ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -331,9 +331,9 @@
testParticalMaxOccursType1.setTestParticalChoiceMaxOccursType1Choice(testChoices);
- OMElement omElement = testParticalMaxOccures1.getOMElement(TestParticalChoiceMaxOccurs1.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testParticalMaxOccures1.getOMElement(TestParticalChoiceMaxOccurs1.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -364,9 +364,9 @@
testParticalMaxOccursType2.setTestParticalChoiceMaxOccursType2Choice(testChoices);
- OMElement omElement = testParticalMaxOccures2.getOMElement(TestParticalChoiceMaxOccurs2.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testParticalMaxOccures2.getOMElement(TestParticalChoiceMaxOccurs2.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -401,9 +401,9 @@
testParticalMaxOccursType3.setTestParticalChoiceMaxOccursType3Choice(testChoices);
- OMElement omElement = testParticalMaxOccures3.getOMElement(TestParticalChoiceMaxOccurs3.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalMaxOccures3.getOMElement(TestParticalChoiceMaxOccurs3.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -442,9 +442,9 @@
testParticalChoiceMaxOccursType4Choice[2] = new TestParticalChoiceMaxOccursType4Choice();
testParticalChoiceMaxOccursType4Choice[2].setParm3(getNewCustomType());
- OMElement omElement = testParticalChoiceMaxOccurs4.getOMElement(TestParticalChoiceMaxOccurs4.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testParticalChoiceMaxOccurs4.getOMElement(TestParticalChoiceMaxOccurs4.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -492,9 +492,9 @@
testParticalChoiceMaxOccursType5Choice[2] = new TestParticalChoiceMaxOccursType5Choice();
testParticalChoiceMaxOccursType5Choice[2].setParm3(new TestCustomType[]{getNewCustomType()});
- OMElement omElement = testParticalChoiceMaxOccurs5.getOMElement(TestParticalChoiceMaxOccurs5.MY_QNAME,
- OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testParticalChoiceMaxOccurs5.getOMElement(TestParticalChoiceMaxOccurs5.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -541,9 +541,9 @@
testParticalMaxOccursType6.setAttribute1("Attribute1");
testParticalMaxOccursType6.setAttribute2("Attribute2");
- OMElement omElement = testParticalMaxOccures6.getOMElement(TestParticalChoiceMaxOccurs6.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = testParticalMaxOccures6.getOMElement(TestParticalChoiceMaxOccurs6.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java Sun Jun 17 05:11:16 2007
@@ -39,9 +39,9 @@
atbRequestCheckEligibility.setNameAsOnCard("cardname");
atbRequestCheckEligibility.setYearOfRedemption(2);
- OMElement omElement = echCheckEligibility1.getOMElement(CheckEligibility1.MY_QNAME, OMAbstractFactory.getSOAP12Factory());
try {
+ OMElement omElement = echCheckEligibility1.getOMElement(CheckEligibility1.MY_QNAME, OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
CheckEligibility1 result = CheckEligibility1.Factory.parse(xmlReader);
@@ -74,9 +74,9 @@
atbRequestCheckEligibility[1].setNameAsOnCard("cardname");
atbRequestCheckEligibility[1].setYearOfRedemption(2);
- OMElement omElement = echCheckEligibility2.getOMElement(CheckEligibility2.MY_QNAME, OMAbstractFactory.getSOAP12Factory());
try {
+ OMElement omElement = echCheckEligibility2.getOMElement(CheckEligibility2.MY_QNAME, OMAbstractFactory.getSOAP12Factory());
String omElementString = omElement.toStringWithConsume();
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
CheckEligibility2 result = CheckEligibility2.Factory.parse(xmlReader);
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java Sun Jun 17 05:11:16 2007
@@ -48,8 +48,8 @@
testSimpleAttribute.setAttrib1(parentSimpleType1);
testSimpleAttribute.setAttrib2(parentSimpleType2);
- OMElement omElement = testSimpleAttributeElement.getOMElement(TestSimpleAttributeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = testSimpleAttributeElement.getOMElement(TestSimpleAttributeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -72,8 +72,8 @@
normalSimpleTypeElement.setNormalSimpleTypeElement(parentNormalSimpleType);
parentNormalSimpleType.setNormalSimpleType(new QName("http://wso2.com", "test"));
- OMElement omElement = normalSimpleTypeElement.getOMElement(NormalSimpleTypeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = normalSimpleTypeElement.getOMElement(NormalSimpleTypeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -91,8 +91,8 @@
EnumerationSimpleTypeElement enumerationSimpleTypeElement = new EnumerationSimpleTypeElement();
enumerationSimpleTypeElement.setEnumerationSimpleTypeElement(ParentEnumerationSimpleType.value1);
- OMElement omElement = enumerationSimpleTypeElement.getOMElement(EnumerationSimpleTypeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = enumerationSimpleTypeElement.getOMElement(EnumerationSimpleTypeElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -112,8 +112,8 @@
parentRestrictionType.setBaseTypeElement1("test 1");
parentRestrictionType.setBaseTypeElement2(5);
- OMElement omElement = complexRestrictionTypeTestElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
- try {
+ try {
+ OMElement omElement = complexRestrictionTypeTestElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -146,8 +146,8 @@
address.setZip(ziptype);
ziptype.setZip_type2("C");
- OMElement omElement = personElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = personElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java Sun Jun 17 05:11:16 2007
@@ -43,9 +43,9 @@
record2.setElem1(dateOrDateTimeType);
dateOrDateTimeType.setObject(testObject);
- OMElement omElement = record2.getOMElement(Record2.MY_QNAME,
- OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = record2.getOMElement(Record2.MY_QNAME,
+ OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -93,8 +93,8 @@
unionQNameTestElement.setUnionQNameTestElement(unionQNameTest);
unionQNameTest.setObject(new QName("http://www.google.com","test"));
- OMElement omElement = unionQNameTestElement.getOMElement(UnionQNameTestElement.MY_QNAME,OMAbstractFactory.getOMFactory());
try {
+ OMElement omElement = unionQNameTestElement.getOMElement(UnionQNameTestElement.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -112,9 +112,9 @@
PackingType_T_type2 packingType_t_type2 = new PackingType_T_type2();
packingType_t_type2.setPackingType_T_type2("MINOR_a");
packingType_t.setObject(packingType_t_type2);
-
- OMElement omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
+ OMElement omElement;
try {
+ omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME, OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -131,8 +131,8 @@
packingType_t_type3.setPackingType_T_type3("PROP_a");
packingType_t.setObject(packingType_t_type3);
- omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
- try {
+ try {
+ omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
@@ -147,8 +147,8 @@
testInnerUnionType.setTestInnerUnionType(packingType_t);
packingType_t.setObject(PackingType_T_type4.TAR);
- omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
try {
+ omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
String omElementString = omElement.toStringWithConsume();
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/pom.xml Sun Jun 17 05:11:16 2007
@@ -44,6 +44,10 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
</dependency>
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBBean.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBBean.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBBean.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBBean.java Sun Jun 17 05:11:16 2007
@@ -2,6 +2,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamException;
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -32,7 +33,7 @@
* @param adbBeanQName the name of the element to be generated for this ADBBean.
* @return Returns a pull parser for this ADBBean.
*/
- public XMLStreamReader getPullParser(QName adbBeanQName);
+ public XMLStreamReader getPullParser(QName adbBeanQName) throws XMLStreamException;
/**
* There will be a self factory in every generated data bound class XXX:
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Sun Jun 17 05:11:16 2007
@@ -72,11 +72,10 @@
public static Object getSimpleTypeObject(Class parameter, OMElement value) {
String name = parameter.getName();
String text = value.getText();
-
- if (text == null || text.length() == 0) {
- return null;
- } else if (name.equals(STRING)) {
+ if(name.equals(STRING)) {
return text;
+ } else if (text == null || text.length() == 0) {
+ return null;
} else if (name.equals(INT)) {
return new Integer(text);
} else if (name.equals(BOOLEAN)) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sun Jun 17 05:11:16 2007
@@ -31,8 +31,6 @@
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.StreamWrapper;
import org.apache.axis2.util.Loader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jam.JClass;
import org.codehaus.jam.JProperty;
import org.codehaus.jam.JamClassIterator;
@@ -61,7 +59,6 @@
private static int nsCount = 1;
- private static final Log log = LogFactory.getLog(BeanUtil.class);
/**
* To Serilize Bean object this method is used, this will create an object array using given
@@ -150,8 +147,15 @@
continue;
}
if (SimpleTypeMapper.isSimpleType(ptype)) {
- Object value = propDesc.getReadMethod().invoke(beanObject,
+ Method readMethod = propDesc.getReadMethod();
+ Object value;
+ if(readMethod!=null){
+ value = readMethod.invoke(beanObject,
null);
+ } else {
+ throw new AxisFault("can not find read method for : " + propDesc.getName());
+ }
+
if (elemntNameSpace != null) {
object.add(new QName(elemntNameSpace.getNamespaceURI(),
propDesc.getName(), elemntNameSpace.getPrefix()));
@@ -162,8 +166,15 @@
object.add(value == null ? null : SimpleTypeMapper.getStringValue(value));
} else if (ptype.isArray()) {
if (SimpleTypeMapper.isSimpleType(ptype.getComponentType())) {
- Object value = propDesc.getReadMethod().invoke(beanObject,
- null);
+
+ Method readMethod = propDesc.getReadMethod();
+ Object value;
+ if(readMethod!=null){
+ value = readMethod.invoke(beanObject,
+ null);
+ } else {
+ throw new AxisFault("can not find read method for : " + propDesc.getName());
+ }
if (value != null) {
int i1 = Array.getLength(value);
for (int j = 0; j < i1; j++) {
@@ -329,7 +340,7 @@
throw AxisFault.makeFault(ce);
}
}
-
+
if (beanClass.isArray()) {
ArrayList valueList = new ArrayList();
Class arrayClassType = beanClass.getComponentType();
@@ -355,6 +366,8 @@
} else {
if (SimpleTypeMapper.isSimpleType(beanClass)) {
return SimpleTypeMapper.getSimpleTypeObject(beanClass, beanElement);
+ } else if ("java.lang.Object".equals(beanClass.getName())){
+ return beanElement.getFirstOMChild();
}
HashMap properties = new HashMap();
BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
@@ -363,15 +376,14 @@
PropertyDescriptor proprty = propDescs[i];
properties.put(proprty.getName(), proprty);
}
- boolean tuched = false;
Iterator elements = beanElement.getChildren();
+ if (beanObj == null) {
+ beanObj = objectSupplier.getObject(beanClass);
+ }
while (elements.hasNext()) {
// the beanClass could be an abstract one.
// so create an instance only if there are elements, in
// which case a concrete subclass is available to instantiate.
- if (beanObj == null) {
- beanObj = objectSupplier.getObject(beanClass);
- }
OMElement parts;
Object objValue = elements.next();
if (objValue instanceof OMElement) {
@@ -405,14 +417,9 @@
if (writeMethod != null) {
writeMethod.invoke(beanObj, parms);
}
- tuched = true;
}
}
- if (tuched) {
- return beanObj;
- } else {
- return null;
- }
+ return beanObj;
}
} catch (IllegalAccessException e) {
throw new AxisFault("IllegalAccessException : " + e);
@@ -609,8 +616,12 @@
helper, true, objectSupplier);
valueList.add(o);
}
- retObjs[count] = ConverterUtil.convertToArray(arrayClassType,
- valueList);
+ if(valueList.get(0)==null){
+ retObjs[count] = null;
+ } else {
+ retObjs[count] = ConverterUtil.convertToArray(arrayClassType,
+ valueList);
+ }
if (!done) {
return omElement;
}
@@ -685,7 +696,11 @@
for (int i = 0; i < args.length; i++) {
Object arg = args[i];
if (arg == null) {
- objects.add("item" + i);
+ if (partName == null) {
+ objects.add("item" + argCount);
+ } else {
+ objects.add(partName);
+ }
objects.add(arg);
continue;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Sun Jun 17 05:11:16 2007
@@ -739,7 +739,7 @@
for (int i = 0; i < listSize; i++) {
Object o = objectList.get(i);
if (o != null) {
- Array.set(returnArray, i, convertToDateTime(o.toString()));
+ Array.set(returnArray, i, o);
}
}
} else {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Sun Jun 17 05:11:16 2007
@@ -3,6 +3,7 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.utils.BeanUtil;
import org.apache.axis2.description.java2wsdl.TypeTable;
@@ -16,6 +17,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import java.util.Iterator;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -58,6 +60,10 @@
private Object[] properties;
private Object[] attributes;
private QName elementQName;
+
+ //This is to store the QName which are in the typeTable after setting the correct prefix
+ private HashMap qnameMap = new HashMap();
+
//we always create a new namespace context
private ADBNamespaceContext namespaceContext = new ADBNamespaceContext();
@@ -110,6 +116,26 @@
this(adbBeansQName, properties, attributes);
this.qualified = qualified;
this.typeTable = typeTable;
+ if(this.typeTable!=null){
+ Map complexTypeMap = this.typeTable.getComplexSchemaMap();
+ if(complexTypeMap !=null){
+ Iterator keys = complexTypeMap.keySet().iterator();
+ while (keys.hasNext()) {
+ String key = (String) keys.next();
+ QName qname = (QName) complexTypeMap.get(key);
+ if(qname !=null){
+ String prefix =qname.getPrefix();
+ if(prefix ==null && "".equals(prefix)){
+ prefix = OMSerializerUtil.getNextNSPrefix();
+ }
+ qname = new QName(qname.getNamespaceURI(),qname.getLocalPart(),prefix);
+ this.typeTable.getComplexSchemaMap().put(key,qname);
+ qnameMap.put(qname.getNamespaceURI(),prefix);
+ addToNsMap(prefix, qname.getNamespaceURI());
+ }
+ }
+ }
+ }
}
/** add the namespace context */
@@ -850,6 +876,13 @@
//oops - we've no idea what kind of key this is
throw new XMLStreamException(
"unidentified property key!!!" + propPointer);
+ }
+
+ if(propertyQName!=null){
+ String prefix = (String) qnameMap.get(propertyQName.getNamespaceURI());
+ if(prefix!=null){
+ propertyQName = new QName(propertyQName.getNamespaceURI(),propertyQName.getLocalPart(),prefix);
+ }
}
//ok! we got the key. Now look at the value
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java Sun Jun 17 05:11:16 2007
@@ -88,22 +88,18 @@
}
} catch (InvocationTargetException e) {
- String msg = null;
-
Throwable cause = e.getCause();
-
if (cause != null) {
- msg = cause.getMessage();
+ String msg = cause.getMessage();
if (msg == null) {
msg = "Exception occurred while trying to invoke service method " +
method.getName();
}
- log.error(msg, e);
- if (cause instanceof AxisFault) {
- throw (AxisFault)cause;
- }
+ log.error(msg, cause);
+ } else {
+ cause = e;
}
- throw new AxisFault(msg, e);
+ throw AxisFault.makeFault(cause);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service method " +
method.getName();
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Sun Jun 17 05:11:16 2007
@@ -39,8 +39,6 @@
import java.lang.reflect.Method;
public class RPCMessageReceiver extends AbstractInOutSyncMessageReceiver {
-
-
private static Log log = LogFactory.getLog(RPCMessageReceiver.class);
/**
@@ -76,13 +74,22 @@
AxisMessage inAxisMessage = op.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
String messageNameSpace = null;
QName elementQName;
- String methodName = op.getName().getLocalPart();
- Method[] methods = ImplClass.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getName().equals(methodName)) {
- method = methods[i];
- break;
+ method = (Method)(op.getParameterValue("myMethod"));
+ if (method == null) {
+ String methodName = op.getName().getLocalPart();
+ Method[] methods = ImplClass.getMethods();
+
+ for (int i = 0; i < methods.length; i++) {
+ if (methods[i].getName().equals(methodName)) {
+ method = methods[i];
+ op.addParameter("myMethod", method);
+ break;
+ }
+ }
+ if (method == null) {
+ throw new AxisFault("No such method '" + methodName +
+ "' in class " + ImplClass.getName());
}
}
Object resObject = null;
@@ -151,11 +158,13 @@
throw (AxisFault)cause;
}
throw new AxisFault(msg, e);
+ } catch(RuntimeException e) {
+ throw AxisFault.makeFault(e);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service method " +
method.getName();
log.error(msg, e);
- throw new AxisFault(msg, e);
+ throw AxisFault.makeFault(e);
}
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java Sun Jun 17 05:11:16 2007
@@ -147,32 +147,27 @@
) throws Exception {
QName elementQName = outMessage.getAxisMessage().getElementQName();
if (resObject == null) {
+ QName resName;
+ if (service.isElementFormDefault()) {
+ resName = new QName(service.getSchematargetNamespace(),
+ RETURN_WRAPPER,
+ service.getSchemaTargetNamespacePrefix());
+ } else {
+ resName = new QName(RETURN_WRAPPER);
+ }
+ XMLStreamReader xr = new NullXMLStreamReader(resName);
+ StreamWrapper parser = new StreamWrapper(xr);
+ StAXOMBuilder stAXOMBuilder =
+ OMXMLBuilderFactory.createStAXOMBuilder(
+ OMAbstractFactory.getSOAP11Factory(), parser);
ns = fac.createOMNamespace(service.getSchematargetNamespace(),
- service.getSchemaTargetNamespacePrefix());
+ service.getSchemaTargetNamespacePrefix());
OMElement bodyChild = fac.createOMElement(method.getName() + "Response", ns);
+ bodyChild.addChild(stAXOMBuilder.getDocumentElement());
envelope.getBody().addChild(bodyChild);
} else {
if (resObject instanceof Object[]) {
- if(Array.getLength(resObject)==0){
- QName resName;
- if (service.isElementFormDefault()) {
- resName = new QName(service.getSchematargetNamespace(),
- RETURN_WRAPPER,
- service.getSchemaTargetNamespacePrefix());
- } else {
- resName = new QName(RETURN_WRAPPER);
- }
- XMLStreamReader xr = new NullXMLStreamReader(resName);
- StreamWrapper parser = new StreamWrapper(xr);
- StAXOMBuilder stAXOMBuilder =
- OMXMLBuilderFactory.createStAXOMBuilder(
- OMAbstractFactory.getSOAP11Factory(), parser);
- ns = fac.createOMNamespace(service.getSchematargetNamespace(),
- service.getSchemaTargetNamespacePrefix());
- OMElement bodyChild = fac.createOMElement(method.getName() + "Response", ns);
- bodyChild.addChild(stAXOMBuilder.getDocumentElement());
- envelope.getBody().addChild(bodyChild);
- } else {
+
QName resName = new QName(elementQName.getNamespaceURI(),
method.getName() + "Response",
elementQName.getPrefix());
@@ -181,7 +176,6 @@
service.isElementFormDefault(),
service.getTypeTable());
envelope.getBody().addChild(bodyChild);
- }
} else {
if (resObject.getClass().isArray()) {
int length = Array.getLength(resObject);
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBInOutAsyncMessageReceiver.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBInOutAsyncMessageReceiver.java Sun Jun 17 05:11:16 2007
@@ -3,6 +3,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver;
+import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -19,7 +20,16 @@
* limitations under the License.
*/
-public class EJBInOutAsyncMessageReceiver extends RPCInOutAsyncMessageReceiver {
+/**
+ * An EJBInOutAsyncMessageReceiver
+ *
+ * @deprecated you can just use EJBMessageReceiver
+ */
+public class EJBInOutAsyncMessageReceiver extends RPCMessageReceiver {
+ public void receive(final MessageContext messageCtx) throws AxisFault {
+ messageCtx.setProperty(DO_ASYNC, Boolean.TRUE);
+ super.receive(messageCtx);
+ }
protected Object makeNewServiceObject(MessageContext msgContext) throws AxisFault {
return EJBUtil.makeNewServiceObject(msgContext);
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java Sun Jun 17 05:11:16 2007
@@ -653,6 +653,7 @@
} catch (IOException e) {
fail("Error has occurred " + e);
} catch (Exception e) {
+ e.printStackTrace();
fail("Error has occurred " + e);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java Sun Jun 17 05:11:16 2007
@@ -22,6 +22,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,9 +72,12 @@
}
String scope = axisService.getScope();
if (sgCtx == null) {
- sgCtx = new ServiceGroupContext(configurationContext,
- configurationContext.getAxisConfiguration().
- getServiceGroup(serviceGroupName));
+ AxisServiceGroup serviceGroup =
+ configurationContext.getAxisConfiguration().getServiceGroup(serviceGroupName);
+ if(serviceGroup == null){
+ return;
+ }
+ sgCtx = new ServiceGroupContext(configurationContext, serviceGroup);
sgCtx.setId(serviceGroupContextId);
if (scope.equals(Constants.SCOPE_APPLICATION)) {
configurationContext.
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java Sun Jun 17 05:11:16 2007
@@ -55,8 +55,10 @@
// If the ServiceGroupContext is not found, create it
if (sgCtx == null) {
AxisServiceGroup axisServiceGroup =
- configContext.getAxisConfiguration()
- .getServiceGroup(serviceGroupName);
+ configContext.getAxisConfiguration().getServiceGroup(serviceGroupName);
+ if(axisServiceGroup == null){
+ return;
+ }
sgCtx = new ServiceGroupContext(configContext, axisServiceGroup);
sgCtx.setId(serviceGroupContextId);
configContext.addServiceGroupContextIntoSoapSessionTable(sgCtx); // TODO: Check this
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java Sun Jun 17 05:11:16 2007
@@ -50,6 +50,7 @@
public static boolean isMessageAcknowledged(String messageUniqueId,
ChannelSender sender) throws ClusteringFault {
+
boolean isAcknowledged = false;
MessageACK ack = (MessageACK) messageAckTable.get(messageUniqueId);
List memberList = ack.getMemberList();
@@ -62,14 +63,14 @@
} else {
for (int i = 0; i < members.length; i++) {
Member member = members[i];
- if (!memberList.contains(member.getName())) {
- log.debug("[NO ACK] from member " + member.getName());
+ String memberHost = TribesUtil.getHost(member);
+ if (member.isReady() && !memberList.contains(memberHost)) {
+ log.debug("[NO ACK] from member " + memberHost);
log.debug("ACKed member list=" + memberList);
+
// At this point, resend the original message back to the node which has not
// sent an ACK
- if (member.isReady()) {
- sender.sendToMember(ack.getCommand(), member);
- }
+ sender.sendToMember(ack.getCommand(), member);
//TODO: Enhancement, Check whether this is a new member. If then send the msg
isAcknowledged = false;
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java Sun Jun 17 05:11:16 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.clustering.tribes;
import org.apache.axis2.clustering.ClusteringConstants;
-import org.apache.axis2.clustering.ClusteringFault;
import org.apache.axis2.clustering.configuration.ConfigurationClusteringCommand;
import org.apache.axis2.clustering.configuration.DefaultConfigurationManager;
import org.apache.axis2.clustering.context.ContextClusteringCommand;
@@ -95,7 +94,7 @@
&& !(msg instanceof GetStateResponseCommand)) {
return;
}
- log.debug("RECEIVED MESSAGE " + msg + " from " + sender.getName());
+ log.debug("RECEIVED MESSAGE " + msg + " from " + TribesUtil.getHost(sender));
// Need to process ACKs as soon as they are received since otherwise,
// unnecessary retransmissions will take place
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java Sun Jun 17 05:11:16 2007
@@ -19,9 +19,7 @@
import org.apache.axis2.clustering.ClusteringCommand;
import org.apache.axis2.clustering.ClusteringFault;
import org.apache.axis2.clustering.MessageSender;
-import org.apache.catalina.tribes.Channel;
-import org.apache.catalina.tribes.ChannelException;
-import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,10 +34,11 @@
}
// Keep retrying, since at the point of trying to send the msg, a member may leave the group
+ // causing a view change. All nodes in a view should get the msg
while (true) {
if (channel.getMembers().length > 0) {
try {
- channel.send(channel.getMembers(), msg, Channel.DEFAULT);
+ channel.send(channel.getMembers(), msg, 0);
log.debug("Sent " + msg + " to group");
break;
} catch (ChannelException e) {
@@ -60,7 +59,7 @@
try {
channel.send(new Member[]{channel.getLocalMember(true)},
msg,
- Channel.DEFAULT);
+ 0);
log.debug("Sent " + msg + " to self");
} catch (ChannelException e) {
throw new ClusteringFault(e);
@@ -91,10 +90,12 @@
public void sendToMember(ClusteringCommand cmd, Member member) throws ClusteringFault {
try {
- channel.send(new Member[]{member}, cmd, Channel.DEFAULT);
- log.debug("Sent " + cmd + " to " + member.getName());
+ if (member.isReady()) {
+ channel.send(new Member[]{member}, cmd, 0);
+ log.debug("Sent " + cmd + " to " + TribesUtil.getHost(member));
+ }
} catch (ChannelException e) {
- String message = "Could not send message to " + member.getName() +
+ String message = "Could not send message to " + TribesUtil.getHost(member) +
". Reason " + e.getMessage();
log.warn(message);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java Sun Jun 17 05:11:16 2007
@@ -131,7 +131,7 @@
channelListener.setContextManager(contextManager);
Member[] members = channel.getMembers();
- log.info("Local Tribes Member " + channel.getLocalMember(true).getName());
+ log.info("Local Tribes Member " + TribesUtil.getLocalHost(channel));
TribesUtil.printMembers(members);
// If there is at least one member in the Tribe, get the current state from a member
@@ -151,9 +151,9 @@
members = channel.getMembers();
int memberIndex = random.nextInt(members.length);
Member member = members[memberIndex];
- if (!sentMembersList.contains(member.getName())) {
+ if (!sentMembersList.contains(TribesUtil.getHost(member))) {
sender.sendToMember(new GetStateCommand(), member);
- sentMembersList.add(member.getName());
+ sentMembersList.add(TribesUtil.getHost(member));
log.debug("WAITING FOR STATE UPDATE...");
Thread.sleep(1000);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesControlCommandProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesControlCommandProcessor.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesControlCommandProcessor.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesControlCommandProcessor.java Sun Jun 17 05:11:16 2007
@@ -61,7 +61,7 @@
channelSender.sendToMember(getStateRespCmd, sender);
} else if (command instanceof AckCommand) {
AckCommand cmd = (AckCommand) command;
- cmd.setMemberId(sender.getName());
+ cmd.setMemberId(TribesUtil.getHost(sender));
cmd.execute(configurationContext);
} else {
command.execute(configurationContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org