This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit f4d547c9ef8006c08efd01e3b10f2d23a1603951 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Oct 19 19:30:12 2020 +0200 CAMEL-15695 - Maven archetypes for OSGi and spring-boot move to their project - Added Camel Karaf Archetype Blueprint --- archetypes/camel-archetype-blueprint/pom.xml | 73 ++++++++ .../META-INF/maven/archetype-metadata.xml | 72 ++++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 ++ .../main/resources/archetype-resources/ReadMe.txt | 20 ++ .../src/main/resources/archetype-resources/pom.xml | 146 +++++++++++++++ .../archetype-resources/src/main/java/Hello.java | 26 +++ .../src/main/java/HelloBean.java | 41 +++++ .../OSGI-INF/blueprint/blueprint-bean.xml | 47 +++++ .../src/main/resources/log4j2.properties | 28 +++ ...intBeanPropertiesOverrideFromFileRouteTest.java | 46 +++++ ...intBeanPropertiesOverrideFromTestRouteTest.java | 51 ++++++ .../src/test/java/BlueprintBeanRouteTest.java | 40 ++++ .../src/test/resources/etc/HelloBean.cfg | 1 + .../projects/build-it/archetype.properties | 28 +++ .../src/test/resources/projects/build-it/goal.txt | 1 + .../resources/projects/run-it/archetype.properties | 28 +++ .../src/test/resources/projects/run-it/goal.txt | 1 + .../src/test/resources/settings.xml | 44 +++++ archetypes/pom.xml | 51 ++++++ pom.xml | 1 + 21 files changed, 959 insertions(+) diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml new file mode 100644 index 0000000..f817454 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/pom.xml @@ -0,0 +1,73 @@ +<?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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>archetypes</artifactId> + <version>3.7.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.camel.archetypes</groupId> + <artifactId>camel-archetype-blueprint</artifactId> + <name>Camel :: Archetypes :: Blueprint (OSGi) Based Router</name> + <description>Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.</description> + <packaging>maven-archetype</packaging> + + <properties> + <archetype.test.settingsFile>src/test/resources/settings.xml</archetype.test.settingsFile> <!-- Needed to download Karaf snapshots --> + </properties> + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>${maven-archetype-packaging-version}</version> + </extension> + </extensions> + + <!-- include all resources but only filter archetype-metadata.xml --> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/resources-filtered</directory> + <filtering>true</filtering> + <includes> + <include>**/archetype-metadata.xml</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </testResource> + </testResources> + </build> + +</project> diff --git a/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml new file mode 100644 index 0000000..e772283 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,72 @@ +<?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. + +--> +<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; name="camel-archetype-java" + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <requiredProperties> + <requiredProperty key="camel-version"> + <defaultValue>${project.version}</defaultValue> + </requiredProperty> + <requiredProperty key="maven-compiler-plugin-version"> + <defaultValue>${maven-compiler-plugin-version}</defaultValue> + </requiredProperty> + <requiredProperty key="maven-resources-plugin-version"> + <defaultValue>${maven-resources-plugin-version}</defaultValue> + </requiredProperty> + <requiredProperty key="camel-bundle-plugin-version"> + <defaultValue>${camel-bundle-plugin-version}</defaultValue> + </requiredProperty> + <requiredProperty key="maven-jar-plugin-version"> + <defaultValue>${maven-jar-plugin-version}</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="true" encoding="UTF-8"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true" encoding="UTF-8"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/test/resources</directory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory></directory> + <includes> + <include>ReadMe.txt</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/META-INF/LICENSE.txt b/archetypes/camel-archetype-blueprint/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/META-INF/NOTICE.txt b/archetypes/camel-archetype-blueprint/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt new file mode 100644 index 0000000..85f50e6 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt @@ -0,0 +1,20 @@ +Camel Router Project for Blueprint (OSGi) +========================================= + +To build this project use + + mvn install + +To run the project you can execute the following Maven goal + + mvn camel:run + +To deploy the project in OSGi. For example using Apache ServiceMix +or Apache Karaf. You can run the following command from its shell: + + osgi:install -s mvn:${groupId}/${artifactId}/${version} + +For more help see the Apache Camel documentation + + http://camel.apache.org/ + diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 0000000..4a3e581 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,146 @@ +<?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. +## ------------------------------------------------------------------------ +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>jar</packaging> + + <name>A Camel Blueprint Route</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <dependencyManagement> + <dependencies> + <!-- Camel BOM --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-bom</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-karaf-bom</artifactId> + <version>${camel-version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + + <!-- Camel --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-blueprint</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-blueprint-main</artifactId> + </dependency> + + <!-- Testing --> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-test-blueprint</artifactId> + <scope>test</scope> + </dependency> + + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + + <!-- compiler plugin --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin-version}</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven-resources-plugin-version}</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + + <!-- to generate the MANIFEST.MF of the bundle --> + <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-bundle-plugin</artifactId> + <version>${camel-version}</version> + <extensions>false</extensions> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- to include MANIFEST.MF in the bundle --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin-version}</version> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + + <!-- to run the example using mvn camel:run --> + <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-maven-plugin</artifactId> + <version>${camel-version}</version> + </plugin> + </plugins> + </build> + +</project> diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/java/Hello.java b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/java/Hello.java new file mode 100644 index 0000000..8b16727 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/java/Hello.java @@ -0,0 +1,26 @@ +## ------------------------------------------------------------------------ +## 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 ${package}; + +/** + * An interface for implementing Hello services. + */ +public interface Hello { + + String hello(); + +} diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/java/HelloBean.java b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/java/HelloBean.java new file mode 100644 index 0000000..e8a9015 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/java/HelloBean.java @@ -0,0 +1,41 @@ +## ------------------------------------------------------------------------ +## 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 ${package}; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * A bean which we use in the route + */ +public class HelloBean implements Hello { + + private String say = "Hello World"; + + public String hello() { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return say + " at " + sdf.format(new Date()); + } + + public String getSay() { + return say; + } + + public void setSay(String say) { + this.say = say; + } +} diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint-bean.xml b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint-bean.xml new file mode 100644 index 0000000..ff2e845 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint-bean.xml @@ -0,0 +1,47 @@ +<?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. +## ------------------------------------------------------------------------ +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"; + xsi:schemaLocation=" + http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd + http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd + http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd";> + + <cm:property-placeholder persistent-id="HelloBean" update-strategy="reload"> + <cm:default-properties> + <cm:property name="greeting" value="Hi from Camel" /> + </cm:default-properties> + </cm:property-placeholder> + + <bean id="helloBean" class="${package}.HelloBean"> + <property name="say" value="${greeting}"/> + </bean> + + <camelContext id="blueprint-bean-context" xmlns="http://camel.apache.org/schema/blueprint";> + <route id="timerToLog"> + <from uri="timer:foo?period=5000"/> + <setBody> + <method ref="helloBean" method="hello"/> + </setBody> + <log message="The message contains ${body}"/> + <to uri="mock:result"/> + </route> + </camelContext> + +</blueprint> diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..41a2c65 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanPropertiesOverrideFromFileRouteTest.java b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanPropertiesOverrideFromFileRouteTest.java new file mode 100644 index 0000000..7cf798f --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanPropertiesOverrideFromFileRouteTest.java @@ -0,0 +1,46 @@ +## ------------------------------------------------------------------------ +## 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 ${package}; + +import org.apache.camel.test.blueprint.CamelBlueprintTestSupport; + +import org.junit.Test; + +public class BlueprintBeanPropertiesOverrideFromFileRouteTest extends CamelBlueprintTestSupport { + + @Override + protected String getBlueprintDescriptor() { + return "/OSGI-INF/blueprint/blueprint-bean.xml"; + } + + @Override + protected String[] loadConfigAdminConfigurationFile() { + // which .cfg file to use, and the name of the persistence-id + return new String[]{"src/test/resources/etc/HelloBean.cfg", "HelloBean"}; + } + + @Test + public void testRoute() throws Exception { + // the route is timer based, so every 5th second a message is send + // we should then expect at least one message + getMockEndpoint("mock:result").expectedMinimumMessageCount(1); + + // assert expectations + assertMockEndpointsSatisfied(); + } + +} diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanPropertiesOverrideFromTestRouteTest.java b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanPropertiesOverrideFromTestRouteTest.java new file mode 100644 index 0000000..8620569 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanPropertiesOverrideFromTestRouteTest.java @@ -0,0 +1,51 @@ +## ------------------------------------------------------------------------ +## 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 ${package}; + +import java.util.Dictionary; + +import org.apache.camel.test.blueprint.CamelBlueprintTestSupport; + +import org.junit.Test; + +public class BlueprintBeanPropertiesOverrideFromTestRouteTest extends CamelBlueprintTestSupport { + + @Override + protected String getBlueprintDescriptor() { + return "/OSGI-INF/blueprint/blueprint-bean.xml"; + } + + @Override + protected String useOverridePropertiesWithConfigAdmin(Dictionary props) throws Exception { + // override / add extra properties + props.put("greeting", "Hello from test"); + + // return the persistence-id to use + return "HelloBean"; + } + + @Test + public void testRoute() throws Exception { + // the route is timer based, so every 5th second a message is send + // we should then expect at least one message + getMockEndpoint("mock:result").expectedMinimumMessageCount(1); + + // assert expectations + assertMockEndpointsSatisfied(); + } + +} diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanRouteTest.java b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanRouteTest.java new file mode 100644 index 0000000..59f0e68 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/BlueprintBeanRouteTest.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 ${package}; + +import org.apache.camel.test.blueprint.CamelBlueprintTestSupport; + +import org.junit.Test; + +public class BlueprintBeanRouteTest extends CamelBlueprintTestSupport { + + @Override + protected String getBlueprintDescriptor() { + return "/OSGI-INF/blueprint/blueprint-bean.xml"; + } + + @Test + public void testRoute() throws Exception { + // the route is timer based, so every 5th second a message is send + // we should then expect at least one message + getMockEndpoint("mock:result").expectedMinimumMessageCount(1); + + // assert expectations + assertMockEndpointsSatisfied(); + } + +} diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/etc/HelloBean.cfg b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/etc/HelloBean.cfg new file mode 100644 index 0000000..c452e1e --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/etc/HelloBean.cfg @@ -0,0 +1 @@ +greeting=Hello from file \ No newline at end of file diff --git a/archetypes/camel-archetype-blueprint/src/test/resources/projects/build-it/archetype.properties b/archetypes/camel-archetype-blueprint/src/test/resources/projects/build-it/archetype.properties new file mode 100644 index 0000000..dfa6e77 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/test/resources/projects/build-it/archetype.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- +groupId=org.apache.camel.archetypes.archetypeIT.camel-archetype-blueprint +artifactId=build-it +version=0.0.1 +package=org.apache.camel.archetypes.archetypeIT + +# TODO: Remove these, after https://issues.apache.org/jira/browse/ARCHETYPE-574 fixed +camel-version=${project.version} +logback-version=${logback-version} +maven-compiler-plugin-version=${maven-compiler-plugin-version} +maven-resources-plugin-version=${maven-resources-plugin-version} +camel-bundle-plugin-version=${camel-bundle-plugin-version} +maven-jar-plugin-version=${maven-jar-plugin-version} \ No newline at end of file diff --git a/archetypes/camel-archetype-blueprint/src/test/resources/projects/build-it/goal.txt b/archetypes/camel-archetype-blueprint/src/test/resources/projects/build-it/goal.txt new file mode 100644 index 0000000..f7ffc47 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/test/resources/projects/build-it/goal.txt @@ -0,0 +1 @@ +install \ No newline at end of file diff --git a/archetypes/camel-archetype-blueprint/src/test/resources/projects/run-it/archetype.properties b/archetypes/camel-archetype-blueprint/src/test/resources/projects/run-it/archetype.properties new file mode 100644 index 0000000..313c7de --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/test/resources/projects/run-it/archetype.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- +groupId=org.apache.camel.archetypes.archetypeIT.camel-archetype-blueprint +artifactId=run-it +version=0.0.1 +package=org.apache.camel.archetypes.archetypeIT + +# TODO: Remove these, after https://issues.apache.org/jira/browse/ARCHETYPE-574 fixed +camel-version=${project.version} +logback-version=${logback-version} +maven-compiler-plugin-version=${maven-compiler-plugin-version} +maven-resources-plugin-version=${maven-resources-plugin-version} +camel-bundle-plugin-version=${camel-bundle-plugin-version} +maven-jar-plugin-version=${maven-jar-plugin-version} \ No newline at end of file diff --git a/archetypes/camel-archetype-blueprint/src/test/resources/projects/run-it/goal.txt b/archetypes/camel-archetype-blueprint/src/test/resources/projects/run-it/goal.txt new file mode 100644 index 0000000..bff562f --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/test/resources/projects/run-it/goal.txt @@ -0,0 +1 @@ +install camel:run -Dcamel.duration=1 -Dmaven.test.skip=true \ No newline at end of file diff --git a/archetypes/camel-archetype-blueprint/src/test/resources/settings.xml b/archetypes/camel-archetype-blueprint/src/test/resources/settings.xml new file mode 100644 index 0000000..42030d8 --- /dev/null +++ b/archetypes/camel-archetype-blueprint/src/test/resources/settings.xml @@ -0,0 +1,44 @@ +<?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. + +--> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 + https://maven.apache.org/xsd/settings-1.0.0.xsd";> + <activeProfiles> + <activeProfile>it</activeProfile> + </activeProfiles> + <profiles> + <profile> + <id>it</id> + <repositories> + <repository> + <id>apache-snapshot-repository</id> + <url>http://repository.apache.org/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + </profile> + </profiles> +</settings> \ No newline at end of file diff --git a/archetypes/pom.xml b/archetypes/pom.xml new file mode 100644 index 0000000..b75c65a --- /dev/null +++ b/archetypes/pom.xml @@ -0,0 +1,51 @@ +<?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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>karaf</artifactId> + <version>3.7.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>archetypes</artifactId> + <name>Camel Karaf :: Archetypes</name> + <description>Camel Karaf Archetypes</description> + <packaging>pom</packaging> + + <modules> + <module>camel-archetype-blueprint</module> + </modules> + + <profiles> + <profile> + <id>archetypes-skip-tests</id> + <activation> + <property><name>skipTests</name></property> + </activation> + <properties> + <archetype.test.skip>true</archetype.test.skip> + </properties> + </profile> + </profiles> +</project> diff --git a/pom.xml b/pom.xml index 881eaaa..b65153b 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,7 @@ <module>catalog</module> <module>tests</module> <module>bom</module> + <module>archetypes</module> </modules> <scm>
