CAMEL-11059: camel-spring-dm - Should be removed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/037b4948 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/037b4948 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/037b4948 Branch: refs/heads/master Commit: 037b494851373f39b4394e2169e05e9cce5ff17b Parents: 81ce450 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 20 11:00:40 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 20 11:01:45 2017 +0200 ---------------------------------------------------------------------- archetypes/camel-archetype-spring-dm/pom.xml | 61 ------ .../META-INF/maven/archetype-metadata.xml | 72 ------- .../src/main/resources/META-INF/LICENSE.txt | 203 ------------------- .../src/main/resources/META-INF/NOTICE.txt | 11 - .../resources/archetype-resources/ReadMe.txt | 20 -- .../main/resources/archetype-resources/pom.xml | 143 ------------- .../src/main/java/Hello.java | 26 --- .../src/main/java/HelloBean.java | 41 ---- .../resources/META-INF/spring/camel-context.xml | 40 ---- .../src/main/resources/log4j2.properties | 25 --- archetypes/pom.xml | 1 - .../camel/core/osgi/OsgiClassResolver.java | 4 +- .../servlet/osgi/OsgiServletRegisterer.java | 2 +- components/readme.adoc | 2 - docs/user-manual/en/SUMMARY.md | 1 - .../spring-boot/components-starter/README.adoc | 1 - 16 files changed, 3 insertions(+), 650 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/pom.xml b/archetypes/camel-archetype-spring-dm/pom.xml deleted file mode 100644 index 72168bd..0000000 --- a/archetypes/camel-archetype-spring-dm/pom.xml +++ /dev/null @@ -1,61 +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. - ---> -<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</groupId> - <artifactId>archetypes</artifactId> - <version>2.20.0-SNAPSHOT</version> - </parent> - - <groupId>org.apache.camel.archetypes</groupId> - <artifactId>camel-archetype-spring-dm</artifactId> - <name>Camel :: Archetypes :: Spring DM (OSGi) Based Router (deprecated)</name> - <description>Creates a new Camel project with added Spring DSL support. Ready to be deployed in OSGi.</description> - <packaging>maven-archetype</packaging> - - <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> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index c5884a8..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,72 +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. - ---> -<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="maven-bundle-plugin-version"> - <defaultValue>${maven-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> http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/LICENSE.txt b/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/LICENSE.txt deleted file mode 100644 index 6b0b127..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ - - 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. - http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/NOTICE.txt b/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/NOTICE.txt deleted file mode 100644 index 2e215bf..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/META-INF/NOTICE.txt +++ /dev/null @@ -1,11 +0,0 @@ - ========================================================================= - == 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. http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt b/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt deleted file mode 100644 index 5bf3080..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt +++ /dev/null @@ -1,20 +0,0 @@ -Camel Router Project for Spring-DM (OSGi) -========================================= - -To build this project use - - mvn install - -You can run this project using he following Maven goal: - - mvn camel:run - -To deploy the project in OSGi. For example using Apache ServiceMix -or Apache Karaf. You will 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/ - http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 1a5070f..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,143 +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. -## ------------------------------------------------------------------------ -<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 OSGi Spring-DM 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-parent</artifactId> - <version>${camel-version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - - <!-- Camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring</artifactId> - </dependency> - - <!-- Testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</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> - - </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.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${maven-bundle-plugin-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> http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/Hello.java ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/Hello.java b/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/Hello.java deleted file mode 100644 index 8b16727..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/Hello.java +++ /dev/null @@ -1,26 +0,0 @@ -## ------------------------------------------------------------------------ -## 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(); - -} http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/HelloBean.java ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/HelloBean.java b/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/HelloBean.java deleted file mode 100644 index e8a9015..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/java/HelloBean.java +++ /dev/null @@ -1,41 +0,0 @@ -## ------------------------------------------------------------------------ -## 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; - } -} http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml b/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml deleted file mode 100644 index 036431d..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml +++ /dev/null @@ -1,40 +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. -## ------------------------------------------------------------------------ -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:osgi="http://www.springframework.org/schema/osgi"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> - - <bean id="helloBean" class="${package}.HelloBean"> - <property name="say" value="Hi from Camel"/> - </bean> - - <camelContext xmlns="http://camel.apache.org/schema/spring";> - <route> - <from uri="timer:foo?period=5000"/> - <setBody> - <method ref="helloBean" method="hello"/> - </setBody> - <log message="The message contains ${body}"/> - </route> - </camelContext> - -</beans> http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/log4j2.properties deleted file mode 100644 index 6bfc9d9..0000000 --- a/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/log4j2.properties +++ /dev/null @@ -1,25 +0,0 @@ -## --------------------------------------------------------------------------- -## 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.out.type = Console -appender.out.name = out -appender.out.layout.type = PatternLayout -appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n -logger.springframework.name = org.springframework -logger.springframework.level = WARN -rootLogger.level = INFO -rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/archetypes/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 01c9022..c379344 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -48,7 +48,6 @@ <module>camel-archetype-scr</module> <module>camel-archetype-spring</module> <module>camel-archetype-spring-boot</module> - <module>camel-archetype-spring-dm</module> <module>camel-archetype-web</module> </modules> http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java ---------------------------------------------------------------------- diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java index 5094dd7..f75a50a 100644 --- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java +++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java @@ -90,7 +90,7 @@ public class OsgiClassResolver extends DefaultClassResolver { } } - // fallback to default as spring-dm may have issues loading resources + // fallback to default as OSGi may have issues loading resources if (answer == null) { answer = super.loadResourceAsStream(uri); } @@ -103,7 +103,7 @@ public class OsgiClassResolver extends DefaultClassResolver { String resolvedName = resolveUriPath(uri); URL answer = bundleContext.getBundle().getResource(resolvedName); - // fallback to default as spring-dm may have issues loading resources + // fallback to default as OSGi may have issues loading resources if (answer == null) { answer = super.loadResourceAsURL(uri); } http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java ---------------------------------------------------------------------- diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java index 429f9e5..da11b49 100644 --- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java +++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java @@ -51,7 +51,7 @@ public class OsgiServletRegisterer { private HttpServlet servlet; /** - * HttpService to register with. Get this with osgi:reference in the blueprint/spring-dm file + * HttpService to register with. Get this with osgi:reference in the blueprint file */ private HttpService httpService; http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index d2130cf3..07420b7 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1065,8 +1065,6 @@ Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated) | link:camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc[Spring Cloud Netflix] (camel-spring-cloud-netflix) | 2.19 | Camel Cloud integration with Spring Cloud Netflix -| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18 | *deprecated* Camel SpringDM (OSGi) XML DSL - | link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0 | Using Camel with Spring Java Configuration | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 39447fc..2b61b02 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -406,7 +406,6 @@ * [Spring Boot](spring-boot.adoc) * [Spring Cloud](spring-cloud.adoc) * [Spring Cloud Netflix](spring-cloud-netflix.adoc) - * [Spring DM](spring-dm.adoc) * [Spring Java Configuration](spring-javaconfig.adoc) * [Spring Security](spring-security.adoc) * [Swagger](swagger.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/037b4948/platforms/spring-boot/components-starter/README.adoc ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/README.adoc b/platforms/spring-boot/components-starter/README.adoc index debd406..68d3143 100755 --- a/platforms/spring-boot/components-starter/README.adoc +++ b/platforms/spring-boot/components-starter/README.adoc @@ -28,5 +28,4 @@ The following components do not have a starter because of compatibility issues: * **camel-scala** * **camel-scr** (intended for OSGi only) * **camel-spark-rest** -* **camel-spring-dm** * **camel-swagger** (`camel-swagger-java-starter` is included)
