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/18 10:12:43 UTC
svn commit: r1387040 - in /synapse/branches/SYNAPSE-905: ./
modules/core/src/main/java/org/apache/synapse/util/resolver/
modules/documentation/src/site/xdoc/userguide/samples/
repository/conf/sample/ repository/conf/synapse-config/
Author: veithen
Date: Tue Sep 18 08:12:43 2012
New Revision: 1387040
URL: http://svn.apache.org/viewvc?rev=1387040&view=rev
Log:
Merged latest changes from trunk.
Added:
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_410.xml
- copied, changed from r1387032, synapse/trunk/java/repository/conf/sample/synapse_sample_410.xml
Removed:
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample652.xml
synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_652.xml
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/sample410.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml (props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1387009-1387032
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:r1387009-1387032
Modified: synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample410.xml
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample410.xml?rev=1387040&r1=1387039&r2=1387040&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample410.xml (original)
+++ synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample410.xml Tue Sep 18 08:12:43 2012
@@ -24,75 +24,71 @@
</properties>
<body>
<section name="Sample 410: Distributed Transactions Management with the Transaction Mediator">
- <div class="xmlConf"><definitions xmlns="http://ws.apache.org/ns/synapse"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://ws.apache.org/ns/synapse http://synapse.apache.org/ns/2010/04/configuration/synapse_config.xsd">
+ <div class="xmlConf"><![CDATA[<definitions xmlns="http://ws.apache.org/ns/synapse">
- <sequence name="myFaultHandler">
- <log level="custom">
- <property name="text" value="** Rollback Transaction**"/>
- </log>
- <transaction action="rollback"/>
- <send/>
- </sequence>
-
- <sequence name="main" onError="myFaultHandler">
- <in>
- <send>
- <endpoint>
- <address uri="http://localhost:9000/services/SimpleStockQuoteService"/>
- </endpoint>
- </send>
- </in>
-
- <out>
- <transaction action="new"/>
-
- <log level="custom">
- <property name="text" value="** Reporting to the Database esbdb**"/>
- </log>
- <dbreport useTransaction="true" xmlns="http://ws.apache.org/ns/synapse">
- <connection>
- <pool>
- <dsName>java:jdbc/XADerbyDS</dsName>
- <icClass>org.jnp.interfaces.NamingContextFactory</icClass>
- <url>localhost:1099</url>
- <user>synapse</user>
- <password>synapse</password>
- </pool>
- </connection>
- <statement>
- <sql>delete from company where name =?</sql>
- <parameter expression="//m0:return/m1:symbol/child::text()"
- xmlns:m0="http://services.samples"
- xmlns:m1="http://services.samples/xsd"
- type="VARCHAR"/>
- </statement>
- </dbreport>
-
- <log level="custom">
- <property name="text" value="** Reporting to the Database esbdb1**"/>
- </log>
- <dbreport useTransaction="true" xmlns="http://ws.apache.org/ns/synapse">
- <connection>
- <pool>
- <dsName>java:jdbc/XADerbyDS1</dsName>
- <icClass>org.jnp.interfaces.NamingContextFactory</icClass>
- <url>localhost:1099</url>
- <user>synapse</user>
- <password>synapse</password>
- </pool>
- </connection>
- <statement>
- <sql>INSERT into company values ('IBM','c4',12.0)</sql>
- </statement>
- </dbreport>
- <transaction action="commit"/>
- <send/>
- </out>
- </sequence>
-
-</definitions></div>
+<sequence name="myFaultHandler">
+ <log level="custom">
+ <property name="text" value="** Rollback Transaction**"/>
+ </log>
+ <transaction action="rollback"/>
+ <send/>
+</sequence>
+
+<sequence name="main" onError="myFaultHandler">
+ <in>
+ <send>
+ <endpoint>
+ <address uri="http://localhost:9000/services/SimpleStockQuoteService"/>
+ </endpoint>
+ </send>
+ </in>
+
+ <out>
+ <transaction action="new"/>
+
+ <log level="custom">
+ <property name="text" value="** Reporting to the Database esbdb**"/>
+ </log>
+ <dbreport useTransaction="true" xmlns="http://ws.apache.org/ns/synapse">
+ <connection>
+ <pool>
+ <dsName>java:jdbc/XADerbyDS</dsName>
+ <icClass>org.jnp.interfaces.NamingContextFactory</icClass>
+ <url>localhost:1099</url>
+ <user>synapse</user>
+ <password>synapse</password>
+ </pool>
+ </connection>
+ <statement>
+ <sql>delete from company where name =?</sql>
+ <parameter expression="//m0:return/m0:symbol/child::text()"
+ xmlns:m0="http://services.samples"
+ type="VARCHAR"/>
+ </statement>
+ </dbreport>
+
+ <log level="custom">
+ <property name="text" value="** Reporting to the Database esbdb1**"/>
+ </log>
+ <dbreport useTransaction="true" xmlns="http://ws.apache.org/ns/synapse">
+ <connection>
+ <pool>
+ <dsName>java:jdbc/XADerbyDS1</dsName>
+ <icClass>org.jnp.interfaces.NamingContextFactory</icClass>
+ <url>localhost:1099</url>
+ <user>synapse</user>
+ <password>synapse</password>
+ </pool>
+ </connection>
+ <statement>
+ <sql> INSERT into company values ('IBM','c4',12.0)</sql>
+ </statement>
+ </dbreport>
+ <transaction action="commit"/>
+ <send/>
+ </out>
+</sequence>
+</definitions>]]></div>
<subsection name="Objective">
<p>
Demonstrate how to manage complex distributed transactions using the transaction
Copied: synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_410.xml (from r1387032, synapse/trunk/java/repository/conf/sample/synapse_sample_410.xml)
URL: http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_410.xml?p2=synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_410.xml&p1=synapse/trunk/java/repository/conf/sample/synapse_sample_410.xml&r1=1387032&r2=1387040&rev=1387040&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_410.xml (original)
+++ synapse/branches/SYNAPSE-905/repository/conf/sample/synapse_sample_410.xml Tue Sep 18 08:12:43 2012
@@ -57,8 +57,8 @@
</connection>
<statement>
<sql>delete from company where name =?</sql>
- <parameter expression="//m0:return/m1:symbol/child::text()"
- xmlns:m0="http://services.samples" xmlns:m1="http://services.samples/xsd"
+ <parameter expression="//m0:return/m0:symbol/child::text()"
+ xmlns:m0="http://services.samples"
type="VARCHAR"/>
</statement>
</dbreport>
Propchange: synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged /synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1387009-1387032