Author: cschneider
Date: Thu Aug 25 14:40:34 2011
New Revision: 1161583
URL: http://svn.apache.org/viewvc?rev=1161583&view=rev
Log:
Fix for compile problem after move of StringSource
Modified:
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/converter/StringSourceConverter.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
Modified:
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1161583&r1=1161582&r2=1161583&view=diff
==============================================================================
---
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
(original)
+++
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Thu Aug 25 14:40:34 2011
@@ -36,8 +36,6 @@ import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Node;
-
import net.sf.saxon.Configuration;
import net.sf.saxon.om.DocumentInfo;
import net.sf.saxon.om.Item;
@@ -49,6 +47,7 @@ import net.sf.saxon.query.XQueryExpressi
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.value.Whitespace;
+import org.apache.camel.BytesSource;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
@@ -56,17 +55,17 @@ import org.apache.camel.NoTypeConversion
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeExpressionException;
+import org.apache.camel.StringSource;
import org.apache.camel.component.bean.BeanInvocation;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.converter.jaxp.BytesSource;
-import org.apache.camel.converter.jaxp.StringSource;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.MessageHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
/**
* Creates an XQuery builder.
Modified:
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/converter/StringSourceConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/converter/StringSourceConverter.java?rev=1161583&r1=1161582&r2=1161583&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/converter/StringSourceConverter.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/converter/StringSourceConverter.java
Thu Aug 25 14:40:34 2011
@@ -17,6 +17,7 @@
package org.apache.camel.component.spring.ws.converter;
import org.apache.camel.Converter;
+import org.apache.camel.StringSource;
/**
* A helper class to transform to and from {@link
org.springframework.xml.transform.StringSource} implementations
@@ -42,8 +43,8 @@ public final class StringSourceConverter
* to a Camel {@link org.apache.camel.converter.jaxp.StringSource}
*/
@Converter
- public static org.apache.camel.converter.jaxp.StringSource
toStringSourceFromSpring(org.springframework.xml.transform.StringSource
springStringSource) {
- return new
org.apache.camel.converter.jaxp.StringSource(springStringSource.toString());
+ public static StringSource
toStringSourceFromSpring(org.springframework.xml.transform.StringSource
springStringSource) {
+ return new StringSource(springStringSource.toString());
}
/**
@@ -51,7 +52,7 @@ public final class StringSourceConverter
* to a Spring-WS {@link org.springframework.xml.transform.StringSource}
*/
@Converter
- public static org.springframework.xml.transform.StringSource
toStringSourceFromCamel(org.apache.camel.converter.jaxp.StringSource
camelStringSource) {
+ public static org.springframework.xml.transform.StringSource
toStringSourceFromCamel(StringSource camelStringSource) {
return new
org.springframework.xml.transform.StringSource(camelStringSource.getText());
}
}
Modified:
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java?rev=1161583&r1=1161582&r2=1161583&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
Thu Aug 25 14:40:34 2011
@@ -16,20 +16,20 @@
*/
package org.apache.camel.component.spring.ws;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import javax.xml.transform.Source;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.StringSource;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.converter.jaxp.StringSource;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
@ContextConfiguration
public class ProducerLocalRouteTest extends AbstractJUnit4SpringContextTests {
Modified:
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java?rev=1161583&r1=1161582&r2=1161583&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java
Thu Aug 25 14:40:34 2011
@@ -16,19 +16,19 @@
*/
package org.apache.camel.component.spring.ws;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import javax.xml.transform.Source;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.StringSource;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
@ContextConfiguration
public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
