Author: veithen
Date: Tue Sep 18 06:59:58 2012
New Revision: 1387009
URL: http://svn.apache.org/viewvc?rev=1387009&view=rev
Log:
Merged latest changes from trunk.
Added:
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample850.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample850.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample851.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample851.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample852.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample852.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample853.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample853.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample854.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample854.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample855.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample855.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample856.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample856.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples/sample857.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample857.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/template_library.xml
- copied unchanged from r1387008,
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/template_library.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/site.xml
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
(props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1386774-1387008
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:r1386774-1387008
Modified: synapse/branches/SYNAPSE-905/modules/documentation/src/site/site.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/documentation/src/site/site.xml?rev=1387009&r1=1387008&r2=1387009&view=diff
==============================================================================
--- synapse/branches/SYNAPSE-905/modules/documentation/src/site/site.xml
(original)
+++ synapse/branches/SYNAPSE-905/modules/documentation/src/site/site.xml Tue
Sep 18 06:59:58 2012
@@ -43,6 +43,7 @@
<item name="Mediators Catalog" href="userguide/mediators.html"/>
<item name="Transports Catalog" href="userguide/transports.html"/>
<item name="Extending Synapse" href="userguide/extending.html"/>
+ <item name="Synapse Template Libraries"
href="userguide/template_library.html"/>
<item name="Upgrading" href="userguide/upgrading.html"/>
<item name="Deployment" href="userguide/deployment.html"/>
<item name="Javadocs" href="apidocs/"/>
Modified:
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples.xml?rev=1387009&r1=1387008&r2=1387009&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/documentation/src/site/xdoc/userguide/samples.xml
Tue Sep 18 06:59:58 2012
@@ -260,6 +260,20 @@
</ul>
</p>
</subsection>
+ <subsection name="Synapse EIP Library">
+ <p>
+ <ul>
+ <li><a href="samples/sample850.html">Sample 850:
Introduction to Synapse Callout Block function template</a></li>
+ <li><a href="samples/sample851.html">Sample 851:
Introduction to Synapse Splitter and Aggregator eip function templates</a></li>
+ <li><a href="samples/sample852.html">Sample 852:
Introduction to Synapse Splitter-Agrregator combined function template</a></li>
+ <li><a href="samples/sample853.html">Sample 853:
Introduction to Synapse Scatter-Gather eip function template</a></li>
+<li><a href="samples/sample854.html">Sample 854: Introduction to Synapse Wire
Tap eip function template</a></li>
+<li><a href="samples/sample855.html">Sample 855: Introduction to Synapse
Content Based Router eip function template</a></li>
+<li><a href="samples/sample856.html">Sample 856: Introduction to Synapse
Dynamic Router eip function template</a></li>
+<li><a href="samples/sample857.html">Sample 857: Introduction to Synapse
Recipient List eip function template</a></li>
+ </ul>
+ </p>
+ </subsection>
</section>
</body>
</document>
Propchange:
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1386774-1387008
