You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2006/10/24 13:42:42 UTC
svn commit: r467312 - in /incubator/synapse/trunk/java: ./ modules/core/
modules/core/src/org/apache/synapse/config/xml/
modules/core/src/org/apache/synapse/core/axis2/
modules/nhttp/src/org/apache/axis2/transport/nhttp/
Author: asankha
Date: Tue Oct 24 04:42:41 2006
New Revision: 467312
URL: http://svn.apache.org/viewvc?view=rev&rev=467312
Log:
update dependencies in project.xml and minor fixes
Modified:
incubator/synapse/trunk/java/modules/core/project.xml
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/DynamicAxisOperation.java
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
incubator/synapse/trunk/java/project.xml
Modified: incubator/synapse/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/project.xml?view=diff&rev=467312&r1=467311&r2=467312
==============================================================================
--- incubator/synapse/trunk/java/modules/core/project.xml (original)
+++ incubator/synapse/trunk/java/modules/core/project.xml Tue Oct 24 04:42:41 2006
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>axis2</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
<type>mar</type>
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java?view=diff&rev=467312&r1=467311&r2=467312
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java Tue Oct 24 04:42:41 2006
@@ -46,7 +46,7 @@
SequenceMediatorFactory.class,
LogMediatorFactory.class,
SendMediatorFactory.class,
- RestMediatorFactory.class,
+ //RestMediatorFactory.class,
FilterMediatorFactory.class,
SynapseMediatorFactory.class,
DropMediatorFactory.class,
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/DynamicAxisOperation.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/DynamicAxisOperation.java?view=diff&rev=467312&r1=467311&r2=467312
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/DynamicAxisOperation.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/DynamicAxisOperation.java Tue Oct 24 04:42:41 2006
@@ -18,6 +18,7 @@
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.util.UUIDGenerator;
@@ -225,11 +226,16 @@
}
addReferenceParameters(mc);
if (options.isUseSeparateListener()) {
+
+ //options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
+ options.setTransportIn(mc.getConfigurationContext()
+ .getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_HTTP)));
+
SynapseCallbackReceiver callbackReceiver = (SynapseCallbackReceiver) axisOp.getMessageReceiver();
callbackReceiver.addCallback(mc.getMessageID(), callback);
EndpointReference replyToFromTransport = mc.getConfigurationContext().getListenerManager().
getEPRforService(sc.getAxisService().getName(), axisOp.getName().getLocalPart(), mc
- .getTransportIn().getName()
+ .getTransportOut().getName()
.getLocalPart());
if (mc.getReplyTo() == null) {
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?view=diff&rev=467312&r1=467311&r2=467312
==============================================================================
--- 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 Oct 24 04:42:41 2006
@@ -129,7 +129,7 @@
public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
EndpointReference[] endpointReferences = new EndpointReference[1];
endpointReferences[0] = new EndpointReference(
- "http://" + hostAddress + ":" + port + serviceContextPath + "/" + serviceName);
+ "http://" + hostAddress + ":" + port + "/" + serviceContextPath + "/" + serviceName);
return endpointReferences;
}
}
Modified: incubator/synapse/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.xml?view=diff&rev=467312&r1=467311&r2=467312
==============================================================================
--- incubator/synapse/trunk/java/project.xml (original)
+++ incubator/synapse/trunk/java/project.xml Tue Oct 24 04:42:41 2006
@@ -57,18 +57,17 @@
<version>${axis2.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>${axiom.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
-
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
</dependency>
@@ -80,7 +79,7 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
<properties>
@@ -89,7 +88,7 @@
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${neethi.version}</version>
<properties>
@@ -143,7 +142,7 @@
<!-- external MARs -->
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>axis2</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
<type>mar</type>
@@ -157,7 +156,7 @@
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>axis2</groupId>
<artifactId>rampart</artifactId>
<version>${rampart.version}</version>
<type>mar</type>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org