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/14 10:02:59 UTC
svn commit: r1384676 - in /synapse/branches/SYNAPSE-905: ./
modules/core/src/main/java/org/apache/synapse/eventing/filters/
modules/core/src/main/java/org/apache/synapse/util/resolver/
modules/integration/src/test/java/org/apache/synapse/samples/framew...
Author: veithen
Date: Fri Sep 14 08:02:58 2012
New Revision: 1384676
URL: http://svn.apache.org/viewvc?rev=1384676&view=rev
Log:
Some initial changes.
Modified:
synapse/branches/SYNAPSE-905/ (props changed)
synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java (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/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteHandler.java
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml
synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/conf/services.xml
synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java (props changed)
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_15.xml
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_156.xml
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_17.xml
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_252.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml (props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
svn:mergeinfo = /synapse/trunk/java:1384655-1384656
Propchange: synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java
------------------------------------------------------------------------------
Merged /incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/eventing/filters/TopicBasedEventFilter.java:r234502-492156
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:r1384655-1384656
Merged /incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java:r234502-492156
Modified: synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteHandler.java
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteHandler.java?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteHandler.java (original)
+++ synapse/branches/SYNAPSE-905/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteHandler.java Fri Sep 14 08:02:58 2012
@@ -180,7 +180,7 @@ public class StockQuoteHandler {
public static String parseStandardQuoteResponse(OMElement result) throws Exception {
AXIOMXPath xPath = new AXIOMXPath("//ns:last");
- xPath.addNamespace("ns","http://services.samples/xsd");
+ xPath.addNamespace("ns","http://services.samples");
OMElement last = (OMElement) xPath.selectSingleNode(result);
if (last != null) {
return last.getText();
Modified: synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml (original)
+++ synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml Fri Sep 14 08:02:58 2012
@@ -21,6 +21,10 @@
<service name="SecureStockQuoteService" scope="application">
<module ref="rampart"/>
+ <schema>
+ <mapping package="samples.services" namespace="http://services.samples"/>
+ </schema>
+
<messageReceivers>
<messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
Modified: synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/conf/services.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/conf/services.xml?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/conf/services.xml (original)
+++ synapse/branches/SYNAPSE-905/modules/samples/services/SimpleStockQuoteService/conf/services.xml Fri Sep 14 08:02:58 2012
@@ -18,13 +18,16 @@
-->
<serviceGroup>
-<service name="SimpleStockQuoteService" scope="application">
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
- class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
- class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
- </messageReceivers>
- <parameter locked="false" name="ServiceClass">samples.services.SimpleStockQuoteService</parameter>
-</service>
+ <service name="SimpleStockQuoteService" scope="application">
+ <schema>
+ <mapping package="samples.services" namespace="http://services.samples"/>
+ </schema>
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+ class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
+ class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+ </messageReceivers>
+ <parameter locked="false" name="ServiceClass">samples.services.SimpleStockQuoteService</parameter>
+ </service>
</serviceGroup>
\ No newline at end of file
Propchange: synapse/branches/SYNAPSE-905/modules/transports/core/vfs/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java
------------------------------------------------------------------------------
Merged /incubator/synapse/trunk/java/modules/transports/core/vfs/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java:r234502-492156
Modified: synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_15.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_15.xml?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_15.xml (original)
+++ synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_15.xml Fri Sep 14 08:02:58 2012
@@ -53,9 +53,8 @@
<header xmlns:urn="http://synapse.apache.org" name="urn:lastTradeTimestamp" value="foo"/>
<enrich>
<source type="custom"
- xpath="//ns:getQuoteResponse/ns:return/ax21:lastTradeTimestamp"
- xmlns:ns="http://services.samples"
- xmlns:ax21="http://services.samples/xsd"/>
+ xpath="//ns:getQuoteResponse/ns:return/ns:lastTradeTimestamp"
+ xmlns:ns="http://services.samples"/>
<target xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
xmlns:urn="http://synapse.apache.org"
xpath="/soapenv:Envelope/soapenv:Header/urn:lastTradeTimestamp"/>
Modified: synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_156.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_156.xml?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_156.xml (original)
+++ synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_156.xml Fri Sep 14 08:02:58 2012
@@ -46,8 +46,8 @@
<sequence name="SimpleServiceSeq">
- <property name="SECURE_SER_AMT" expression="//ns:getQuoteResponse/ns:return/ax21:last"
- xmlns:ns="http://services.samples" xmlns:ax21="http://services.samples/xsd"/>
+ <property name="SECURE_SER_AMT" expression="//ns:getQuoteResponse/ns:return/ns:last"
+ xmlns:ns="http://services.samples"/>
<log level="custom">
<property name="SecureStockQuoteService-Amount" expression="get-property('SECURE_SER_AMT')"/>
</log>
@@ -67,8 +67,8 @@
</sequence>
<sequence name="ClientOutSeq">
- <property name="SIMPLE_SER_AMT" expression="//ns:getQuoteResponse/ns:return/ax21:last"
- xmlns:ns="http://services.samples" xmlns:ax21="http://services.samples/xsd"/>
+ <property name="SIMPLE_SER_AMT" expression="//ns:getQuoteResponse/ns:return/ns:last"
+ xmlns:ns="http://services.samples"/>
<log level="custom">
<property name="SimpleStockQuoteService-Amount" expression="get-property('SIMPLE_SER_AMT')"/>
</log>
Modified: synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_17.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_17.xml?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_17.xml (original)
+++ synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_17.xml Fri Sep 14 08:02:58 2012
@@ -47,8 +47,8 @@
</m:CheckPriceResponse>
</format>
<args>
- <arg xmlns:m0="http://services.samples/xsd" expression="//m0:symbol"/>
- <arg xmlns:m0="http://services.samples/xsd" expression="//m0:last"/>
+ <arg xmlns:m0="http://services.samples" expression="//m0:symbol"/>
+ <arg xmlns:m0="http://services.samples" expression="//m0:last"/>
</args>
</payloadFactory>
</out>
Modified: synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_252.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_252.xml?rev=1384676&r1=1384675&r2=1384676&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_252.xml (original)
+++ synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_252.xml Fri Sep 14 08:02:58 2012
@@ -28,7 +28,7 @@
var args = mc.getPayloadXML().toString().split(" ");
mc.setPayloadXML(
<placeOrder xmlns="http://services.samples">
- <order xmlns="http://services.samples/xsd">
+ <order>
<price>{args[0]}</price>
<quantity>{args[1]}</quantity>
<symbol>{args[2]}</symbol>
Propchange: synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged /synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1384655-1384656
Merged /incubator/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r234502-492156