Author: davsclaus
Date: Fri Oct 24 00:15:41 2008
New Revision: 707571
URL: http://svn.apache.org/viewvc?rev=707571&view=rev
Log:
CAMEL-1021: Fixed the xquery example
Added:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
(contents, props changed)
- copied, changed from r707541,
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/myTransform.xquery
(with props)
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
(contents, props changed)
- copied, changed from r707541,
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryWithExplicitTypeContext.xml
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery
(props changed)
activemq/camel/trunk/examples/camel-example-spring-xquery/src/main/resources/myTransform.xquery
activemq/camel/trunk/tooling/maven/guice-maven-plugin/ (props changed)
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java?rev=707571&r1=707570&r2=707571&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java
Fri Oct 24 00:15:41 2008
@@ -34,7 +34,7 @@
template.sendBody("direct:start", "<person name='James'
city='London'/>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendTampaMessage() throws Exception {
@@ -43,7 +43,7 @@
template.sendBody("direct:start", "<person name='Hiram'
city='Tampa'/>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java?rev=707571&r1=707570&r2=707571&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
Fri Oct 24 00:15:41 2008
@@ -35,7 +35,7 @@
template.sendBody("direct:start",
"<mail><subject>Hey</subject><body>Hello world!</body></mail>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
Copied:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
(from r707541,
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java?p2=activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java&p1=activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java&r1=707541&r2=707571&rev=707571&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
Fri Oct 24 00:15:41 2008
@@ -23,29 +23,20 @@
/**
* @version $Revision$
*/
-public class XQueryWithExplicitTypeTest extends SpringTestSupport {
- protected MockEndpoint raleighEndpoint;
- protected MockEndpoint tampaEndpoint;
+public class XQueryExampleTest extends SpringTestSupport {
- public void testFunctions() throws Exception {
- raleighEndpoint.expectedMessageCount(1);
- tampaEndpoint.expectedMessageCount(0);
+ public void testExample() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("<employee
id=\"James\"><name><firstName>James</firstName>" +
+
"<lastName>Strachan</lastName></name><location><city>London</city></location></employee>");
- template.sendBody("direct:start", "<person name='Hadrian'
city='Raleigh'/>");
+ template.sendBody("direct:start", "<person
user='James'><firstName>James</firstName>" +
+ "<lastName>Strachan</lastName><city>London</city></person>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- raleighEndpoint = getMockEndpoint("mock:foo.Raleigh");
- tampaEndpoint = getMockEndpoint("mock:foo.Tampa");
- }
-
-
protected ClassPathXmlApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/component/xquery/xqueryWithExplicitTypeContext.xml");
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/xquery/xqueryExampleTest.xml");
}
}
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java?rev=707571&r1=707570&r2=707571&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java
Fri Oct 24 00:15:41 2008
@@ -35,7 +35,7 @@
template.sendBodyAndHeader("direct:one",
"<mail><subject>Hey</subject><body>Hello world!</body></mail>",
"foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testPropogateHeadersUsingTransform() throws Exception {
@@ -47,7 +47,7 @@
template.sendBodyAndHeader("direct:two",
"<person name='James' city='London'/>", "foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testPropogateHeadersUsingSetBody() throws Exception {
@@ -59,7 +59,7 @@
template.sendBodyAndHeader("direct:three",
"<person name='James' city='London'/>", "foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java?rev=707571&r1=707570&r2=707571&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
Fri Oct 24 00:15:41 2008
@@ -33,7 +33,7 @@
template.sendBody("direct:start", "<person name='Hadrian'
city='Raleigh'/>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Added:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/myTransform.xquery
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/myTransform.xquery?rev=707571&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/myTransform.xquery
(added)
+++
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/myTransform.xquery
Fri Oct 24 00:15:41 2008
@@ -0,0 +1,4 @@
+<employee id="{person/@user}">
+ <name>{/person/firstName} {/person/lastName}</name>
+ <location>{/person/city}</location>
+</employee>
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/myTransform.xquery
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform.xquery
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
(from r707541,
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryWithExplicitTypeContext.xml)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml?p2=activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml&p1=activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryWithExplicitTypeContext.xml&r1=707541&r2=707571&rev=707571&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryWithExplicitTypeContext.xml
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
Fri Oct 24 00:15:41 2008
@@ -22,15 +22,14 @@
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
- <route>
- <from uri="direct:start"/>
- <recipientList>
- <xquery type="java.lang.String">concat('mock:foo.',
/person/@city)</xquery>
- </recipientList>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
+ <!-- START SNIPPET: example -->
+ <camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <route>
+ <from uri="direct:start"/>
+ <to
uri="xquery:org/apache/camel/component/xquery/myTransform.xquery"/>
+ <to uri="mock:result"/>
+ </route>
+ </camelContext>
+ <!-- END SNIPPET: example -->
</beans>
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
activemq/camel/trunk/examples/camel-example-spring-xquery/src/main/resources/myTransform.xquery
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-xquery/src/main/resources/myTransform.xquery?rev=707571&r1=707570&r2=707571&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-xquery/src/main/resources/myTransform.xquery
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-xquery/src/main/resources/myTransform.xquery
Fri Oct 24 00:15:41 2008
@@ -1,4 +1,4 @@
<employee id="{person/@user}">
- <name>{/person/firstname} {/person/lastname}</name>
+ <name>{/person/firstName} {/person/lastName}</name>
<location>{/person/city}</location>
</employee>
\ No newline at end of file
Propchange: activemq/camel/trunk/tooling/maven/guice-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 24 00:15:41 2008
@@ -0,0 +1,8 @@
+.checkstyle
+.pmd
+target
+eclipse-classes
+.classpath
+.project
+.settings
+*.i??
