You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ke...@apache.org on 2007/02/09 07:28:32 UTC
svn commit: r505199 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
engine/AxisConfiguration.java transport/MessageFormatter.java
transport/TransportUtils.java transport/http/SOAPOverHTTPSender.java
Author: keithc
Date: Thu Feb 8 22:28:31 2007
New Revision: 505199
URL: http://svn.apache.org/viewvc?view=rev&rev=505199
Log:
Fixing AXIS2-2135 by adding new map allEndpoints to AxisConfiguration.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=505199&r1=505198&r2=505199
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Thu Feb 8 22:28:31 2007
@@ -84,6 +84,8 @@
private URL axis2Repository = null;
private HashMap allServices = new HashMap();
+ private HashMap allEndpoints = new HashMap();
+
/**
* Stores the module specified in the server.xml at the document parsing time.
*/
@@ -334,19 +336,12 @@
Map endpoints = axisService.getEndpoints();
String serviceName = axisService.getName();
-
- if (endpoints.isEmpty()) {
- allServices.put(serviceName, axisService);
- } else if (endpoints.size() == 1) {
- // if we have one endpoint, just process it. This is special case as this will be the case
- // most of the time
- allServices.put(serviceName, axisService);
- allServices.put(serviceName + "." + axisService.getEndpointName(), axisService);
- } else {
+ allServices.put(serviceName, axisService);
+ if (endpoints != null ) {
Iterator endpointNameIter = endpoints.keySet().iterator();
while (endpointNameIter.hasNext()) {
String endpointName = (String) endpointNameIter.next();
- allServices.put(serviceName + "." + endpointName, axisService);
+ allEndpoints.put(serviceName + "." + endpointName, axisService);
}
}
@@ -709,8 +704,17 @@
.getMessage("serviceinactive", name));
}
} else {
- return null;
+ axisService = (AxisService) allEndpoints.get(name);
+ if (axisService != null) {
+ if (axisService.isActive()) {
+ return axisService;
+ } else {
+ throw new AxisFault(Messages
+ .getMessage("serviceinactive", name));
+ }
+ }
}
+ return null;
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java?view=diff&rev=505199&r1=505198&r2=505199
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java Thu Feb 8 22:28:31 2007
@@ -54,7 +54,7 @@
* Preserve flag can be used to preserve the envelope for later use. This is
* usefull when implementing authentication machnisms like NTLM.
*
- * @param out
+ * @param outputStream
* @param preserve :
* do not consume the OM when this is set..
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?view=diff&rev=505199&r1=505198&r2=505199
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Thu Feb 8 22:28:31 2007
@@ -19,10 +19,6 @@
import java.io.InputStream;
import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.Map;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
@@ -31,26 +27,21 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.builder.OMBuilder;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
-import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.SOAPMessageFormatter;
-import org.apache.axis2.transport.http.TransportHeaders;
import org.apache.axis2.util.Builder;
import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.util.Loader;
public class TransportUtils {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java?view=diff&rev=505199&r1=505198&r2=505199
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java Thu Feb 8 22:28:31 2007
@@ -127,7 +127,6 @@
PostMethod postMethod = new PostMethod();
postMethod.setPath(url.getPath());
postMethod.setQueryString(url.getQuery());
- postMethod.setPath(url.getPath());
if (isAuthenticationEnabled(msgContext)) {
postMethod.setDoAuthentication(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org