Author: supun
Date: Tue Aug 2 08:48:50 2011
New Revision: 1153065
URL: http://svn.apache.org/viewvc?rev=1153065&view=rev
Log:
using the url endpoints from transports project
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java?rev=1153065&r1=1153064&r2=1153065&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
Tue Aug 2 08:48:50 2011
@@ -27,6 +27,8 @@ import org.apache.axis2.context.Configur
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.transport.base.endpoint.URLEndpointsConfiguration;
+import
org.apache.axis2.transport.base.endpoint.config.URLEndpointsConfigurationFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.nio.params.NIOReactorPNames;
@@ -40,8 +42,6 @@ import org.apache.synapse.commons.evalua
import org.apache.synapse.commons.executors.ExecutorConstants;
import org.apache.synapse.commons.executors.PriorityExecutor;
import org.apache.synapse.commons.executors.config.PriorityExecutorFactory;
-import org.apache.synapse.transport.nhttp.endpoints.EndpointsConfiguration;
-import
org.apache.synapse.transport.nhttp.endpoints.config.EndpointsConfigurationFactory;
import org.apache.synapse.transport.nhttp.util.NhttpMetricsCollector;
import javax.xml.namespace.QName;
@@ -84,7 +84,7 @@ public class ListenerContext {
private HttpParams params = null;
/** Endpoints configuration for specific HTTP Urls */
- private EndpointsConfiguration endpoints = null;
+ private URLEndpointsConfiguration endpoints = null;
public ListenerContext(ConfigurationContext cfgCtx,
TransportInDescription transportIn,
@@ -157,7 +157,7 @@ public class ListenerContext {
param =
transportIn.getParameter(NhttpConstants.ENDPOINTS_CONFIGURATION);
if (param != null && param.getValue() != null) {
- endpoints = new
EndpointsConfigurationFactory().create(param.getValue().toString());
+ endpoints = new
URLEndpointsConfigurationFactory().create(param.getValue().toString());
}
}
@@ -313,7 +313,7 @@ public class ListenerContext {
return params;
}
- public EndpointsConfiguration getEndpoints() {
+ public URLEndpointsConfiguration getEndpoints() {
return endpoints;
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java?rev=1153065&r1=1153064&r2=1153065&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
Tue Aug 2 08:48:50 2011
@@ -30,6 +30,8 @@ import org.apache.axis2.engine.AxisEngin
import org.apache.axis2.transport.RequestResponseTransport;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.transport.base.MetricsCollector;
+import org.apache.axis2.transport.base.endpoint.URLEndpoint;
+import org.apache.axis2.transport.base.endpoint.URLEndpointsConfiguration;
import org.apache.axis2.transport.http.HTTPTransportUtils;
import org.apache.axis2.util.MessageContextBuilder;
import org.apache.commons.logging.Log;
@@ -37,8 +39,6 @@ import org.apache.commons.logging.LogFac
import org.apache.http.*;
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.protocol.HTTP;
-import org.apache.synapse.transport.nhttp.endpoints.Endpoint;
-import org.apache.synapse.transport.nhttp.endpoints.EndpointsConfiguration;
import org.apache.synapse.transport.nhttp.util.NhttpUtil;
import org.apache.synapse.transport.nhttp.util.RESTUtil;
@@ -83,7 +83,7 @@ public class ServerWorker implements Run
/** WSDL processor for Get requests */
private HttpGetRequestProcessor httpGetRequestProcessor = null;
- private EndpointsConfiguration endpointsConfiguration = null;
+ private URLEndpointsConfiguration endpointsConfiguration = null;
private static final String SOAPACTION = "SOAPAction";
private static final String LOCATION = "Location";
@@ -406,7 +406,7 @@ public class ServerWorker implements Run
Constants.Configuration.CHARACTER_SET_ENCODING,
charSetEncoding);
boolean eprFound = false;
if (endpointsConfiguration != null) {
- Endpoint epr =
endpointsConfiguration.getEndpoint(request.getRequestLine().getUri());
+ URLEndpoint epr =
endpointsConfiguration.getEndpoint(request.getRequestLine().getUri());
if (epr != null) {
eprFound = true;
String type =
TransportUtils.getContentType(contentTypeStr, msgContext);
@@ -490,7 +490,7 @@ public class ServerWorker implements Run
boolean eprFound = false;
if (endpointsConfiguration != null) {
- Endpoint epr =
endpointsConfiguration.getEndpoint(request.getRequestLine().getUri());
+ URLEndpoint epr =
endpointsConfiguration.getEndpoint(request.getRequestLine().getUri());
if (epr != null) {
eprFound = true;
String type =
TransportUtils.getContentType(contentTypeStr, msgContext);
