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 2005/03/05 07:27:43 UTC
svn commit: r156230 - in webservices/axis/trunk/java: ./
modules/core/src/java/org/apache/axis/addressing/
modules/core/src/java/org/apache/axis/context/
modules/om/src/java/org/apache/axis/om/impl/llom/
Author: chinthaka
Date: Fri Mar 4 22:27:41 2005
New Revision: 156230
URL: http://svn.apache.org/viewcvs?view=rev&rev=156230
Log:
Implementing full addressing support
Modified:
webservices/axis/trunk/java/maven.xml
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java
Modified: webservices/axis/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/maven.xml?view=diff&r1=156229&r2=156230
==============================================================================
--- webservices/axis/trunk/java/maven.xml (original)
+++ webservices/axis/trunk/java/maven.xml Fri Mar 4 22:27:41 2005
@@ -209,17 +209,16 @@
</ant:javadoc>
</goal>
- <preGoal name="multiproject:site">
+ <!-- preGoal name="multiproject:site">
<attainGoal name="war"/>
<attainGoal name="javadoc-gen"/>
- <!-- attainGoal name="pdf"/ -->
+
<copy todir="target/docs/api">
<fileset dir="target/apidocs" />
</copy>
<copy file="target/axis2.war" tofile="target/docs/dist/axis2.war"/>
- <!-- copy file="target/pdf/axis2.pdf" tofile="target/docs/axis2.pdf"/>
- <ant:delete dir="target/pdf"/ -->
- </preGoal>
+
+ </preGoal -->
</project>
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java?view=diff&r1=156229&r2=156230
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/AddressingConstants.java Fri Mar 4 22:27:41 2005
@@ -19,6 +19,9 @@
* Interface AddressingConstants
*/
public interface AddressingConstants {
+
+ public static final String WSA_NAMESPACE = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
+
/**
* Field WSA_MESSAGE_ID
*/
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java?view=diff&r1=156229&r2=156230
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/addressing/EndpointReference.java Fri Mar 4 22:27:41 2005
@@ -19,6 +19,7 @@
/**
* Class EndpointReference
+ * TODO : Policy has not been integrated to this
*/
public class EndpointReference {
/**
@@ -30,7 +31,7 @@
private String messageInformationHeaderType;
/**
- * Field address
+ * Required property. may be a logical address or identifier for the service endpoint
*/
private String address;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java?view=diff&r1=156229&r2=156230
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java Fri Mar 4 22:27:41 2005
@@ -16,6 +16,7 @@
package org.apache.axis.context;
import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
@@ -91,43 +92,19 @@
private boolean processingFault = false;
/**
- * Field to
+ * Addressing Information for Axis 2
+ * Following Properties will be kept inside this, these fields will be initially filled by
+ * the transport. Then later a addressing handler will make relevant changes to this, if addressing
+ * information is present in the SOAP header.
*/
- private EndpointReference to;
- /**
- * Field from
- */
- private EndpointReference from;
-
- /**
- * Field relatesTo
- */
- private RelatesTo relatesTo;
-
- /**
- * Field replyTo
- */
- private EndpointReference replyTo;
+ MessageInformationHeadersCollection messageInformationHeaders;
- /**
- * Field faultTo
- */
- private EndpointReference faultTo;
- /**
- * Field chain
- */
private ExecutionChain chain;
- /**
- * Field transport
- */
private AxisTransport transport;
- // there is a no use cas found to set those proprties
- // so declare them final
-
/**
* Field properties
*/
@@ -213,20 +190,21 @@
}
properties = initialProperties;
chain = new ExecutionChain();
+ messageInformationHeaders = new MessageInformationHeadersCollection();
}
/**
* @return
*/
public EndpointReference getFaultTo() {
- return faultTo;
+ return messageInformationHeaders.getFaultTo();
}
/**
* @return
*/
public EndpointReference getFrom() {
- return from;
+ return messageInformationHeaders.getFrom();
}
/**
@@ -276,14 +254,14 @@
* @return
*/
public RelatesTo getRelatesTo() {
- return relatesTo;
+ return messageInformationHeaders.getRelatesTo();
}
/**
* @return
*/
public EndpointReference getReplyTo() {
- return replyTo;
+ return messageInformationHeaders.getReplyTo();
}
/**
@@ -311,21 +289,21 @@
* @return
*/
public EndpointReference getTo() {
- return to;
+ return messageInformationHeaders.getTo();
}
/**
- * @param referance
+ * @param reference
*/
- public void setFaultTo(EndpointReference referance) {
- faultTo = referance;
+ public void setFaultTo(EndpointReference reference) {
+ messageInformationHeaders.setFaultTo(reference);
}
/**
- * @param referance
+ * @param reference
*/
- public void setFrom(EndpointReference referance) {
- from = referance;
+ public void setFrom(EndpointReference reference) {
+ messageInformationHeaders.setFrom(reference);
}
/**
@@ -365,17 +343,17 @@
}
/**
- * @param referance
+ * @param reference
*/
- public void setRelatesTo(RelatesTo referance) {
- relatesTo = referance;
+ public void setRelatesTo(RelatesTo reference) {
+ messageInformationHeaders.setRelatesTo(reference);
}
/**
* @param referance
*/
public void setReplyTo(EndpointReference referance) {
- replyTo = referance;
+ messageInformationHeaders.setReplyTo(referance);
}
/**
@@ -396,7 +374,7 @@
* @param referance
*/
public void setTo(EndpointReference referance) {
- to = referance;
+ messageInformationHeaders.setTo(referance);
}
/**
@@ -520,5 +498,18 @@
*/
public Map getProperties() {
return properties;
+ }
+
+ public void setWSAAction(String actionURI){
+ messageInformationHeaders.setAction(actionURI);
+ }
+ public String getWSAAction(){
+ return messageInformationHeaders.getAction();
+ }
+ public void setWSAMessageId(String messageID){
+ messageInformationHeaders.setMessageId(messageID);
+ }
+ public String getWSAMessageId(){
+ return messageInformationHeaders.getMessageId();
}
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java?view=diff&r1=156229&r2=156230
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java Fri Mar 4 22:27:41 2005
@@ -334,6 +334,7 @@
/**
* This will ckeck for the namespace <B>only</B> in the current Element
+ * This can also be used to retrieve the prefix of a known namespace URI
*
* @param uri
* @param prefix
@@ -345,7 +346,7 @@
if (namespaces == null) {
return null;
}
- if (prefix == null) {
+ if (prefix == null || "".equals("")) {
Iterator namespaceListIterator = namespaces.values().iterator();
while (namespaceListIterator.hasNext()) {
OMNamespace omNamespace =