Author: ningjiang
Date: Thu Dec 1 06:44:15 2011
New Revision: 1208969
URL: http://svn.apache.org/viewvc?rev=1208969&view=rev
Log:
Merged revisions 1208964-1208965 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1208964 | ningjiang | 2011-12-01 14:27:37 +0800 (Thu, 01 Dec 2011) | 1 line
Added SaxonXsltTest to the camel-saxon
........
r1208965 | ningjiang | 2011-12-01 14:33:06 +0800 (Thu, 01 Dec 2011) | 1 line
Reverted the change of the XsltFromFileExceptionTest which should not be
committed
........
Added:
camel/branches/camel-2.8.x/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java
- copied unchanged from r1208965,
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java
camel/branches/camel-2.8.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl
- copied unchanged from r1208965,
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 1 06:44:15 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml?rev=1208969&r1=1208968&r2=1208969&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
(original)
+++
camel/branches/camel-2.8.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
Thu Dec 1 06:44:15 2011
@@ -28,13 +28,11 @@
<from uri="direct:start"/>
<to
uri="xslt:org/apache/camel/component/xslt/transform.xsl?transformerFactory=factory"/>
<multicast>
- <bean ref="testBean"/>
<to uri="mock:result"/>
</multicast>
</route>
</camelContext>
<!-- END SNIPPET: example -->
- <bean id="testBean" class="org.apache.camel.component.xslt.TestBean"
scope="singleton"/>
<bean id="factory" class="net.sf.saxon.TransformerFactoryImpl"/>
</beans>
