Author: veithen
Date: Mon Sep 17 19:07:48 2012
New Revision: 1386775
URL: http://svn.apache.org/viewvc?rev=1386775&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/samples/services/MTOMSwASampleService/conf/services.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
(props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1384709-1386773
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:r1384709-1386773
Modified:
synapse/branches/SYNAPSE-905/modules/samples/services/MTOMSwASampleService/conf/services.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/MTOMSwASampleService/conf/services.xml?rev=1386775&r1=1386774&r2=1386775&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/samples/services/MTOMSwASampleService/conf/services.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/samples/services/MTOMSwASampleService/conf/services.xml
Mon Sep 17 19:07:48 2012
@@ -18,13 +18,16 @@
-->
<serviceGroup>
-<service name="MTOMSwASampleService">
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only";
-
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out";
-
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
- </messageReceivers>
- <parameter locked="false"
name="ServiceClass">samples.services.MTOMSwASampleService</parameter>
-</service>
+ <service name="MTOMSwASampleService">
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only";
+
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out";
+
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
+ </messageReceivers>
+ <parameter locked="false"
name="ServiceClass">samples.services.MTOMSwASampleService</parameter>
+ <operation name="oneWayUploadUsingMTOM">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
+ </operation>
+ </service>
</serviceGroup>
\ No newline at end of file
Propchange:
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1384709-1386773
