Fix build and upgrade to Scalate 1.5.3/Scala 2.9.1
git-svn-id: https://svn.apache.org/repos/asf/servicemix/documentation/trunk@1206695 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index a09feed..2b8d86d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,9 @@
<pdf.required>false</pdf.required>
- <scala.version>2.9.0</scala.version>
+ <scala.version>2.9.1</scala.version>
- <scalate.version>1.6.0-SNAPSHOT</scalate.version>
+ <scalate.version>1.5.3</scalate.version>
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
diff --git a/src/main/webapp/jbi/components/servicemix-eip.conf b/src/main/webapp/jbi/components/servicemix-eip.conf
index 3fba4d2..7efc472 100644
--- a/src/main/webapp/jbi/components/servicemix-eip.conf
+++ b/src/main/webapp/jbi/components/servicemix-eip.conf
@@ -48,7 +48,6 @@
\\
!http://www.enterpriseintegrationpatterns.com/img/ContentBasedRouter.gif!
\\
-{snippet:id=content-based-router|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
h4. Endpoint properties
{include:jbi/components/_servicemix-eip-content-based-router.conf}
@@ -59,7 +58,7 @@
\\
!http://www.enterpriseintegrationpatterns.com/img/MessageFilter.gif!
\\
-{snippet:id=message-filter|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
+
h4. Endpoint properties
{include:jbi/components/_servicemix-eip-message-filter.conf}
@@ -68,7 +67,6 @@
The old org.apache.servicemix.components.util.PipelineComponent will be deprecated. This one offers the same feature but can be safely clustered and use in a transactional enviromnent.
\\
-{snippet:id=pipeline|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
\\
In the default configuration, faults sent by the transformer component are sent back to the consumer as faults if the exchange MEP supports them, or as errors (for InOnly exchanges). This behavior can be changed by setting the {{sendFaultsToTarget}} attribute to {{true}}, in which case faults will be sent to the target component, or by adding a {{faultsTarget}} element where faults should be sent.
h4. Endpoint properties
@@ -80,7 +78,6 @@
\\
!http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif!
\\
-{snippet:id=static-recipient-list|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
h4. Endpoint properties
{include:jbi/components/_servicemix-eip-static-recipient-list.conf}
@@ -91,7 +88,6 @@
\\
!http://www.enterpriseintegrationpatterns.com/img/RoutingTableSimple.gif!
\\
-{snippet:id=static-routing-slip|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
h4. Endpoint properties
{include:jbi/components/_servicemix-eip-static-routing-slip.conf}
@@ -104,7 +100,6 @@
!http://www.enterpriseintegrationpatterns.com/img/WireTap.gif!
\\
-{snippet:id=wire-tap|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
\\
Similar to the example above, the WireTap can also be used:
* to forward the output message of an exchange using <eip:outListener/>
@@ -118,7 +113,6 @@
\\
!http://www.enterpriseintegrationpatterns.com/img/Sequencer.gif!
\\
-{snippet:id=xpath-splitter|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
h4. Endpoint properties
{include:jbi/components/_servicemix-eip-xpath-splitter.conf}
@@ -128,7 +122,6 @@
!http://www.enterpriseintegrationpatterns.com/img/Aggregator.gif!
\\
-{snippet:id=slit-aggregator|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
h4. Endpoint properties
{include:jbi/components/_servicemix-eip-split-aggregator.conf}
@@ -240,7 +233,6 @@
h4. NamespaceContext
Some patterns use XPath expression. To use such expressions on an xml with namespaces, you need to define a NamespaceContext.
-{snippet:id=namespace-context|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}{snippet}
\\
This NamespaceContext can be referenced by a *namespaceContext* attribute as shown in the XPathSplitter or MessageFilter examples.
