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 2016/01/01 11:23:51 UTC
[1/7] camel git commit: Camel catalog - Add api to validate simple
language
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x faf4394d5 -> 0db69ba10
refs/heads/master 0b82cfbe3 -> 9d0dc7b2c
Camel catalog - Add api to validate simple language
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7342c0ed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7342c0ed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7342c0ed
Branch: refs/heads/camel-2.16.x
Commit: 7342c0eda5fac029dcacf66c4d324e522f7304ca
Parents: faf4394
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 31 17:29:11 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 31 17:29:58 2015 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 7 +++
.../org/apache/camel/catalog/CamelCatalog.java | 20 +++++++++
.../camel/catalog/DefaultCamelCatalog.java | 40 +++++++++++++++++
.../camel/catalog/SimpleValidationResult.java | 45 ++++++++++++++++++++
.../apache/camel/catalog/CamelCatalogTest.java | 26 +++++++++++
5 files changed, 138 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7342c0ed/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 9f62f73..30b97ea 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -47,6 +47,13 @@
<scope>test</scope>
</dependency>
+ <!-- for testing simple language parser -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/7342c0ed/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 5fedead..4d3f5e4 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -199,6 +199,26 @@ public interface CamelCatalog {
EndpointValidationResult validateEndpointProperties(String uri);
/**
+ * Parses and validates the simple expression.
+ * <p/>
+ * <b>Important:</b> This requires having <tt>camel-core</tt> on the classpath
+ *
+ * @param simple the simple expression
+ * @return validation result
+ */
+ SimpleValidationResult validateSimpleExpression(String simple);
+
+ /**
+ * Parses and validates the simple predicate
+ * <p/>
+ * <b>Important:</b> This requires having <tt>camel-core</tt> on the classpath
+ *
+ * @param simple the simple predicate
+ * @return validation result
+ */
+ SimpleValidationResult validateSimplePredicate(String simple);
+
+ /**
* Returns the component name from the given endpoint uri
*
* @param uri the endpoint uri
http://git-wip-us.apache.org/repos/asf/camel/blob/7342c0ed/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 3cde7ba..607a7e5 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -19,6 +19,7 @@ package org.apache.camel.catalog;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -1200,6 +1201,45 @@ public class DefaultCamelCatalog implements CamelCatalog {
return sb.toString();
}
+ @Override
+ public SimpleValidationResult validateSimpleExpression(String simple) {
+ return doValidateSimple(simple, false);
+ }
+
+ @Override
+ public SimpleValidationResult validateSimplePredicate(String simple) {
+ return doValidateSimple(simple, true);
+ }
+
+ private SimpleValidationResult doValidateSimple(String simple, boolean predicate) {
+ SimpleValidationResult answer = new SimpleValidationResult(simple);
+
+ Object instance = null;
+ Class clazz = null;
+ try {
+ clazz = DefaultCamelCatalog.class.getClassLoader().loadClass("org.apache.camel.language.simple.SimpleLanguage");
+ instance = clazz.newInstance();
+ } catch (Exception e) {
+ // ignore
+ }
+
+ if (clazz != null && instance != null) {
+ try {
+ if (predicate) {
+ instance.getClass().getMethod("createPredicate", String.class).invoke(instance, simple);
+ } else {
+ instance.getClass().getMethod("createExpression", String.class).invoke(instance, simple);
+ }
+ } catch (InvocationTargetException e) {
+ answer.setError(e.getTargetException().getMessage());
+ } catch (Exception e) {
+ answer.setError(e.getMessage());
+ }
+ }
+
+ return answer;
+ }
+
/**
* Special logic for log endpoints to deal when showAll=true
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/7342c0ed/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
new file mode 100644
index 0000000..cd11ef0
--- /dev/null
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
@@ -0,0 +1,45 @@
+/**
+ * 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.catalog;
+
+import java.io.Serializable;
+
+public class SimpleValidationResult implements Serializable {
+
+ private final String simple;
+ private String error;
+
+ public SimpleValidationResult(String simple) {
+ this.simple = simple;
+ }
+
+ public String getSimple() {
+ return simple;
+ }
+
+ public boolean isSuccess() {
+ return error == null;
+ }
+
+ public void setError(String error) {
+ this.error = error;
+ }
+
+ public String getError() {
+ return error;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/7342c0ed/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 0bd8d3b..259272b 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -566,4 +566,30 @@ public class CamelCatalogTest {
assertNotNull(tree);
}
+ @Test
+ public void testSimpleExpression() throws Exception {
+ SimpleValidationResult result = catalog.validateSimpleExpression("${body}");
+ assertTrue(result.isSuccess());
+ assertEquals("${body}", result.getSimple());
+
+ result = catalog.validateSimpleExpression("${body");
+ assertFalse(result.isSuccess());
+ assertEquals("${body", result.getSimple());
+ LOG.info(result.getError());
+ assertTrue(result.getError().startsWith("expected symbol functionEnd but was eol at location 5"));
+ }
+
+ @Test
+ public void testSimplePredicate() throws Exception {
+ SimpleValidationResult result = catalog.validateSimplePredicate("${body} == 'abc'");
+ assertTrue(result.isSuccess());
+ assertEquals("${body} == 'abc'", result.getSimple());
+
+ result = catalog.validateSimplePredicate("${body} > ${header.size");
+ assertFalse(result.isSuccess());
+ assertEquals("${body} > ${header.size", result.getSimple());
+ LOG.info(result.getError());
+ assertTrue(result.getError().startsWith("expected symbol functionEnd but was eol at location 22"));
+ }
+
}
[5/7] camel git commit: Camel catalog - Add api to validate simple
language
Posted by da...@apache.org.
Camel catalog - Add api to validate simple language
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e8e45a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e8e45a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e8e45a3
Branch: refs/heads/master
Commit: 2e8e45a3e5303226ac38826143b7952327ae6ed0
Parents: 510f250
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 1 09:38:11 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 1 11:22:35 2016 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2e8e45a3/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 0a176d1..ec2dbc4 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -85,7 +85,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.camel.catalog</Export-Package>
+ <Export-Package>org.apache.camel.catalog*</Export-Package>
<Import-Package>org.apache.camel.language.simple;resolution:=optional,*</Import-Package>
</instructions>
</configuration>
[4/7] camel git commit: Component title
Posted by da...@apache.org.
Component title
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d0dc7b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d0dc7b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d0dc7b2
Branch: refs/heads/master
Commit: 9d0dc7b2c8f751d954e44039295b652faa013905
Parents: 2e8e45a
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 1 09:40:19 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 1 11:22:35 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9d0dc7b2/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
index 705e9c9..790f1ef 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
@@ -43,7 +43,7 @@ import org.apache.camel.spi.UriPath;
/**
* The sjms-batch component is a specialized for highly performant, transactional batch consumption from a JMS queue.
*/
-@UriEndpoint(scheme = "sjms-batch", title = "Simple JMS Batch Component", syntax = "sjms-batch:destinationName",
+@UriEndpoint(scheme = "sjms-batch", title = "Simple JMS Batch", syntax = "sjms-batch:destinationName",
consumerClass = SjmsBatchComponent.class, label = "messaging", consumerOnly = true)
public class SjmsBatchEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
[3/7] camel git commit: Camel catalog - Add api to validate simple
language
Posted by da...@apache.org.
Camel catalog - Add api to validate simple language
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/635ab04b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/635ab04b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/635ab04b
Branch: refs/heads/master
Commit: 635ab04bc75624859849a3dd76b93463efb29f8c
Parents: 0b82cfb
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 31 17:29:11 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 1 11:22:34 2016 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 7 +++
.../org/apache/camel/catalog/CamelCatalog.java | 20 +++++++++
.../camel/catalog/DefaultCamelCatalog.java | 40 +++++++++++++++++
.../camel/catalog/SimpleValidationResult.java | 45 ++++++++++++++++++++
.../apache/camel/catalog/CamelCatalogTest.java | 26 +++++++++++
5 files changed, 138 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/635ab04b/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 94321d2..bfd5019 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -47,6 +47,13 @@
<scope>test</scope>
</dependency>
+ <!-- for testing simple language parser -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/635ab04b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 5fedead..4d3f5e4 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -199,6 +199,26 @@ public interface CamelCatalog {
EndpointValidationResult validateEndpointProperties(String uri);
/**
+ * Parses and validates the simple expression.
+ * <p/>
+ * <b>Important:</b> This requires having <tt>camel-core</tt> on the classpath
+ *
+ * @param simple the simple expression
+ * @return validation result
+ */
+ SimpleValidationResult validateSimpleExpression(String simple);
+
+ /**
+ * Parses and validates the simple predicate
+ * <p/>
+ * <b>Important:</b> This requires having <tt>camel-core</tt> on the classpath
+ *
+ * @param simple the simple predicate
+ * @return validation result
+ */
+ SimpleValidationResult validateSimplePredicate(String simple);
+
+ /**
* Returns the component name from the given endpoint uri
*
* @param uri the endpoint uri
http://git-wip-us.apache.org/repos/asf/camel/blob/635ab04b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 3cde7ba..607a7e5 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -19,6 +19,7 @@ package org.apache.camel.catalog;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -1200,6 +1201,45 @@ public class DefaultCamelCatalog implements CamelCatalog {
return sb.toString();
}
+ @Override
+ public SimpleValidationResult validateSimpleExpression(String simple) {
+ return doValidateSimple(simple, false);
+ }
+
+ @Override
+ public SimpleValidationResult validateSimplePredicate(String simple) {
+ return doValidateSimple(simple, true);
+ }
+
+ private SimpleValidationResult doValidateSimple(String simple, boolean predicate) {
+ SimpleValidationResult answer = new SimpleValidationResult(simple);
+
+ Object instance = null;
+ Class clazz = null;
+ try {
+ clazz = DefaultCamelCatalog.class.getClassLoader().loadClass("org.apache.camel.language.simple.SimpleLanguage");
+ instance = clazz.newInstance();
+ } catch (Exception e) {
+ // ignore
+ }
+
+ if (clazz != null && instance != null) {
+ try {
+ if (predicate) {
+ instance.getClass().getMethod("createPredicate", String.class).invoke(instance, simple);
+ } else {
+ instance.getClass().getMethod("createExpression", String.class).invoke(instance, simple);
+ }
+ } catch (InvocationTargetException e) {
+ answer.setError(e.getTargetException().getMessage());
+ } catch (Exception e) {
+ answer.setError(e.getMessage());
+ }
+ }
+
+ return answer;
+ }
+
/**
* Special logic for log endpoints to deal when showAll=true
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/635ab04b/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
new file mode 100644
index 0000000..cd11ef0
--- /dev/null
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
@@ -0,0 +1,45 @@
+/**
+ * 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.catalog;
+
+import java.io.Serializable;
+
+public class SimpleValidationResult implements Serializable {
+
+ private final String simple;
+ private String error;
+
+ public SimpleValidationResult(String simple) {
+ this.simple = simple;
+ }
+
+ public String getSimple() {
+ return simple;
+ }
+
+ public boolean isSuccess() {
+ return error == null;
+ }
+
+ public void setError(String error) {
+ this.error = error;
+ }
+
+ public String getError() {
+ return error;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/635ab04b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 0bd8d3b..259272b 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -566,4 +566,30 @@ public class CamelCatalogTest {
assertNotNull(tree);
}
+ @Test
+ public void testSimpleExpression() throws Exception {
+ SimpleValidationResult result = catalog.validateSimpleExpression("${body}");
+ assertTrue(result.isSuccess());
+ assertEquals("${body}", result.getSimple());
+
+ result = catalog.validateSimpleExpression("${body");
+ assertFalse(result.isSuccess());
+ assertEquals("${body", result.getSimple());
+ LOG.info(result.getError());
+ assertTrue(result.getError().startsWith("expected symbol functionEnd but was eol at location 5"));
+ }
+
+ @Test
+ public void testSimplePredicate() throws Exception {
+ SimpleValidationResult result = catalog.validateSimplePredicate("${body} == 'abc'");
+ assertTrue(result.isSuccess());
+ assertEquals("${body} == 'abc'", result.getSimple());
+
+ result = catalog.validateSimplePredicate("${body} > ${header.size");
+ assertFalse(result.isSuccess());
+ assertEquals("${body} > ${header.size", result.getSimple());
+ LOG.info(result.getError());
+ assertTrue(result.getError().startsWith("expected symbol functionEnd but was eol at location 22"));
+ }
+
}
[6/7] camel git commit: Camel catalog - Add api to validate simple
language
Posted by da...@apache.org.
Camel catalog - Add api to validate simple language
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/43679f45
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/43679f45
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/43679f45
Branch: refs/heads/camel-2.16.x
Commit: 43679f45a84fdafa02d699dc37f056ba3f700458
Parents: 7342c0e
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 31 17:36:24 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 1 11:23:26 2016 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/43679f45/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 30b97ea..79c2872 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -29,12 +29,6 @@
<name>Camel :: Platforms :: Catalog</name>
<description>Camel Catalog</description>
- <properties>
- <camel.osgi.export.pkg>
- org.apache.camel.catalog*
- </camel.osgi.export.pkg>
- </properties>
-
<dependencies>
<!-- no dependency -->
@@ -89,6 +83,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.camel.catalog</Export-Package>
+ <Import-Package>org.apache.camel.language.simple;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
[7/7] camel git commit: Camel catalog - Add api to validate simple
language
Posted by da...@apache.org.
Camel catalog - Add api to validate simple language
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0db69ba1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0db69ba1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0db69ba1
Branch: refs/heads/camel-2.16.x
Commit: 0db69ba1052605ba0fa314cf0c3a4f7509ce3b09
Parents: 43679f4
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 1 09:38:11 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 1 11:23:32 2016 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0db69ba1/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 79c2872..da167ac 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -85,7 +85,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.camel.catalog</Export-Package>
+ <Export-Package>org.apache.camel.catalog*</Export-Package>
<Import-Package>org.apache.camel.language.simple;resolution:=optional,*</Import-Package>
</instructions>
</configuration>
[2/7] camel git commit: Camel catalog - Add api to validate simple
language
Posted by da...@apache.org.
Camel catalog - Add api to validate simple language
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/510f250d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/510f250d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/510f250d
Branch: refs/heads/master
Commit: 510f250d24ec08a654e1aaa890b88ad8167f99f0
Parents: 635ab04
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 31 17:36:24 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 1 11:22:34 2016 +0100
----------------------------------------------------------------------
platforms/catalog/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/510f250d/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index bfd5019..0a176d1 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -29,12 +29,6 @@
<name>Camel :: Platforms :: Catalog</name>
<description>Camel Catalog</description>
- <properties>
- <camel.osgi.export.pkg>
- org.apache.camel.catalog*
- </camel.osgi.export.pkg>
- </properties>
-
<dependencies>
<!-- no dependency -->
@@ -89,6 +83,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.camel.catalog</Export-Package>
+ <Import-Package>org.apache.camel.language.simple;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>