svn commit: r1338696 - in /axis/axis2/java/core/trunk/modules/tool: axis2-eclipse-codegen-plugin/pom.xml axis2-eclipse-service-plugin/pom.xml
Author: sagara Date: Tue May 15 13:28:52 2012 New Revision: 1338696 URL: http://svn.apache.org/viewvc?rev=1338696&view=rev Log: Fixed AXIS2-5321. Recently updated Axiom dependency Woodstox 4.1.3 version has a DynamicImport-Package entry for "org.relaxng.datatype" package this results into installation failures in Axis2 maven plug-ins. Since we don't use Relax NG I excluded "org.relaxng.datatype" package from relevant POM files. Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1338696&r1=1338695&r2=1338696&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Tue May 15 13:28:52 2012 @@ -190,7 +190,7 @@ lib true - !org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,* + !org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,!org.relaxng.datatype,* Axis2 Codegen Wizard Plug-in org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1338696&r1=1338695&r2=1338696&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml Tue May 15 13:28:52 2012 @@ -167,7 +167,7 @@ lib true - !org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.commons.io*,* + !org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.commons.io*,!org.relaxng.datatype,* Axis2 Service Maker org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver
svn commit: r1338816 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Author: veithen
Date: Tue May 15 18:12:40 2012
New Revision: 1338816
URL: http://svn.apache.org/viewvc?rev=1338816&view=rev
Log:
Eliminated a dependency on the bug described in AXIOM-422; the children of a
SOAPHeaderBlock should be plain OMElements, not SOAPHeaderBlocks.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1338816&r1=1338815&r2=1338816&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Tue May 15 18:12:40 2012
@@ -19,6 +19,8 @@
package org.apache.axis2.saaj;
+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.impl.dom.ElementImpl;
@@ -332,23 +334,12 @@ public class SOAPHeaderImpl extends SOAP
OMNamespace namespace = new NamespaceImpl(supported, prefix +
index);
-if (this.element.getOMFactory() instanceof SOAP11Factory) {
-SOAP11HeaderBlockImpl supportedEnvelop =
-new
SOAP11HeaderBlockImpl(Constants.ELEM_SUPPORTEDENVELOPE,
- namespace,
-
(SOAPFactory)this.element.getOMFactory());
-supportedEnvelop.addAttribute(Constants.ATTR_QNAME, prefix +
index + ":"
-+ Constants.ELEM_ENVELOPE, null);
-upgrade.addChild(supportedEnvelop);
-} else {
-SOAP12HeaderBlockImpl supportedEnvelop =
-new
SOAP12HeaderBlockImpl(Constants.ELEM_SUPPORTEDENVELOPE,
- namespace,
-
(SOAPFactory)this.element.getOMFactory());
-supportedEnvelop.addAttribute(Constants.ATTR_QNAME, prefix +
index + ":"
-+ Constants.ELEM_ENVELOPE, null);
-upgrade.addChild(supportedEnvelop);
-}
+OMElement supportedEnvelop =
+
element.getOMFactory().createOMElement(Constants.ELEM_SUPPORTEDENVELOPE,
+namespace);
+supportedEnvelop.addAttribute(Constants.ATTR_QNAME, prefix + index
+ ":"
++ Constants.ELEM_ENVELOPE, null);
+upgrade.addChild(supportedEnvelop);
}
SOAPHeaderElementImpl soapHeaderElementImpl = new
SOAPHeaderElementImpl(upgrade);
return soapHeaderElementImpl;
svn commit: r1338864 - in /axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm: AcksTo.java Endpoint.java SequenceAcknowledgement.java
Author: veithen
Date: Tue May 15 19:53:11 2012
New Revision: 1338864
URL: http://svn.apache.org/viewvc?rev=1338864&view=rev
Log:
Eliminated a dependency on the bug described in AXIOM-422; the children of a
SOAPHeaderBlock should be plain OMElements, not SOAPHeaderBlocks.
Modified:
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Modified:
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java?rev=1338864&r1=1338863&r2=1338864&view=diff
==
---
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
(original)
+++
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/AcksTo.java
Tue May 15 19:53:11 2012
@@ -102,7 +102,9 @@ public class AcksTo implements IOMRMElem
SandeshaMessageKeys.cannotSetAcksTo,
null));
- OMFactory factory = element.getOMFactory();
+ // Ensure that we use the plain OMFactory (and not
SOAPFactory). This forces
+ // EndpointReferenceHelper.toOM to create an OMElement instead
of a SOAPHeaderBlock.
+ OMFactory factory =
element.getOMFactory().getMetaFactory().getOMFactory();
QName acksTo = new QName
(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.ACKS_TO,
Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement endpointElement = EndpointReferenceHelper.toOM
(factory,epr, acksTo ,addressingNamespaceValue);
Modified:
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java?rev=1338864&r1=1338863&r2=1338864&view=diff
==
---
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
(original)
+++
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/Endpoint.java
Tue May 15 19:53:11 2012
@@ -93,7 +93,9 @@ public class Endpoint implements IOMRMEl
SandeshaMessageKeys.cannotSetEndpoint,
null));
- OMFactory factory = element.getOMFactory();
+// Ensure that we use the plain OMFactory (and not SOAPFactory). This
forces
+// EndpointReferenceHelper.toOM to create an OMElement instead of a
SOAPHeaderBlock.
+OMFactory factory =
element.getOMFactory().getMetaFactory().getOMFactory();
QName endpoint = new QName
(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.ENDPOINT,
Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement endpointElement = EndpointReferenceHelper.toOM (factory,
epr, endpoint, addressingNamespaceValue);
Modified:
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=1338864&r1=1338863&r2=1338864&view=diff
==
---
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
(original)
+++
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Tue May 15 19:53:11 2012
@@ -74,7 +74,7 @@ public class SequenceAcknowledgement imp
}
public Object fromHeaderBlock(SOAPHeaderBlock sequenceAckElement)
throws OMException,SandeshaException {
- originalSequenceAckElement = sequenceAckElement;
+ originalSequenceAckElement =
sequenceAckElement.cloneOMElement();
OMElement identifierPart = null;
Iterator childElements = sequenceAckElement.getChildElements();
while(childElements.hasNext()){
svn commit: r1338876 - /axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Author: veithen
Date: Tue May 15 20:28:47 2012
New Revision: 1338876
URL: http://svn.apache.org/viewvc?rev=1338876&view=rev
Log:
Fixed SOAP version mismatch.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1338876&r1=1338875&r2=1338876&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Tue May 15 20:28:47 2012
@@ -129,7 +129,7 @@ public class RampartTest extends TestCas
if (i == 31) {
OMNamespace omNamespace =
OMAbstractFactory.getOMFactory().createOMNamespace(
"http://sample.com";, "myNs");
-SOAPHeaderBlock header =
OMAbstractFactory.getSOAP12Factory()
+SOAPHeaderBlock header =
OMAbstractFactory.getSOAP11Factory()
.createSOAPHeaderBlock("VitalHeader", omNamespace);
header.addChild(AXIOMUtil.stringToOM("This is a
sample Header"));
serviceClient.addHeader(header);
