CAMEL-7220 Added camel-schematron into the apache-camel kit and added feature for it
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/441a1b43 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/441a1b43 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/441a1b43 Branch: refs/heads/master Commit: 441a1b4319dbc8c1b77ab1a2682f4ad969ebd249 Parents: 6a9de53 Author: Willem Jiang <[email protected]> Authored: Fri Sep 12 23:35:41 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Fri Sep 12 23:35:41 2014 +0800 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 ++ .../src/main/descriptors/common-bin.xml | 1 + components/pom.xml | 1 + parent/pom.xml | 5 +++ .../features/src/main/resources/features.xml | 9 ++++- .../camel/itest/karaf/CamelSchematronTest.java | 40 ++++++++++++++++++++ 6 files changed, 59 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/441a1b43/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index e4e3ecc..340bd5e 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -564,6 +564,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-schematron</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-script</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/441a1b43/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 9cd6bb8..e2108e4 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -152,6 +152,7 @@ <include>org.apache.camel:camel-sap-netweaver</include> <include>org.apache.camel:camel-saxon</include> <include>org.apache.camel:camel-scala</include> + <include>org.apache.camel:camel-schematron</include> <include>org.apache.camel:camel-script</include> <include>org.apache.camel:camel-servlet</include> <include>org.apache.camel:camel-servletlistener</include> http://git-wip-us.apache.org/repos/asf/camel/blob/441a1b43/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index a9314d9..a53d65f 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -169,6 +169,7 @@ <module>camel-sap-netweaver</module> <module>camel-saxon</module> <module>camel-salesforce</module> + <module>camel-schematron</module> <module>camel-script</module> <module>camel-servlet</module> <module>camel-servletlistener</module> http://git-wip-us.apache.org/repos/asf/camel/blob/441a1b43/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6e1c233..946f1c3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1182,6 +1182,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-schematron</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-script</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/441a1b43/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 96605fa..9f7575f 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1080,7 +1080,14 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-scala/${project.version}</bundle> </feature> - <feature name='camel-script-jruby' version='${project.version}' resolver='(obr)' start-level='50'> + <feature name='camel-schematron' 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.xmlresolver/${xmlresolver-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle> + <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> + <bundle>mvn:org.apache.camel/camel-schematron/${project.version}</bundle> + </feature> + <feature name='camel-script-jruby' version='${project.version}' resolver='(obr)' start-level='50'> <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-jruby/${scriptengines-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:org.jruby/jruby-core/${jruby-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/441a1b43/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java new file mode 100644 index 0000000..7f51d1d --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSchematronTest.java @@ -0,0 +1,40 @@ +/** + * 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.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; + +@RunWith(PaxExam.class) +public class CamelSchematronTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelSchematronTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
