Author: asankha
Date: Tue Aug 29 22:32:54 2006
New Revision: 438380
URL: http://svn.apache.org/viewvc?rev=438380&view=rev
Log:
Update to be compatible with Axis2 changes
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
incubator/synapse/trunk/java/repository/conf/sample/synapse_spring_unittest.xml
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java?rev=438380&r1=438379&r2=438380&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
(original)
+++
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
Tue Aug 29 22:32:54 2006
@@ -17,29 +17,22 @@
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.util.OptionsParser;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.safehaus.asyncweb.container.basic.BasicServiceContainer;
-import org.safehaus.asyncweb.container.basic.HttpServiceHandler;
import org.safehaus.asyncweb.container.ContainerLifecycleException;
-import org.safehaus.asyncweb.container.resolver.ServiceResolver;
import org.safehaus.asyncweb.transport.nio.NIOTransport;
import org.safehaus.asyncweb.transport.nio.HttpIOHandler;
-import org.safehaus.asyncweb.http.HttpRequest;
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
-import java.io.File;
public class AsyncHTTPListener implements TransportListener {
@@ -52,7 +45,7 @@
private int maxKeepAlives = 100;
private int readIdleTime = 300;
private String hostAddress = null;
- private String contextPath;
+ private String serviceContextPath;
public AsyncHTTPListener() {
}
@@ -74,7 +67,7 @@
public void init(ConfigurationContext cfgCtx, TransportInDescription
transprtIn) throws AxisFault {
this.cfgCtx = cfgCtx;
- contextPath = cfgCtx.getContextPath();
+ serviceContextPath = cfgCtx.getServiceContextPath();
try {
Parameter param = transprtIn.getParameter(PARAM_PORT);
@@ -128,6 +121,6 @@
}
public EndpointReference getEPRForService(String serviceName, String ip)
throws AxisFault {
- return new EndpointReference("http://"; + hostAddress + ":" + port +
contextPath + "/" + serviceName);
+ return new EndpointReference("http://"; + hostAddress + ":" + port +
serviceContextPath + "/" + serviceName);
}
}
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java?rev=438380&r1=438379&r2=438380&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
(original)
+++
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
Tue Aug 29 22:32:54 2006
@@ -166,8 +166,8 @@
Worker(MessageContext msgContext, HttpRequest request) {
this.msgContext = msgContext;
this.request = request;
- contextPath = configurationContext.getContextPath() + "/";
- servicePath = configurationContext.getServicePath();
+ contextPath = configurationContext.getContextRoot() + "/";
+ servicePath = configurationContext.getServiceContextPath();
}
public void run() {
Modified:
incubator/synapse/trunk/java/repository/conf/sample/synapse_spring_unittest.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/sample/synapse_spring_unittest.xml?rev=438380&r1=438379&r2=438380&view=diff
==============================================================================
---
incubator/synapse/trunk/java/repository/conf/sample/synapse_spring_unittest.xml
(original)
+++
incubator/synapse/trunk/java/repository/conf/sample/synapse_spring_unittest.xml
Tue Aug 29 22:32:54 2006
@@ -1,13 +1,13 @@
<synapse xmlns="http://ws.apache.org/ns/synapse";
xmlns:spring="http://ws.apache.org/ns/synapse/spring";>
<registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
- <property name="root" value=""/>
+ <property name="root" value="file:./../../repository/"/>
<property name="cachableDuration" value="15000"/>
</registry>
<definitions>
- <set-property name="springconfig1"
key="file:./../../repository/conf/sample/springsample.xml"/>
- <set-property name="springconfig2"
src="file:./../../repository/conf/sample/springsample.xml"/>
+ <set-property name="springconfig1"
key="conf/sample/springsample.xml"/>
+ <set-property name="springconfig2"
src="conf/sample/springsample.xml"/>
</definitions>
<rules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
