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 2013/07/03 06:20:39 UTC

[1/2] git commit: Fixed features.xml in camel-example-sql

Updated Branches:
  refs/heads/master dcacdbd49 -> a6b292489


Fixed features.xml in camel-example-sql


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a6b29248
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6b29248
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6b29248

Branch: refs/heads/master
Commit: a6b292489fe966a6113244ba403455ba29f80f2d
Parents: b41e3d7
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 1 22:40:14 2013 +0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 3 08:18:48 2013 +0400

----------------------------------------------------------------------
 examples/camel-example-sql/src/main/resources/features.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a6b29248/examples/camel-example-sql/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/features.xml b/examples/camel-example-sql/src/main/resources/features.xml
index 41f230d..d00926c 100644
--- a/examples/camel-example-sql/src/main/resources/features.xml
+++ b/examples/camel-example-sql/src/main/resources/features.xml
@@ -23,8 +23,8 @@
         <feature version="${project.version}">camel-spring</feature>
         <feature version="${project.version}">camel-sql</feature>
         <bundle>mvn:org.apache.derby/derby/${derby-version}</bundle>
-        <bundle>mvn:mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-        <bundle>mvn:mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
+        <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
         <bundle>mvn:org.apache.camel/camel-example-sql/${project.version}</bundle>
     </feature>
 


[2/2] git commit: Added new camel-example-mybatis

Posted by da...@apache.org.
Added new camel-example-mybatis


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b41e3d7a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b41e3d7a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b41e3d7a

Branch: refs/heads/master
Commit: b41e3d7a6e65a313b8b0c1f62e8e5e3ac514804d
Parents: dcacdbd
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 1 22:39:46 2013 +0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 3 08:18:48 2013 +0400

----------------------------------------------------------------------
 examples/camel-example-mybatis/README.txt       |  53 +++++
 examples/camel-example-mybatis/pom.xml          |  82 ++++++++
 .../camel/example/mybatis/DatabaseBean.java     |  86 ++++++++
 .../org/apache/camel/example/mybatis/Order.java |  69 +++++++
 .../camel/example/mybatis/OrderService.java     |  50 +++++
 .../src/main/resources/META-INF/LICENSE.txt     | 203 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt      |  11 +
 .../OSGI-INF/blueprint/camel-mybatis.xml        |  59 ++++++
 .../src/main/resources/SqlMapConfig.xml         |  50 +++++
 .../src/main/resources/features.xml             |  30 +++
 .../org/apache/camel/example/mybatis/Order.xml  |  61 ++++++
 examples/pom.xml                                |   1 +
 parent/pom.xml                                  |  15 ++
 13 files changed, 770 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/README.txt b/examples/camel-example-mybatis/README.txt
new file mode 100644
index 0000000..7a24847
--- /dev/null
+++ b/examples/camel-example-mybatis/README.txt
@@ -0,0 +1,53 @@
+Camel MyBatis Example
+=====================
+
+This example shows how to exchange data using a shared database table.
+
+The example has two Camel routes. The first route insert new data into the table,
+triggered by a timer to run every 5th second.
+
+The second route pickup the newly inserted rows from the table,
+process the row(s), and mark the row(s) as processed when done;
+to avoid picking up the same rows again.
+
+You will need to install this example first to your local maven repository with:
+  mvn install
+
+This example requires running in Apache Karaf / ServiceMix
+
+To install Apache Camel in Karaf you type in the shell (we use version 2.12.0):
+
+  features:chooseurl camel 2.12.0
+  features:install camel
+
+First you need to install the following features in Karaf/ServiceMix with:
+
+  features:install camel-mybatis
+
+TODO: Install this example using its own features file
+
+Then you can install the Camel example:
+
+  osgi:install -s mvn:org.apache.camel/camel-example-mybatis/2.12.0
+
+And you can see the application running by tailing the logs
+
+  log:tail
+
+And you can use ctrl + c to stop tailing the log.
+
+This example uses OSGi Blueprint to setup and configure the database,
+as well the CamelContext. You can see this in the following file:
+In the src/main/resources/OSGI-INF/blueprint/camel-mybatis.xml
+
+This example is documented at
+  http://camel.apache.org/mybatis-example.html
+
+If you hit any problems please talk to us 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/b41e3d7a/examples/camel-example-mybatis/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/pom.xml b/examples/camel-example-mybatis/pom.xml
new file mode 100644
index 0000000..dbeb595
--- /dev/null
+++ b/examples/camel-example-mybatis/pom.xml
@@ -0,0 +1,82 @@
+<?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.12-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-example-mybatis</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: Example :: MyBatis</name>
+  <description>An example for showing Camel using MyBatis SQL mapper component</description>
+
+  <dependencies>
+
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-blueprint</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-mybatis</artifactId>
+    </dependency>
+
+    <!-- jdbc -->
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+
+    <plugins>
+
+      <!-- to generate the MANIFEST-FILE of the bundle -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>target/META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>org.apache.camel.example.mybatis</Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/DatabaseBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/DatabaseBean.java b/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/DatabaseBean.java
new file mode 100644
index 0000000..302d492
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/DatabaseBean.java
@@ -0,0 +1,86 @@
+/**
+ * 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.mybatis;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.component.mybatis.MyBatisComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Bean that creates the database table
+ */
+public class DatabaseBean implements CamelContextAware {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DatabaseBean.class);
+    private CamelContext camelContext;
+
+    public CamelContext getCamelContext() {
+        return camelContext;
+    }
+
+    public void setCamelContext(CamelContext camelContext) {
+        this.camelContext = camelContext;
+    }
+
+    public void create() throws Exception {
+        String sql = "create table ORDERS (\n"
+              + "  ORD_ID integer primary key,\n"
+              + "  ITEM varchar(10),\n"
+              + "  ITEM_COUNT varchar(5),\n"
+              + "  ITEM_DESC varchar(30),\n"
+              + "  ORD_DELETED boolean\n"
+              + ")";
+
+        LOG.info("Creating table orders ...");
+
+        try {
+            execute("drop table orders");
+        } catch (Throwable e) {
+            // ignore
+        }
+
+        execute(sql);
+
+        LOG.info("... created table orders");
+    }
+
+    public void destroy() throws Exception {
+        try {
+            execute("drop table orders");
+        } catch (Throwable e) {
+            // ignore
+        }
+    }
+
+    private void execute(String sql) throws SQLException {
+        MyBatisComponent component = camelContext.getComponent("mybatis", MyBatisComponent.class);
+        Connection con = component.getSqlSessionFactory().getConfiguration().getEnvironment().getDataSource().getConnection();
+        Statement stm = con.createStatement();
+        stm.execute(sql);
+        // must commit connection
+        con.commit();
+        stm.close();
+        con.close();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/Order.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/Order.java b/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/Order.java
new file mode 100644
index 0000000..8c0a0e0
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/Order.java
@@ -0,0 +1,69 @@
+/**
+ * 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.mybatis;
+
+/**
+ * A pojo representing an Order.
+ */
+public class Order {
+
+    private int id;
+    private String item;
+    private int amount;
+    private String description;
+    private boolean processed;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public boolean isProcessed() {
+        return processed;
+    }
+
+    public void setProcessed(boolean processed) {
+        this.processed = processed;
+    }
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/OrderService.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/OrderService.java b/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/OrderService.java
new file mode 100644
index 0000000..9b9c43d
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/java/org/apache/camel/example/mybatis/OrderService.java
@@ -0,0 +1,50 @@
+/**
+ * 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.mybatis;
+
+import java.util.Random;
+
+/**
+ * Bean that generates and process orders.
+ */
+public class OrderService {
+
+    private int counter;
+    private Random ran = new Random();
+
+    /**
+     * Generates a new order
+     */
+    public Order generateOrder() {
+        Order order = new Order();
+        order.setId(counter++);
+        order.setItem(counter % 2 == 0 ? "111" : "222");
+        order.setAmount(ran.nextInt(10) + 1);
+        order.setDescription(counter % 2 == 0 ? "Camel in Action" : "ActiveMQ in Action");
+        return order;
+    }
+
+    /**
+     * Processes the order
+     *
+     * @param order  the order
+     * @return the transformed order
+     */
+    public String processOrder(Order order) {
+        return "Processed order id " + order.getId() + " item " + order.getItem() + " of " + order.getAmount() + " copies of " + order.getDescription();
+    }
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-mybatis/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-mybatis/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/resources/OSGI-INF/blueprint/camel-mybatis.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/resources/OSGI-INF/blueprint/camel-mybatis.xml b/examples/camel-example-mybatis/src/main/resources/OSGI-INF/blueprint/camel-mybatis.xml
new file mode 100644
index 0000000..582c030
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/resources/OSGI-INF/blueprint/camel-mybatis.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="
+           http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+
+  <!-- START SNIPPET: e1 -->
+  <!-- bean which creates/destroys the database table for this example -->
+  <bean id="initDatabase" class="org.apache.camel.example.mybatis.DatabaseBean"
+        init-method="create" destroy-method="destroy">
+    <property name="camelContext" ref="myBatisAndCamel"/>
+  </bean>
+  <!-- END SNIPPET: e1 -->
+
+  <!-- START SNIPPET: e2 -->
+  <!-- order service our business logic bean that creates new orders -->
+  <bean id="orderService" class="org.apache.camel.example.mybatis.OrderService"/>
+
+  <!-- here is Camel configured with a number of routes -->
+  <camelContext id="myBatisAndCamel" xmlns="http://camel.apache.org/schema/blueprint">
+
+    <!-- route that generate new orders and insert them in the database -->
+    <route id="generateOrder-route">
+      <from uri="timer:foo?period=5s"/>
+      <transform>
+        <method ref="orderService" method="generateOrder"/>
+      </transform>
+      <to uri="mybatis:insertOrder?statementType=Insert"/>
+      <log message="Inserted new order ${body.id}"/>
+    </route>
+
+    <!-- route that process the orders by picking up new rows from the database
+         and when done processing then update the row to mark it as processed -->
+    <route id="processOrder-route">
+      <from uri="mybatis:selectOrders?statementType=SelectList&amp;consumer.onConsume=consumeOrder"/>
+      <to uri="bean:orderService?method=processOrder"/>
+      <log message="${body}"/>
+    </route>
+
+  </camelContext>
+  <!-- END SNIPPET: e2 -->
+
+</blueprint>

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/resources/SqlMapConfig.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/resources/SqlMapConfig.xml b/examples/camel-example-mybatis/src/main/resources/SqlMapConfig.xml
new file mode 100644
index 0000000..9683925
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/resources/SqlMapConfig.xml
@@ -0,0 +1,50 @@
+<?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.
+-->
+
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+
+  <settings>
+    <setting name="useGeneratedKeys" value="false"/>
+  </settings>
+
+  <!-- Use type aliases to avoid typing the full classname every time. -->
+  <typeAliases>
+    <typeAlias alias="Order" type="org.apache.camel.example.mybatis.Order"/>
+  </typeAliases>
+
+  <!-- setup environment with JDBC data source -->
+  <environments default="development">
+    <environment id="development">
+      <transactionManager type="JDBC"/>
+      <dataSource type="POOLED">
+        <property name="driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+        <property name="url" value="jdbc:derby:memory:mybatis;create=true"/>
+      </dataSource>
+    </environment>
+  </environments>
+
+  <!-- mapping files -->
+  <mappers>
+    <mapper resource="org/apache/camel/example/mybatis/Order.xml"/>
+  </mappers>
+
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/resources/features.xml b/examples/camel-example-mybatis/src/main/resources/features.xml
new file mode 100644
index 0000000..d07bbc3
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/resources/features.xml
@@ -0,0 +1,30 @@
+<?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-mybatis" version="${project.version}">
+        <feature version="${project.version}">camel</feature>
+        <feature version="${project.version}">camel-mybatis</feature>
+        <bundle>mvn:org.apache.derby/derby/${derby-version}</bundle>
+        <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
+        <bundle>mvn:org.apache.camel/camel-example-mybatis/${project.version}</bundle>
+    </feature>
+
+</features>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/camel-example-mybatis/src/main/resources/org/apache/camel/example/mybatis/Order.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/src/main/resources/org/apache/camel/example/mybatis/Order.xml b/examples/camel-example-mybatis/src/main/resources/org/apache/camel/example/mybatis/Order.xml
new file mode 100644
index 0000000..fb1f1e4
--- /dev/null
+++ b/examples/camel-example-mybatis/src/main/resources/org/apache/camel/example/mybatis/Order.xml
@@ -0,0 +1,61 @@
+<?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.
+-->
+<!-- START SNIPPET: e1 -->
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="Order">
+
+  <!-- Result maps describe the mapping between the columns returned
+ from a query, and the class properties.  A result map isn't
+ necessary if the columns (or aliases) match to the properties
+ exactly. -->
+  <resultMap id="OrderResult" type="Order">
+    <result property="id" column="ORD_ID"/>
+    <result property="item" column="ITEM"/>
+    <result property="amount" column="ITEM_COUNT"/>
+    <result property="description" column="ITEM_DESC"/>
+    <result property="processed" column="ORD_DELETED"/>
+  </resultMap>
+
+  <!-- Select with no parameters using the result map for Order class. -->
+  <select id="selectOrders" resultMap="OrderResult">
+    select * from ORDERS where ORD_DELETED = false order by ORD_ID
+  </select>
+
+  <!-- Insert example, using the Order parameter class -->
+  <insert id="insertOrder" parameterType="Order">
+    insert into ORDERS (
+    ORD_ID,
+    ITEM,
+    ITEM_COUNT,
+    ITEM_DESC,
+    ORD_DELETED
+    )
+    values (
+    #{id}, #{item}, #{amount}, #{description}, false
+    )
+  </insert>
+
+  <update id="consumeOrder" parameterType="Order">
+    update ORDERS set ORD_DELETED = true where ORD_ID = #{id}
+  </update>
+
+</mapper>
+<!-- END SNIPPET: e1 -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 30b9b06..cd51469 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -53,6 +53,7 @@
     <module>camel-example-loadbalancing</module>
     <module>camel-example-loan-broker</module>
     <module>camel-example-management</module>
+    <module>camel-example-mybatis</module>
     <module>camel-example-netty-http</module>
     <module>camel-example-osgi</module>
     <module>camel-example-osgi-rmi</module>

http://git-wip-us.apache.org/repos/asf/camel/blob/b41e3d7a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ade8eb4..a88b984 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1275,6 +1275,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-example-mybatis</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-example-netty-http</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -1353,6 +1358,16 @@
         <artifactId>camel-example-tracer</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-example-twitter-websocket</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-example-twitter-websocket-blueprint</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <!-- camel misc -->
       <dependency>