svn commit: r1144957 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/test/org/apache/axis2/schema/ modules/adb/src/org/apache/axis2/databinding/ modules/adb/test/org/apache/axis2/datab

2011-07-10 Thread veithen 
Author: veithen
Date: Sun Jul 10 20:41:44 2011
New Revision: 1144957

URL: http://svn.apache.org/viewvc?rev=1144957&view=rev
Log:
Merged a couple of changes to the 1.6 branch to take advantage of the API 
introduced by AXIOM-353: r1085173,r1085931,r1088730,r1089225,r1094117.

Added:

axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XmlBeansXMLReader.java
  - copied unchanged from r1088730, 
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XmlBeansXMLReader.java
Removed:

axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/ADBSOAPModelBuilder.java

axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java

axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java

axis/axis2/java/core/branches/1_6/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:41:44 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085514,1085889,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1091178,1091191,1094117,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java?rev=1144957&r1=1144956&r2=1144957&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
 Sun Jul 10 20:41:44 2011
@@ -53,8 +53,7 @@ import org.apache.axiom.mime.impl.javama
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.OMMultipartWriter;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder;
@@ -343,8 +342,8 @@ public abstract class AbstractTestCase e
 private static void testSerializeDeserializeUsingOMStAXWrapper(Object 
bean, Object expectedResult) throws Exception {
 OMElement omElement = ADBBeanUtil.getOMElement(bean);
 String omElementString = omElement.toStringWithConsume();
-OMElement omElement2 = new 
StAXOMBuilder(StAXUtils.createXMLStreamReader(
-new StringReader(omElementString))).getDocumentElement();
+OMElement omElement2 = OMXMLBuilderFactory.createOMBuilder(
+new StringReader(omElementString)).getDocumentElement();
 assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(), 
omElement2.getXMLStreamReader()));
 }
 
@@ -364,7 +363,7 @@ public abstract class AbstractTestCase e
 ADBBeanUtil.serialize(bean, writer);
 writer.writeEndElement();
 writer.flush();
-OMElement omElement3 = new 
StAXOMBuilder(StAXUtils.createXMLStreamReader(new 
StringReader(sw.toString(.getDocumentElement();
+OMElement omElement3 = OMXMLBuilderFactory.createOMBuilder(new 
StringReader(sw.toString())).getDocumentElement();
 assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(), 
omElement3.getFirstElement().getXMLStreamReader()));
 }
 

Modified: 
axis/axis2/java/core/branches/1_6/modules/addressing/test/org/apache/axis2/han

svn commit: r1144959 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-tests/src/test/java/org/apache/rahas/ modules/rampart-tests/src/test/java/org/apache/rampart/ modules/rampart-tests/

2011-07-10 Thread veithen 
Author: veithen
Date: Sun Jul 10 20:52:17 2011
New Revision: 1144959

URL: http://svn.apache.org/viewvc?rev=1144959&view=rev
Log:
Merged r1087998 to the 1.6 branch. No functional changes here, but this is a 
prerequisite to be able to merge a couple of other changes without conflicts.

Modified:
axis/axis2/java/rampart/branches/1_6/   (props changed)

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java

Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:52:17 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1087998,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
 Sun Jul 10 20:52:17 2011
@@ -31,26 +31,20 @@ public class TokenRequestDispatcherConfi
 /**
  * Testing a valid config file
  */
-public void testWithConfigFile() {
-try {
-TokenRequestDispatcherConfig config = TokenRequestDispatcherConfig
-.load("test-resources/trust/dispatcher.config.xml");
-
-assertEquals("Incorrect default issuer class name",
-"org.apache.rahas.TempIssuer", config
-.getDefaultIssuerName());
-
-TokenIssuer issuer = config
-.getIssuer("http://example.org/mySpecialToken1";);
-
-assertEquals("Incorrect issuer for token type : "
-+ "http://example.org/mySpecialToken1";, TempIssuer.class
-.getName(), issuer.getClass().getName());
-
-} catch (TrustException e) {
-e.printStackTrace();
-fail(e.getMessage());
-}
+public void testWithConfigFile() throws Exception {
+TokenRequestDispatcherConfig config = TokenRequestDispatcherConfig
+.load("test-resources/trust/dispatcher.config.xml");
+
+assertEquals("Incorrect default issuer class name",
+"org.apache.rahas.TempIssuer", config
+.getDefaultIssuerName());
+
+TokenIssuer issuer = config
+.getIssuer("http://example.org/mySpecialToken1";);
+
+assertEquals("Incorrect issuer for token type : "
++ "http://example.org/mySpecialToken1";, TempIssuer.class
+.getName(), issuer.getClass().getName());
 }
 
 /**

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
 Sun Jul 10 20:52:17 2011
@@ -27,224 +27,181 @@ import java.util.ArrayList;
 
 public class AsymmetricBindingBuilderTe

svn commit: r1144963 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/util/ modules/rampart-tests/src/test/java/org/apache/rampart/ modules/rampart-

2011-07-10 Thread veithen 
Author: veithen
Date: Sun Jul 10 21:23:24 2011
New Revision: 1144963

URL: http://svn.apache.org/viewvc?rev=1144963&view=rev
Log:
Merged a couple of changes to the 1.6 branch to take advantage of the API 
introduced by AXIOM-353: r1088013, r1088558 and r1088571.

Modified:
axis/axis2/java/rampart/branches/1_6/   (props changed)

axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java

axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java

Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 21:23:24 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1087998,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1144963&r1=1144962&r2=1144963&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
 Sun Jul 10 21:23:24 2011
@@ -21,6 +21,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
 import org.apache.axiom.soap.SOAP11Constants;
@@ -29,6 +30,7 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axiom.soap.impl.dom.SOAPHeaderBlockImpl;
 import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
@@ -41,7 +43,6 @@ import org.w3c.dom.Element;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
 import java.io.ByteArrayInputStream;
@@ -230,8 +231,8 @@ public class Axis2Util {
 }
 XMLStreamReader reader = ((OMElement) doc.getDocumentElement())
 .getXMLStreamReader();
-StAXSOAPModelBuilder stAXSOAPModelBuilder = new 
StAXSOAPModelBuilder(
-reader, null);
+SOAPModelBuilder stAXSOAPModelBuilder = 
OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+reader);
 SOAPEnvelope envelope = stAXSOAPModelBuilder.getSOAPEnvelope();
 
 //Set the processed flag of the processed headers
@@ -258,7 +259,7 @@ public class Axis2Util {
 XMLUtils.outputDOM(doc.getDocumentElement(), os, true);
 ByteArrayInputStream bais =  new 
ByteArrayInputStream(os.toByteArray());
 
-StAXSOAPModelBuilder stAXSOAPModelBuilder = new 
StAXSOAPModelBuilder(XMLInputFactory.newInstance().createXMLStreamReader(bais), 
null);
+SOAPModelBuilder stAXSOAPModelBuilder = 
OMXMLBuilderFactory.createSOAPModelBuilder(bais, null);
 return stAXSOAPModelBuilder.getSOAPEnvelope();
 } catch (Exception e) {
 throw new WSSecurityException(e.getMessage());

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java?rev=1144963&r1=1144962&r2=1144963&view=diff
=