Repository: camel Updated Branches: refs/heads/master 2f01b1e0e -> da8842272
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da884227 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da884227 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da884227 Branch: refs/heads/master Commit: da8842272a7019e239dcab1431a3d68db4f77d05 Parents: 2f01b1e Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 15 14:05:13 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 15 14:05:13 2016 +0100 ---------------------------------------------------------------------- examples/camel-example-cxf-osgi/README.md | 2 +- examples/camel-example-cxf/pom.xml | 15 ------ examples/camel-example-netty-http/pom.xml | 4 +- .../camel-example-transformer-blueprint/pom.xml | 17 +++--- .../camel/example/transformer/cdi/MyRoutes.java | 7 --- examples/camel-example-transformer-demo/pom.xml | 54 +++----------------- .../src/main/resources/features.xml | 30 ----------- .../transformer/OrderRouteSpringTest.java | 9 +--- 8 files changed, 20 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-cxf-osgi/README.md ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-osgi/README.md b/examples/camel-example-cxf-osgi/README.md index 0acf52a..65938b6 100644 --- a/examples/camel-example-cxf-osgi/README.md +++ b/examples/camel-example-cxf-osgi/README.md @@ -25,7 +25,7 @@ Remarks: ### Run -To run the example on Apache Karaf 3.x or newer +To run the example on Apache Karaf 4.x or newer #### Step 1: launch the server http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml index 4f1d470..acb4aab 100644 --- a/examples/camel-example-cxf/pom.xml +++ b/examples/camel-example-cxf/pom.xml @@ -30,21 +30,6 @@ <name>Camel :: Example :: CXF</name> <description>An example which demonstrates the use of the Camel CXF component</description> - <properties> - <camel.osgi.export.pkg> - org.apache.camel.example.* - </camel.osgi.export.pkg> - <camel.osgi.import.additional> - org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool - </camel.osgi.import.additional> - <camel.osgi.private.pkg> - org.apache.hello_world_soap_http, - org.apache.hello_world_soap_http.types - </camel.osgi.private.pkg> - <!-- to avoid importing a bunch of cxf packages --> - <camel.osgi.dynamic>*</camel.osgi.dynamic> - </properties> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-netty-http/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-netty-http/pom.xml b/examples/camel-example-netty-http/pom.xml index d806094..f7df7e7 100644 --- a/examples/camel-example-netty-http/pom.xml +++ b/examples/camel-example-netty-http/pom.xml @@ -29,9 +29,7 @@ <artifactId>camel-example-netty-http</artifactId> <packaging>pom</packaging> <name>Camel :: Example :: Netty HTTP</name> - <description>An example showing how to use a shared Netty HTTP server with multiple Camel applications in OSGi - container - </description> + <description>An example showing how to use a shared Netty HTTP server with multiple Camel applications in OSGi container</description> <properties> <camel.osgi.export.pkg>org.apache.camel.example.netty.*</camel.osgi.export.pkg> http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-transformer-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-transformer-blueprint/pom.xml b/examples/camel-example-transformer-blueprint/pom.xml index 7a5df6d..48015ea 100644 --- a/examples/camel-example-transformer-blueprint/pom.xml +++ b/examples/camel-example-transformer-blueprint/pom.xml @@ -28,8 +28,7 @@ <artifactId>camel-example-transformer-blueprint</artifactId> <packaging>bundle</packaging> <name>Camel :: Example :: Transformer :: Blueprint</name> - <description>An example demonstrating declarative transformation along data type declaration using Blueprint DSL - </description> + <description>An example demonstrating declarative transformation along data type declaration using Blueprint DSL</description> <dependencies> <!-- START SNIPPET: e1 --> @@ -41,19 +40,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-blueprint</artifactId> </dependency> - + <!-- logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> @@ -63,10 +65,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - <version>1.6</version> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + <version>1.6</version> </dependency> </dependencies> @@ -95,6 +97,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-transformer-cdi/src/main/java/org/apache/camel/example/transformer/cdi/MyRoutes.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-transformer-cdi/src/main/java/org/apache/camel/example/transformer/cdi/MyRoutes.java b/examples/camel-example-transformer-cdi/src/main/java/org/apache/camel/example/transformer/cdi/MyRoutes.java index ee107a3..9a9fbe0 100644 --- a/examples/camel-example-transformer-cdi/src/main/java/org/apache/camel/example/transformer/cdi/MyRoutes.java +++ b/examples/camel-example-transformer-cdi/src/main/java/org/apache/camel/example/transformer/cdi/MyRoutes.java @@ -16,15 +16,8 @@ */ package org.apache.camel.example.transformer.cdi; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.model.dataformat.JaxbDataFormat; -import org.apache.camel.model.transformer.DataFormatTransformerDefinition; import org.apache.camel.model.transformer.EndpointTransformerDefinition; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Configures all our Camel routes, components, endpoints and beans http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-transformer-demo/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml index b6a6392..df6e1dd 100644 --- a/examples/camel-example-transformer-demo/pom.xml +++ b/examples/camel-example-transformer-demo/pom.xml @@ -26,16 +26,11 @@ </parent> <artifactId>camel-example-transformer-demo</artifactId> - <packaging>bundle</packaging> <name>Camel :: Example :: Transformer :: Demo</name> - <description>An example demonstrating declarative transformation along data type declaration using Spring DSL - </description> - <properties> - <camel.osgi.export.pkg>org.apache.camel.example.transformer.*</camel.osgi.export.pkg> - </properties> + <description>An example demonstrating declarative transformation along data type declaration using Spring DSL</description> + <packaging>jar</packaging> <dependencies> - <!-- START SNIPPET: e1 --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> @@ -56,7 +51,7 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jaxb</artifactId> </dependency> - + <!-- logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -78,51 +73,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - <version>1.6</version> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + <version>1.6</version> </dependency> </dependencies> <build> <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/classes/features.xml</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>${camel.osgi.export.pkg}</Export-Package> - <Import-Package>*</Import-Package> - </instructions> - </configuration> - </plugin> - <!-- Allows the example to be run via 'mvn compile exec:java' --> <plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-transformer-demo/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-transformer-demo/src/main/resources/features.xml b/examples/camel-example-transformer-demo/src/main/resources/features.xml deleted file mode 100644 index c3378fa..0000000 --- a/examples/camel-example-transformer-demo/src/main/resources/features.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="camel-example-transformer-demo"> - <repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository> - - <feature name='camel-example-transformer-demo' version='${project.version}'> - <feature version="${project.version}">camel</feature> - <feature version="${project.version}">camel-bindy</feature> - <feature version="${project.version}">camel-jackson</feature> - <feature version="${project.version}">camel-jaxb</feature> - <feature version="${project.version}">camel-spring</feature> - <bundle>mvn:org.apache.camel/camel-example-transformer-demo/${project.version}</bundle> - </feature> - -</features> http://git-wip-us.apache.org/repos/asf/camel/blob/da884227/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java b/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java index 93768d5..44d287c 100644 --- a/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java +++ b/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java @@ -16,11 +16,7 @@ */ package org.apache.camel.example.transformer; -import java.net.URL; -import java.util.List; - import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.camel.CamelContext; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -33,15 +29,12 @@ import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; import org.apache.camel.test.spring.CamelSpringRunner; import org.apache.camel.test.spring.MockEndpointsAndSkip; import org.custommonkey.xmlunit.XMLUnit; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.test.context.ContextConfiguration; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; @RunWith(CamelSpringRunner.class) @ContextConfiguration(value = "/META-INF/spring/camel-context.xml", loader = CamelSpringDelegatingTestContextLoader.class)
