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 ch...@apache.org on 2006/03/07 14:33:36 UTC
svn commit: r383884 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
core/src/org/apache/axis2/addressing/
Author: chinthaka
Date: Tue Mar 7 05:33:35 2006
New Revision: 383884
URL: http://svn.apache.org/viewcvs?rev=383884&view=rev
Log:
Improving the handling of extensible elements in EPR
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java?rev=383884&r1=383883&r2=383884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java Tue Mar 7 05:33:35 2006
@@ -72,6 +72,8 @@
OMElement element = (OMElement) referenceParameters.next();
epr.addMetaData(element);
}
+ } else {
+ epr.addExtensibleElement(eprChildElement);
}
}
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=383884&r1=383883&r2=383884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Tue Mar 7 05:33:35 2006
@@ -327,7 +327,7 @@
}
// add xs:any
- ArrayList omElements = epr.getOmElements();
+ ArrayList omElements = epr.getExtensibleElements();
if (omElements != null) {
for (int i = 0; i < omElements.size(); i++) {
soapHeaderBlock.addChild((OMElement) omElements.get(i));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java?rev=383884&r1=383883&r2=383884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Tue Mar 7 05:33:35 2006
@@ -51,7 +51,7 @@
private String address;
private ArrayList metaData;
private Map referenceParameters;
- private ArrayList omElements;
+ private ArrayList extensibleElements;
/**
@@ -110,17 +110,26 @@
this.address = address;
}
- public ArrayList getOmElements() {
- return omElements;
+ public ArrayList getExtensibleElements() {
+ return extensibleElements;
}
/**
* {any}
*
- * @param omElements
+ * @param extensibleElements
*/
- public void setOmElements(ArrayList omElements) {
- this.omElements = omElements;
+ public void setExtensibleElements(ArrayList extensibleElements) {
+ this.extensibleElements = extensibleElements;
+ }
+
+ public void addExtensibleElement(OMElement extensibleElement) {
+ if (extensibleElement != null) {
+ if (this.extensibleElements == null) {
+ this.extensibleElements = new ArrayList();
+ }
+ this.extensibleElements.add(extensibleElement);
+ }
}
public ArrayList getMetaData() {