Repository: camel Updated Branches: refs/heads/boot2 71b7f3bed -> dd9aa7856
CAMEL-11762 - Add Karaf Feature for ASN.1 DataFormat CAMEL-11762 - fix typo Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70918650 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70918650 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70918650 Branch: refs/heads/boot2 Commit: 70918650d5354efcd1ba992906ca447ead890bfc Parents: 3a478cb Author: onders86 <[email protected]> Authored: Sat Sep 9 23:11:32 2017 +0300 Committer: onders86 <[email protected]> Committed: Sat Sep 9 23:55:08 2017 +0300 ---------------------------------------------------------------------- .../src/main/docs/asn1-dataformat.adoc | 2 +- .../features/src/main/resources/features.xml | 6 ++++ .../apache/camel/itest/karaf/CamelASN1Test.java | 34 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/70918650/components/camel-asn1/src/main/docs/asn1-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index eb050c4..80f84d2 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |======================================================================= | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unarmshalling +| clazzName | | String | Name of class to use when unmarshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |======================================================================= // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/70918650/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 04ccffb..6b7945b 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -114,6 +114,12 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-apns/${java-apns-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-apns/${project.version}</bundle> </feature> + <feature name='camel-asn1' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:org.openmuc/jasn1/${jasn1-version}</bundle> + <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle> + <bundle>mvn:org.apache.camel/camel-asn1/${project.version}</bundle> + </feature> <feature name='camel-asterisk' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asterisk-java/${asterisk-java-bundle-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/70918650/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java new file mode 100644 index 0000000..ec0973f --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java @@ -0,0 +1,34 @@ +/** + * 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.itest.karaf; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; + +@RunWith(PaxExam.class) +public class CamelASN1Test extends BaseKarafTest { + + public static final String COMPONENT = extractName(CamelASN1Test.class); + + @Test + public void test() throws Exception { + testDataFormat("asn1"); + } + + +} \ No newline at end of file
