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 2006/09/30 16:21:18 UTC
svn commit: r451604 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
kernel/src/org/apache/axis2/engine/ kernel/src/org/apache/axis2/transport/
kernel/src/org/apache/axis2/transport/http/ kernel/src/org/a...
Author: pradine
Date: Sat Sep 30 07:21:18 2006
New Revision: 451604
URL: http://svn.apache.org/viewvc?view=rev&rev=451604
Log:
Some refactoring.
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- 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 Sat Sep 30 07:21:18 2006
@@ -261,12 +261,10 @@
if (epr == null) {
epr = new EndpointReference(anonymous);
}
- else if (Final.WSA_NONE_URI.equals(epr.getAddress()) &&
- Submission.WSA_NAMESPACE.equals(namespace)) {
+ else if (epr.hasNoneAddress() && Submission.WSA_NAMESPACE.equals(namespace)) {
return; //Omit the header.
}
- else if (Final.WSA_ANONYMOUS_URL.equals(epr.getAddress()) ||
- Submission.WSA_ANONYMOUS_URL.equals(epr.getAddress())) {
+ else if (epr.hasAnonymousAddress()) {
epr.setAddress(anonymous);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Sat Sep 30 07:21:18 2006
@@ -62,17 +62,15 @@
public AxisService findService(MessageContext messageContext) throws AxisFault {
EndpointReference toEPR = messageContext.getTo();
-
AxisService service = null;
if (toEPR != null) {
- String address = toEPR.getAddress();
- log.debug(Messages.getMessage("checkingserviceforepr", address));
-
- if (Final.WSA_ANONYMOUS_URL.equals(address)
- || Submission.WSA_ANONYMOUS_URL.equals(address)) {
+ if (toEPR.hasAnonymousAddress()) {
return null;
}
+
+ String address = toEPR.getAddress();
+ log.debug(Messages.getMessage("checkingserviceforepr", address));
QName serviceName;
String[] values = Utils.parseRequestURLForServiceAndOperation(address,
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Sat Sep 30 07:21:18 2006
@@ -213,12 +213,10 @@
TransportOutDescription transportOut = faultContext.getTransportOut();
try {
- if (faultContext.isServerSide() && faultContext.getTo() != null) {
- String replyToAddress = faultContext.getTo().getAddress();
- if (!(AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(replyToAddress)
- || AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(replyToAddress)
- || AddressingConstants.Final.WSA_NONE_URI.equals(replyToAddress))) {
- URI uri = new URI(replyToAddress);
+ EndpointReference responseEPR = faultContext.getTo();
+ if (faultContext.isServerSide() && responseEPR != null) {
+ if (!responseEPR.hasAnonymousAddress() && !responseEPR.hasNoneAddress()) {
+ URI uri = new URI(responseEPR.getAddress());
String scheme = uri.getScheme();
if (!transportOut.getName().getLocalPart().equals(scheme)) {
ConfigurationContext configurationContext = faultContext.getConfigurationContext();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/AbstractTransportSender.java Sat Sep 30 07:21:18 2006
@@ -81,14 +81,12 @@
OutputStream out;
EndpointReference epr = null;
- if ((msgContext.getTo() != null) && !AddressingConstants.Submission.WSA_ANONYMOUS_URL
- .equals(msgContext.getTo().getAddress()) && !AddressingConstants.Final
- .WSA_ANONYMOUS_URL.equals(msgContext.getTo().getAddress())) {
+ if (msgContext.getTo() != null && !msgContext.getTo().hasAnonymousAddress()) {
epr = msgContext.getTo();
}
if (epr != null) {
- if (!epr.getAddress().equals(AddressingConstants.Final.WSA_NONE_URI)) {
+ if (!epr.hasNoneAddress()) {
out = openTheConnection(epr, msgContext);
OutputStream newOut = startSendWithToAddress(msgContext, out);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Sat Sep 30 07:21:18 2006
@@ -178,12 +178,8 @@
if (transportURL != null) {
epr = new EndpointReference(transportURL);
- } else if ((msgContext.getTo() != null)
- && !AddressingConstants.Submission.WSA_ANONYMOUS_URL
- .equals(msgContext.getTo().getAddress()) &&
- !AddressingConstants.Final
- .WSA_ANONYMOUS_URL
- .equals(msgContext.getTo().getAddress())) {
+ }
+ else if (msgContext.getTo() != null && !msgContext.getTo().hasAnonymousAddress()) {
epr = msgContext.getTo();
}
@@ -206,7 +202,7 @@
}
if (epr != null) {
- if (!epr.getAddress().equals(AddressingConstants.Final.WSA_NONE_URI)) {
+ if (!epr.hasNoneAddress()) {
writeMessageWithCommons(msgContext, epr, dataOut, format);
}
} else {
@@ -282,12 +278,12 @@
}
public void writeMessageWithCommons(MessageContext msgContext,
- EndpointReference toURL,
+ EndpointReference toEPR,
OMElement dataout,
OMOutputFormat format)
throws AxisFault {
try {
- URL url = new URL(toURL.getAddress());
+ URL url = new URL(toEPR.getAddress());
String soapActionString = msgContext.getSoapAction();
if ((soapActionString == null) || (soapActionString.length() == 0)) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSSender.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSSender.java Sat Sep 30 07:21:18 2006
@@ -59,18 +59,15 @@
transportInfo = new JMSOutTransportInfo(targetAddress);
}
else if (targetAddress == null && msgContext.getTo() != null &&
- !AddressingConstants.Submission.WSA_ANONYMOUS_URL
- .equals(msgContext.getTo().getAddress()) &&
- !AddressingConstants.Final.WSA_ANONYMOUS_URL
- .equals(msgContext.getTo().getAddress())) {
+ !msgContext.getTo().hasAnonymousAddress()) {
targetAddress = msgContext.getTo().getAddress();
- if (targetAddress.equals(AddressingConstants.Final.WSA_NONE_URI)) {
- //Don't send the message.
- return;
+ if (!msgContext.getTo().hasNoneAddress()) {
+ transportInfo = new JMSOutTransportInfo(targetAddress);
}
else {
- transportInfo = new JMSOutTransportInfo(targetAddress);
+ //Don't send the message.
+ return;
}
}
else if (msgContext.isServerSide()){
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Sat Sep 30 07:21:18 2006
@@ -119,12 +119,10 @@
//and this default behaviour should happen if somebody (e.g. a module) has not already provided
//a Sender.
try {
- if (newmsgCtx.isServerSide() && newmsgCtx.getTo() != null) {
- String replyToAddress = newmsgCtx.getTo().getAddress();
- if (!(AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(replyToAddress)
- || AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(replyToAddress)
- || AddressingConstants.Final.WSA_NONE_URI.equals(replyToAddress))) {
- URI uri = new URI(replyToAddress);
+ EndpointReference responseEPR = newmsgCtx.getTo();
+ if (newmsgCtx.isServerSide() && responseEPR != null) {
+ if (!responseEPR.hasAnonymousAddress() && !responseEPR.hasNoneAddress()) {
+ URI uri = new URI(responseEPR.getAddress());
String scheme = uri.getScheme();
if (!transportOut.getName().getLocalPart().equals(scheme)) {
ConfigurationContext configurationContext = newmsgCtx.getConfigurationContext();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java?view=diff&rev=451604&r1=451603&r2=451604
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java Sat Sep 30 07:21:18 2006
@@ -90,4 +90,13 @@
EndpointReference epr200408anon = new EndpointReference(AddressingConstants.Submission.WSA_ANONYMOUS_URL);
assertTrue(epr200408anon.hasAnonymousAddress());
}
+
+ public void testHasNoneAddress(){
+ // Default EndpointReference does not has 'anonymous address'
+ assertFalse(endpointReference.hasNoneAddress());
+
+ // EndpointReference with 2005/08 None address
+ EndpointReference epr200508none = new EndpointReference(AddressingConstants.Final.WSA_NONE_URI);
+ assertTrue(epr200508none.hasNoneAddress());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org