You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/12 12:58:33 UTC
[1/4] camel git commit: CAMEL-11059: Remove example that was using
spring-dm
Repository: camel
Updated Branches:
refs/heads/master 4ec55a34e -> a3bbb2011
CAMEL-11059: Remove example that was using spring-dm
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f562a6f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f562a6f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f562a6f5
Branch: refs/heads/master
Commit: f562a6f588833f73ff7eb20e2f953c741bf6b424
Parents: 4ec55a3
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 14:46:02 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 14:46:02 2017 +0200
----------------------------------------------------------------------
examples/camel-example-box-osgi/README.md | 70 -------
examples/camel-example-box-osgi/pom.xml | 83 --------
.../src/main/resources/META-INF/LICENSE.txt | 203 -------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../resources/META-INF/spring/camel-context.xml | 55 -----
.../src/test/resources/log4j2.properties | 23 ---
examples/pom.xml | 1 -
7 files changed, 446 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f562a6f5/examples/camel-example-box-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/README.md b/examples/camel-example-box-osgi/README.md
deleted file mode 100644
index 337710c..0000000
--- a/examples/camel-example-box-osgi/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Box.com OSGi Example
-
-### Introduction
-
-A simple example which sets up a camel route to upload files
-found in an `inbox` directory to a box.com account.
-
-#### Camel component used in this example
-
-* camel-spring-dm
-* camel-box
-
-### Build
-
-First you will need to compile the example:
-
- mvn install
-
-### Run
-
-To run the example on Apache Karaf 4.x or newer
-
-#### Step 1
-
-Launch Karaf with:
-
- bin/karaf
-
-#### Step 2
-
-Add features required into Karaf
-
- feature:repo-add camel ${version}
- feature:install camel-spring-dm
- feature:install camel-box
-
-#### Step 3
-
-Create a `box.properties` file in the Karaf base directory with the following properties
-set to your box account credentials.
-
- box.userName=
- box.userPassword=
- box.clientId=
- box.clientSecret=
-
-#### Step 4
-
-Deploy the example into Karaf
-
- install -s mvn:org.apache.camel/camel-example-box-osgi/${version}
-
-#### Step 5
-
-Copy files to the `inbox` directory in the Karaf base directory.
-
-#### Step 6
-
-Watch them get transferred to your box.com account.
-
-### Forum, Help, etc
-
-If you hit an problems please let us know on the Camel Forums
- <http://camel.apache.org/discussion-forums.html>
-
-Please help us make Apache Camel better - we appreciate any feedback you may
-have. Enjoy!
-
-
-The Camel riders!
http://git-wip-us.apache.org/repos/asf/camel/blob/f562a6f5/examples/camel-example-box-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/pom.xml b/examples/camel-example-box-osgi/pom.xml
deleted file mode 100644
index 5c12f27..0000000
--- a/examples/camel-example-box-osgi/pom.xml
+++ /dev/null
@@ -1,83 +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>examples</artifactId>
- <version>2.19.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-box-osgi</artifactId>
- <name>Camel :: Example :: Box :: OSGi</name>
- <description>An example which use a Box Endpoint in OSGi</description>
- <packaging>jar</packaging>
-
- <properties>
- <category>OSGi</category>
- <title>Box OSGi</title>
-
- <camel.osgi.export.pkg>
- org.apache.camel.example*
- </camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-box</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>
-
- <!-- test -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/f562a6f5/examples/camel-example-box-osgi/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-box-osgi/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-box-osgi/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/f562a6f5/examples/camel-example-box-osgi/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-box-osgi/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-box-osgi/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/f562a6f5/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
deleted file mode 100644
index 1891ef7..0000000
--- a/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
+++ /dev/null
@@ -1,55 +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:camel="http://camel.apache.org/schema/spring"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <bean id="placeholder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value>file:box.properties</value>
- </list>
- </property>
- <property name="ignoreResourceNotFound" value="true" />
- <property name="searchSystemEnvironment" value="true" />
- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
- </bean>
-
- <bean id="box" class="org.apache.camel.component.box.BoxComponent">
- <property name="configuration">
- <bean class="org.apache.camel.component.box.BoxConfiguration">
- <property name="userName" value="${box.userName}"/>
- <property name="userPassword" value="${box.userPassword}"/>
- <property name="clientId" value="${box.clientId}"/>
- <property name="clientSecret" value="${box.clientSecret}"/>
- </bean>
- </property>
- </bean>
-
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="file://inbox"/>
- <to uri="box://files/uploadFile?inBody=fileUploadRequest"/>
- </route>
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/f562a6f5/examples/camel-example-box-osgi/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/src/test/resources/log4j2.properties b/examples/camel-example-box-osgi/src/test/resources/log4j2.properties
deleted file mode 100644
index 699897b..0000000
--- a/examples/camel-example-box-osgi/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,23 +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 = [%10.10t] %-30.30c{1} %-5p %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
http://git-wip-us.apache.org/repos/asf/camel/blob/f562a6f5/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index ed0a3ad..c4fdc80 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,7 +34,6 @@
<module>camel-example-activemq-tomcat</module>
<module>camel-example-aggregate</module>
<module>camel-example-bam</module>
- <module>camel-example-box-osgi</module>
<module>camel-example-cafe</module>
<module>camel-example-cassandra-kubernetes</module>
<module>camel-example-cdi</module>
[4/4] camel git commit: CAMEL-11059: Remove example that was using
spring-dm
Posted by da...@apache.org.
CAMEL-11059: Remove example that was using spring-dm
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a3bbb201
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a3bbb201
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a3bbb201
Branch: refs/heads/master
Commit: a3bbb2011283a42f50045d689ab9ad2433300037
Parents: ab2ed8c
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 14:56:50 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 14:56:50 2017 +0200
----------------------------------------------------------------------
examples/README.adoc | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a3bbb201/examples/README.adoc
----------------------------------------------------------------------
diff --git a/examples/README.adoc b/examples/README.adoc
index 033e8b8..e9b2635 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
### Examples
// examples: START
-Number of Examples: 92 (10 deprecated)
+Number of Examples: 90 (9 deprecated)
[width="100%",cols="4,2,4",options="header"]
|=======================================================================
@@ -133,8 +133,6 @@ Number of Examples: 92 (10 deprecated)
| link:camel-example-spring-jms/README.md[Spring JMS] (camel-example-spring-jms) | Messaging | An example using Spring XML to talk to the JMS server from different kind of client techniques
-| link:camel-example-box-osgi/README.md[Box OSGi] (camel-example-box-osgi) | OSGi | An example which use a Box Endpoint in OSGi
-
| link:camel-example-cdi-osgi/README.md[CDI OSGi] (camel-example-cdi-osgi) | OSGi | *deprecated* PAX CDI example
| link:camel-example-cxf-blueprint/README.md[CXF Blueprint] (camel-example-cxf-blueprint) | OSGi | An example which use a CXF consumer and the OSGI HTTP Service
@@ -147,8 +145,6 @@ Number of Examples: 92 (10 deprecated)
| link:camel-example-servlet-rest-blueprint/README.md[Servlet REST Blueprint] (camel-example-servlet-rest-blueprint) | OSGi | An example using Servlet REST with OSGi Blueprint
-| link:camel-example-spring-dm/README.md[Spring DM] (camel-example-spring-dm) | OSGi | *deprecated* A simple OSGi Spring DM example which creates a bundle that can be dropped into any OSGi container
-
| link:camel-example-sql-blueprint/README.md[SQL Blueprint] (camel-example-sql-blueprint) | OSGi | An example for showing Camel using SQL component with blueprint
| link:camel-example-ssh/README.md[SSH] (camel-example-ssh) | OSGi | A simple SSH example which creates a bundle that can be dropped into any OSGi container
[2/4] camel git commit: CAMEL-11059: Remove example that was using
spring-dm
Posted by da...@apache.org.
CAMEL-11059: Remove example that was using spring-dm
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a853955
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a853955
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a853955
Branch: refs/heads/master
Commit: 7a8539553d4dc9486a2adba279150e222eb90983
Parents: f562a6f
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 14:46:37 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 14:46:37 2017 +0200
----------------------------------------------------------------------
examples/camel-example-spring-dm/README.md | 48 -----
examples/camel-example-spring-dm/pom.xml | 106 ----------
.../camel/example/osgi/MyRouteBuilder.java | 46 -----
.../apache/camel/example/osgi/MyTransform.java | 56 -----
.../src/main/resources/META-INF/LICENSE.txt | 203 -------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../resources/META-INF/spring/camelContext.xml | 38 ----
.../src/main/resources/features.xml | 26 ---
examples/pom.xml | 1 -
9 files changed, 535 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/camel-example-spring-dm/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/README.md b/examples/camel-example-spring-dm/README.md
deleted file mode 100644
index bb40a8d..0000000
--- a/examples/camel-example-spring-dm/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Camel Spring-DM Example
-
-### Introduction
-
-This example shows how use Spring DM (OSGi) with Camel. It can be run using Maven.
-
-### Build
-You will need to compile this example first:
-
- mvn install
-
-### Run from cmd line outside OSGi container
-To run the example using Maven type
-
- mvn camel:run
-
-To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-
-### Run inside OSGi container
-You will need to compile and install this example first:
-
- mvn install
-
-If using Apache Karaf / Apache ServiceMix you can install this example
-from the shell using this example's "features.xml" for easy provisioning.
-
- feature:repo-add camel ${version}
- feature:install camel
- feature:repo-add mvn:org.apache.camel/camel-example-spring-dm/${version}/xml/features
- feature:install camel-example-spring-dm
-
-The example outputs to the log, which you can see using
-
- log:display
-
-... or you can tail the log with
-
- log:tail
-
-And use <kbd>ctrl</kbd>+<kbd>c</kbd> to break the tail.
-
-### Forum, Help, etc
-
-If you hit an problems please let us know on the Camel Forums
- <http://camel.apache.org/discussion-forums.html>
-
-Please help us make Apache Camel better - we appreciate any feedback you may
-have. Enjoy!
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/camel-example-spring-dm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/pom.xml b/examples/camel-example-spring-dm/pom.xml
deleted file mode 100644
index cba2a32..0000000
--- a/examples/camel-example-spring-dm/pom.xml
+++ /dev/null
@@ -1,106 +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>examples</artifactId>
- <version>2.19.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-spring-dm</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Example :: Spring DM (deprecated)</name>
- <description>A simple OSGi Spring DM example which creates a bundle that can be dropped into any OSGi container</description>
-
- <properties>
- <category>OSGi</category>
- <title>Spring DM</title>
-
- <camel.osgi.export.pkg>org.apache.camel.example.osgi.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-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>
- <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>
-
- <!-- Allows the routes to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
-
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java b/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java
deleted file mode 100644
index 9b12ec9..0000000
--- a/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java
+++ /dev/null
@@ -1,46 +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 org.apache.camel.example.osgi;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.Main;
-
-/**
- * A simple example router to show how to define the route with Java DSL
- *
- * @version
- */
-public class MyRouteBuilder extends RouteBuilder {
-
- /**
- * Allow this route to be run as an application
- */
- public static void main(String[] args) throws Exception {
- new Main().run(args);
- }
-
- public void configure() {
- // set up the transform bean
- MyTransform transform = new MyTransform();
- transform.setPrefix("JavaDSL");
-
- from("timer://myTimer?fixedRate=true&period=2000")
- .bean(transform, "transform")
- .to("log:ExampleRouter");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyTransform.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyTransform.java b/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyTransform.java
deleted file mode 100644
index aca5350..0000000
--- a/examples/camel-example-spring-dm/src/main/java/org/apache/camel/example/osgi/MyTransform.java
+++ /dev/null
@@ -1,56 +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 org.apache.camel.example.osgi;
-
-import java.util.Date;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @version
- */
-public class MyTransform {
- private static final Logger LOG = LoggerFactory.getLogger(MyTransform.class);
- private boolean verbose;
- private String prefix = "MyTransform";
-
- public Object transform(Object body) {
- String answer = prefix + " set body: " + new Date();
- if (verbose) {
- System.out.println(">>>> " + answer);
- }
- LOG.info(">>>> " + answer);
- return answer;
- }
-
- public boolean isVerbose() {
- return verbose;
- }
-
- public void setVerbose(boolean verbose) {
- this.verbose = verbose;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/camel-example-spring-dm/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-spring-dm/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-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/7a853955/examples/camel-example-spring-dm/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-spring-dm/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-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/7a853955/examples/camel-example-spring-dm/src/main/resources/META-INF/spring/camelContext.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/src/main/resources/META-INF/spring/camelContext.xml b/examples/camel-example-spring-dm/src/main/resources/META-INF/spring/camelContext.xml
deleted file mode 100644
index 59dc2c7..0000000
--- a/examples/camel-example-spring-dm/src/main/resources/META-INF/spring/camelContext.xml
+++ /dev/null
@@ -1,38 +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:camel="http://camel.apache.org/schema/spring"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="timer://myTimer?fixedRate=true&period=2000"/>
- <bean ref="myTransform" method="transform"/>
- <to uri="log:ExampleRouter"/>
- </route>
- </camelContext>
-
- <bean id="myTransform" class="org.apache.camel.example.osgi.MyTransform">
- <property name="prefix" value="SpringDSL"/>
- </bean>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/camel-example-spring-dm/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/src/main/resources/features.xml b/examples/camel-example-spring-dm/src/main/resources/features.xml
deleted file mode 100644
index 9a587b4..0000000
--- a/examples/camel-example-spring-dm/src/main/resources/features.xml
+++ /dev/null
@@ -1,26 +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>
- <repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
-
- <feature name='camel-example-spring-dm' version='${project.version}'>
- <feature version="${project.version}">camel-spring-dm</feature>
- <bundle>mvn:org.apache.camel/camel-example-spring-dm/${project.version}</bundle>
- </feature>
-
-</features>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/7a853955/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index c4fdc80..18a5b88 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -95,7 +95,6 @@
<module>camel-example-spring-boot-rest-swagger</module>
<module>camel-example-spring-boot-servicecall</module>
<module>camel-example-spring-cloud-servicecall</module>
- <module>camel-example-spring-dm</module>
<module>camel-example-spring-javaconfig</module>
<module>camel-example-spring-jms</module>
<module>camel-example-spring-ws</module>
[3/4] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab2ed8c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab2ed8c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab2ed8c3
Branch: refs/heads/master
Commit: ab2ed8c356f0333338a52fe97f89764a2b82f3ec
Parents: 7a85395
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 12 14:56:34 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 12 14:56:34 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/file/FileEndpoint.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ab2ed8c3/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index db5f140..8a1ed20 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -239,7 +239,6 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
this.probeContentType = probeContentType;
}
-
public String getExtendedAttributes() {
return extendedAttributes;
}