You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/14 19:16:23 UTC
svn commit: r594999 - in /activemq/camel/trunk/components/camel-saxon: ./
src/main/java/org/apache/camel/builder/saxon/
src/main/java/org/apache/camel/component/xquery/
src/main/resources/META-INF/services/org/apache/camel/language/
src/test/java/org/a...
Author: jstrachan
Date: Wed Nov 14 10:16:19 2007
New Revision: 594999
URL: http://svn.apache.org/viewvc?rev=594999&view=rev
Log:
fix for http://issues.apache.org/activemq/browse/CAMEL-218
Added:
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java (contents, props changed)
- copied, changed from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/ResultFormat.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java (contents, props changed)
- copied, changed from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQuery.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java (contents, props changed)
- copied, changed from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryAnnotationExpressionFactory.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (contents, props changed)
- copied, changed from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java (contents, props changed)
- copied, changed from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryLanguage.java
Removed:
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/ResultFormat.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQuery.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryAnnotationExpressionFactory.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryLanguage.java
Modified:
activemq/camel/trunk/components/camel-saxon/pom.xml
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
activemq/camel/trunk/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java
Modified: activemq/camel/trunk/components/camel-saxon/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/pom.xml?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/pom.xml (original)
+++ activemq/camel/trunk/components/camel-saxon/pom.xml Wed Nov 14 10:16:19 2007
@@ -35,7 +35,7 @@
<properties>
<saxon-version>8.7</saxon-version>
- <camel.osgi.export.pkg>org.apache.camel.builder.saxon*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.component.xquery*</camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -44,18 +44,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
@@ -73,6 +61,19 @@
<version>${saxon-version}</version>
</dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Copied: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java (from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/ResultFormat.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java?p2=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java&p1=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/ResultFormat.java&r1=594497&r2=594999&rev=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/ResultFormat.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java Wed Nov 14 10:16:19 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.saxon;
+package org.apache.camel.component.xquery;
/**
* @version $Revision$
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/ResultFormat.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java (from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQuery.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java?p2=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java&p1=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQuery.java&r1=594497&r2=594999&rev=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQuery.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java Wed Nov 14 10:16:19 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.saxon;
+package org.apache.camel.component.xquery;
import org.apache.camel.language.LanguageAnnotation;
import org.apache.camel.language.NamespacePrefix;
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java (from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryAnnotationExpressionFactory.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java?p2=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java&p1=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryAnnotationExpressionFactory.java&r1=594497&r2=594999&rev=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryAnnotationExpressionFactory.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java Wed Nov 14 10:16:19 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.saxon;
+package org.apache.camel.component.xquery;
import net.sf.saxon.functions.Collection;
import org.apache.camel.CamelContext;
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?p2=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java&p1=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java&r1=594497&r2=594999&rev=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryBuilder.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Wed Nov 14 10:16:19 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.saxon;
+package org.apache.camel.component.xquery;
import java.io.ByteArrayOutputStream;
import java.io.File;
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java Wed Nov 14 10:16:19 2007
@@ -21,7 +21,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.builder.saxon.XQueryBuilder;
+import org.apache.camel.component.xquery.XQueryBuilder;
import org.apache.camel.component.ResourceBasedComponent;
import org.apache.camel.impl.ProcessorEndpoint;
import org.springframework.core.io.Resource;
Copied: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java (from r594497, activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryLanguage.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java?p2=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java&p1=activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryLanguage.java&r1=594497&r2=594999&rev=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/builder/saxon/XQueryLanguage.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java Wed Nov 14 10:16:19 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.saxon;
+package org.apache.camel.component.xquery;
import org.apache.camel.spi.Language;
import org.apache.camel.Exchange;
Propchange: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery Wed Nov 14 10:16:19 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.builder.saxon.XQueryLanguage
+class=org.apache.camel.component.xquery.XQueryLanguage
Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java Wed Nov 14 10:16:19 2007
@@ -17,6 +17,7 @@
package org.apache.camel.builder.saxon;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.component.xquery.XQuery;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.BeanRouteTest;
import org.apache.camel.util.jndi.JndiContext;
Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java Wed Nov 14 10:16:19 2007
@@ -24,7 +24,7 @@
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
-import static org.apache.camel.builder.saxon.XQueryBuilder.xquery;
+import static org.apache.camel.component.xquery.XQueryBuilder.xquery;
import static org.apache.camel.util.ObjectHelper.className;
/**
Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java Wed Nov 14 10:16:19 2007
@@ -23,7 +23,7 @@
import org.apache.camel.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
-import static org.apache.camel.builder.saxon.XQueryBuilder.xquery;
+import static org.apache.camel.component.xquery.XQueryBuilder.xquery;
/**
* @version $Revision: 1.1 $
Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java?rev=594999&r1=594998&r2=594999&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/TestBean.java Wed Nov 14 10:16:19 2007
@@ -17,7 +17,7 @@
*/
package org.apache.camel.component.xquery;
-import org.apache.camel.builder.saxon.XQuery;
+import org.apache.camel.component.xquery.XQuery;
/**
* @version $Revision: 1.1 $