You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/01/14 15:38:40 UTC
[03/12] camel git commit: CAMEL-8242: Avoid clash of component and
language in the same package for camel-saxon using same name = xquery.
CAMEL-8242: Avoid clash of component and language in the same package for camel-saxon using same name = xquery.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33b731f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33b731f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33b731f0
Branch: refs/heads/master
Commit: 33b731f0b4496114e0cce42a8cf1ccf02ce627a1
Parents: 0087ba9
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 14 13:35:56 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 14 15:38:23 2015 +0100
----------------------------------------------------------------------
components/camel-saxon/pom.xml | 9 +++--
.../camel/component/xquery/XQueryLanguage.java | 37 -------------------
.../camel/language/xquery/XQueryLanguage.java | 38 ++++++++++++++++++++
.../apache/camel/language/xquery/package.html | 25 +++++++++++++
.../services/org/apache/camel/language/xquery | 2 +-
5 files changed, 70 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/33b731f0/components/camel-saxon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 10ae67a..d2da420 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -26,11 +26,14 @@
<artifactId>camel-saxon</artifactId>
<packaging>bundle</packaging>
- <name>Camel :: SAXON</name>
- <description>Camel SAXON support</description>
+ <name>Camel :: Saxon</name>
+ <description>Camel Saxon (XQuery/XPath) support</description>
<properties>
- <camel.osgi.export.pkg>org.apache.camel.component.xquery.*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.xquery.*,
+ org.apache.camel.language.xquery.*
+ </camel.osgi.export.pkg>
<camel.osgi.export.service>
org.apache.camel.spi.ComponentResolver;component=xquery,
org.apache.camel.spi.LanguageResolver;language=xquery
http://git-wip-us.apache.org/repos/asf/camel/blob/33b731f0/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
deleted file mode 100644
index 69c2cd4..0000000
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.xquery;
-
-import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
-import org.apache.camel.support.LanguageSupport;
-
-/**
- * @version
- */
-public class XQueryLanguage extends LanguageSupport {
-
- public Predicate createPredicate(String expression) {
- expression = loadResource(expression);
- return XQueryBuilder.xquery(expression);
- }
-
- public Expression createExpression(String expression) {
- expression = loadResource(expression);
- return XQueryBuilder.xquery(expression);
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/33b731f0/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java b/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java
new file mode 100644
index 0000000..16a5764
--- /dev/null
+++ b/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.xquery;
+
+import org.apache.camel.Expression;
+import org.apache.camel.Predicate;
+import org.apache.camel.component.xquery.XQueryBuilder;
+import org.apache.camel.support.LanguageSupport;
+
+/**
+ * @version
+ */
+public class XQueryLanguage extends LanguageSupport {
+
+ public Predicate createPredicate(String expression) {
+ expression = loadResource(expression);
+ return XQueryBuilder.xquery(expression);
+ }
+
+ public Expression createExpression(String expression) {
+ expression = loadResource(expression);
+ return XQueryBuilder.xquery(expression);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/33b731f0/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/package.html
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/package.html b/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/package.html
new file mode 100644
index 0000000..0b4523c
--- /dev/null
+++ b/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/package.html
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+The <a href="http://activemq.apache.org/camel/xquery.html">XQuery language</a> for transforming messages with XQuery
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/camel/blob/33b731f0/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery b/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery
index 4452958..95f78ed 100644
--- a/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery
+++ b/components/camel-saxon/src/main/resources/META-INF/services/org/apache/camel/language/xquery
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.xquery.XQueryLanguage
+class=org.apache.camel.language.xquery.XQueryLanguage