You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2012/09/23 09:09:01 UTC
svn commit: r1388962 - in /synapse/branches/SYNAPSE-905: ./
modules/core/src/main/java/org/apache/synapse/util/resolver/
modules/documentation/src/site/xdoc/userguide/samples/
modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nht...
Author: veithen
Date: Sun Sep 23 07:09:00 2012
New Revision: 1388962
URL: http://svn.apache.org/viewvc?rev=1388962&view=rev
Log:
Merged latest changes from trunk.
Modified:
synapse/branches/SYNAPSE-905/ (props changed)
synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java (props changed)
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample50.xml
synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/MessageFormatterDecoratorFactory.java
synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_50.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml (props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1387047-1388961
Propchange: synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
------------------------------------------------------------------------------
Merged /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java:r1387047-1388961
Modified: synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample50.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample50.xml?rev=1388962&r1=1388961&r2=1388962&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample50.xml (original)
+++ synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample50.xml Sun Sep 23 07:09:00 2012
@@ -28,6 +28,7 @@
<sequence name="main">
<!-- filtering of messages with XPath and regex matches -->
+ <header name="Action" value="urn:getQuote"/>
<filter source="get-property('To')" regex=".*/StockQuote.*">
<then>
<send>
Modified: synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java?rev=1388962&r1=1388961&r2=1388962&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java (original)
+++ synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java Sun Sep 23 07:09:00 2012
@@ -253,7 +253,7 @@ public class Axis2HttpRequest {
}
if (msgContext.isSOAP11() && soapAction != null &&
- soapAction.length() > 0) {
+ soapAction.length() >= 0) {
Header existingHeader =
httpRequest.getFirstHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (existingHeader != null) {
Modified: synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/MessageFormatterDecoratorFactory.java
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/MessageFormatterDecoratorFactory.java?rev=1388962&r1=1388961&r2=1388962&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/MessageFormatterDecoratorFactory.java (original)
+++ synapse/branches/SYNAPSE-905/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/MessageFormatterDecoratorFactory.java Sun Sep 23 07:09:00 2012
@@ -21,7 +21,7 @@ package org.apache.synapse.transport.nht
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.util.MessageProcessorSelector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.protocol.HTTP;
@@ -46,7 +46,7 @@ public class MessageFormatterDecoratorFa
try {
// Get message formatter based on the content type
- MessageFormatter formatter = TransportUtils.getMessageFormatter(msgContext);
+ MessageFormatter formatter = MessageProcessorSelector.getMessageFormatter(msgContext);
Object o = msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (o != null && o instanceof Map) {
Modified: synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java?rev=1388962&r1=1388961&r2=1388962&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java (original)
+++ synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java Sun Sep 23 07:09:00 2012
@@ -26,7 +26,7 @@ import org.apache.axis2.description.Tran
import org.apache.axis2.description.Parameter;
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.util.MessageProcessorSelector;
import org.apache.axis2.transport.base.AbstractTransportSender;
import org.apache.axis2.transport.base.BaseUtils;
import org.apache.axis2.transport.base.ManagementSupport;
@@ -226,7 +226,7 @@ public class VFSTransportSender extends
private void populateResponseFile(FileObject responseFile, MessageContext msgContext,
boolean append, boolean lockingEnabled) throws AxisFault {
- MessageFormatter messageFormatter = TransportUtils.getMessageFormatter(msgContext);
+ MessageFormatter messageFormatter = MessageProcessorSelector.getMessageFormatter(msgContext);
OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext);
try {
Modified: synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_50.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_50.xml?rev=1388962&r1=1388961&r2=1388962&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_50.xml (original)
+++ synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_50.xml Sun Sep 23 07:09:00 2012
@@ -23,6 +23,7 @@
<sequence name="main">
<!-- filtering of messages with XPath and regex matches -->
+ <header name="Action" value="urn:getQuote"/>
<filter source="get-property('To')" regex=".*/StockQuote.*">
<then>
<send>
Propchange: synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged /synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1387047-1388961