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 2011/02/14 17:50:56 UTC

svn commit: r1070568 - in /camel/trunk: components/ components/camel-mybatis/ components/camel-mybatis/src/ components/camel-mybatis/src/main/ components/camel-mybatis/src/main/java/ components/camel-mybatis/src/main/java/org/ components/camel-mybatis/...

Author: davsclaus
Date: Mon Feb 14 16:50:54 2011
New Revision: 1070568

URL: http://svn.apache.org/viewvc?rev=1070568&view=rev
Log:
CAMEL-2954: camel-mybatis component. Support for pojo statement pending. And for consumer.

Added:
    camel/trunk/components/camel-mybatis/   (with props)
    camel/trunk/components/camel-mybatis/pom.xml   (with props)
    camel/trunk/components/camel-mybatis/src/
    camel/trunk/components/camel-mybatis/src/main/
    camel/trunk/components/camel-mybatis/src/main/java/
    camel/trunk/components/camel-mybatis/src/main/java/org/
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java   (with props)
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java   (with props)
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java   (with props)
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java   (with props)
    camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java   (with props)
    camel/trunk/components/camel-mybatis/src/main/resources/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt   (with props)
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt   (with props)
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/
    camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/mybatis   (with props)
    camel/trunk/components/camel-mybatis/src/test/
    camel/trunk/components/camel-mybatis/src/test/java/
    camel/trunk/components/camel-mybatis/src/test/java/org/
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java   (with props)
    camel/trunk/components/camel-mybatis/src/test/resources/
    camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml   (with props)
    camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties   (with props)
    camel/trunk/components/camel-mybatis/src/test/resources/org/
    camel/trunk/components/camel-mybatis/src/test/resources/org/apache/
    camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/
    camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/
    camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/
    camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml   (with props)
Modified:
    camel/trunk/components/pom.xml
    camel/trunk/parent/pom.xml

Propchange: camel/trunk/components/camel-mybatis/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 14 16:50:54 2011
@@ -0,0 +1,8 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??

Added: camel/trunk/components/camel-mybatis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/pom.xml?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/pom.xml (added)
+++ camel/trunk/components/camel-mybatis/pom.xml Mon Feb 14 16:50:54 2011
@@ -0,0 +1,78 @@
+<?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>camel-parent</artifactId>
+    <version>2.7-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
+  </parent>
+
+  <artifactId>camel-mybatis</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: MyBatis</name>
+  <description>Camel MyBatis support</description>
+
+  <properties>
+	<camel.osgi.export.pkg>org.apache.camel.component.mybatis.*</camel.osgi.export.pkg>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mybatis</groupId>
+      <artifactId>mybatis</artifactId>
+      <version>${mybatis-version}</version>
+    </dependency>
+
+    <!-- testing -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>     
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: camel/trunk/components/camel-mybatis/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/components/camel-mybatis/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java (added)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java Mon Feb 14 16:50:54 2011
@@ -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.component.mybatis;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisComponent extends DefaultComponent {
+
+    private SqlSessionFactory sqlSessionFactory;
+    private String configurationUri = "Configuration.xml";
+
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+        MyBatisEndpoint answer = new MyBatisEndpoint(uri, this, remaining);
+        setProperties(answer, parameters);
+        return answer;
+    }
+
+    private SqlSessionFactory createSqlSessionFactory() throws IOException {
+        ObjectHelper.notNull(configurationUri, "configurationUri", this);
+        Reader reader = Resources.getResourceAsReader(configurationUri);
+        return new SqlSessionFactoryBuilder().build(reader);
+    }
+
+    public synchronized SqlSessionFactory getSqlSessionFactory() throws IOException {
+        if (sqlSessionFactory == null) {
+            sqlSessionFactory = createSqlSessionFactory();
+        }
+        return sqlSessionFactory;
+    }
+
+    public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
+        this.sqlSessionFactory = sqlSessionFactory;
+    }
+
+    public String getConfigurationUri() {
+        return configurationUri;
+    }
+
+    public void setConfigurationUri(String configurationUri) {
+        this.configurationUri = configurationUri;
+    }
+}

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java (added)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,34 @@
+/**
+ * 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.component.mybatis;
+
+/**
+ * MyBatis constants.
+ *
+ * @version $Revision$
+ */
+public final class MyBatisConstants {
+
+    public static final String MYBATIS_RESULT = "CamelMyBatisResult";
+
+    public static final String MYBATIS_STATEMENT_NAME = "CamelMyBatisStatementName";
+
+    private MyBatisConstants() {
+        // Utility class
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConstants.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java (added)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,83 @@
+/**
+ * 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.component.mybatis;
+
+import java.io.IOException;
+
+import org.apache.camel.Component;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ibatis.session.SqlSessionFactory;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisEndpoint extends DefaultEndpoint {
+
+    private String statement;
+    private StatementType statementType;
+
+    public MyBatisEndpoint() {
+    }
+
+    public MyBatisEndpoint(String endpointUri, Component component, String statement) {
+        super(endpointUri, component);
+        this.statement = statement;
+    }
+
+    public Producer createProducer() throws Exception {
+        ObjectHelper.notNull(statementType, "statementType", this);
+        ObjectHelper.notNull(statement, "statement", this);
+        return new MyBatisProducer(this);
+    }
+
+    public Consumer createConsumer(Processor processor) throws Exception {
+        throw new UnsupportedOperationException("Consumer not supported by MyBatis component: " + getEndpointUri());
+    }
+
+    public boolean isSingleton() {
+        return true;
+    }
+
+    @Override
+    public MyBatisComponent getComponent() {
+        return (MyBatisComponent) super.getComponent();
+    }
+
+    public SqlSessionFactory getSqlSessionFactory() throws IOException {
+        return getComponent().getSqlSessionFactory();
+    }
+
+    public String getStatement() {
+        return statement;
+    }
+
+    public void setStatement(String statement) {
+        this.statement = statement;
+    }
+
+    public StatementType getStatementType() {
+        return statementType;
+    }
+
+    public void setStatementType(StatementType statementType) {
+        this.statementType = statementType;
+    }
+}

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java (added)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,221 @@
+/**
+ * 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.component.mybatis;
+
+import java.util.Iterator;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisProducer extends DefaultProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MyBatisProducer.class);
+    private String statement;
+    private MyBatisEndpoint endpoint;
+
+    public MyBatisProducer(MyBatisEndpoint endpoint) {
+        super(endpoint);
+        this.endpoint = endpoint;
+        this.statement = endpoint.getStatement();
+    }
+
+    public void process(Exchange exchange) throws Exception {
+        switch (endpoint.getStatementType()) {
+        case SelectOne:
+            doSelectOne(exchange); break;
+        case SelectList:
+            doSelectList(exchange); break;
+        case Insert:
+            doInsert(exchange); break;
+        case Update:
+            doUpdate(exchange); break;
+        case Delete:
+            doDelete(exchange); break;
+        default:
+            throw new IllegalArgumentException("Unsupported statementType: " + endpoint.getStatementType());
+        }
+    }
+
+    private void doSelectOne(Exchange exchange) throws Exception {
+        SqlSessionFactory client = endpoint.getSqlSessionFactory();
+        SqlSession session = client.openSession();
+        try {
+            Object result;
+            Object in = exchange.getIn().getBody();
+            if (in != null) {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("SelectOne: " + in + "  using statement: " + statement);
+                }
+                result = session.selectOne(statement, in);
+            } else {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("SelectOne using statement: " + statement);
+                }
+                result = session.selectOne(statement);
+            }
+
+            doProcessResult(exchange, result);
+        } finally {
+            session.close();
+        }
+    }
+
+    private void doSelectList(Exchange exchange) throws Exception {
+        SqlSessionFactory client = endpoint.getSqlSessionFactory();
+        SqlSession session = client.openSession();
+        try {
+            Object result;
+            Object in = exchange.getIn().getBody();
+            if (in != null) {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("SelectList: " + in + "  using statement: " + statement);
+                }
+                result = session.selectList(statement, in);
+            } else {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("SelectList using statement: " + statement);
+                }
+                result = session.selectList(statement);
+            }
+
+            doProcessResult(exchange, result);
+        } finally {
+            session.close();
+        }
+    }
+
+    private void doInsert(Exchange exchange) throws Exception {
+        SqlSessionFactory client = endpoint.getSqlSessionFactory();
+        SqlSession session = client.openSession();
+        try {
+            Object result;
+            Object in = exchange.getIn().getBody();
+            if (in != null) {
+                // lets handle arrays or collections of objects
+                Iterator iter = ObjectHelper.createIterator(in);
+                while (iter.hasNext()) {
+                    Object value = iter.next();
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("Inserting: " + value + " using statement: " + statement);
+                    }
+                    result = session.insert(statement, value);
+                    doProcessResult(exchange, result);
+                }
+            } else {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Inserting using statement: " + statement);
+                }
+                result = session.insert(statement);
+                doProcessResult(exchange, result);
+            }
+        } finally {
+            session.commit();
+            session.close();
+        }
+    }
+
+    private void doUpdate(Exchange exchange) throws Exception {
+        SqlSessionFactory client = endpoint.getSqlSessionFactory();
+        SqlSession session = client.openSession();
+        try {
+            Object result;
+            Object in = exchange.getIn().getBody();
+            if (in != null) {
+                // lets handle arrays or collections of objects
+                Iterator iter = ObjectHelper.createIterator(in);
+                while (iter.hasNext()) {
+                    Object value = iter.next();
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("Updating: " + value + " using statement: " + statement);
+                    }
+                    result = session.update(statement, value);
+                    doProcessResult(exchange, result);
+                }
+            } else {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Updating using statement: " + statement);
+                }
+                result = session.update(statement);
+                doProcessResult(exchange, result);
+            }
+        } finally {
+            session.commit();
+            session.close();
+        }
+    }
+
+    private void doDelete(Exchange exchange) throws Exception {
+        SqlSessionFactory client = endpoint.getSqlSessionFactory();
+        SqlSession session = client.openSession();
+        try {
+            Object result;
+            Object in = exchange.getIn().getBody();
+            if (in != null) {
+                // lets handle arrays or collections of objects
+                Iterator iter = ObjectHelper.createIterator(in);
+                while (iter.hasNext()) {
+                    Object value = iter.next();
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("Deleting: " + value + " using statement: " + statement);
+                    }
+                    result = session.delete(statement, value);
+                    doProcessResult(exchange, result);
+                }
+            } else {
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("Deleting using statement: " + statement);
+                }
+                result = session.delete(statement);
+                doProcessResult(exchange, result);
+            }
+        } finally {
+            session.commit();
+            session.close();
+        }
+    }
+
+    private void doProcessResult(Exchange exchange, Object result) {
+        if (endpoint.getStatementType() == StatementType.SelectList || endpoint.getStatementType() == StatementType.SelectOne) {
+            Message answer = exchange.getIn();
+            if (ExchangeHelper.isOutCapable(exchange)) {
+                answer = exchange.getOut();
+                // preserve headers
+                answer.getHeaders().putAll(exchange.getIn().getHeaders());
+            }
+            // set the result as body for insert
+            answer.setBody(result);
+
+            answer.setHeader(MyBatisConstants.MYBATIS_RESULT, result);
+            answer.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME, statement);
+        } else {
+            Message msg = exchange.getIn();
+            msg.setHeader(MyBatisConstants.MYBATIS_RESULT, result);
+            msg.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME, statement);
+        }
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java (added)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,27 @@
+/**
+ * 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.component.mybatis;
+
+/**
+ * Statement types to instruct which MyBatis operation to use.
+ *
+ * @version $Revision$
+ */
+public enum StatementType {
+
+    SelectOne, SelectList, Insert, Update, Delete
+}

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/StatementType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt Mon Feb 14 16:50:54 2011
@@ -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.
+

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:executable = *

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt Mon Feb 14 16:50:54 2011
@@ -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.

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:executable = *

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/mybatis
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/mybatis?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/mybatis (added)
+++ camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/mybatis Mon Feb 14 16:50:54 2011
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.mybatis.MyBatisComponent

Propchange: camel/trunk/components/camel-mybatis/src/main/resources/META-INF/services/org/apache/camel/component/mybatis
------------------------------------------------------------------------------
    svn:executable = *

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,64 @@
+/**
+ * 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.component.mybatis;
+
+/**
+ * @version $Revision$
+ */
+public class Account {
+    private int id;
+    private String firstName;
+    private String lastName;
+    private String emailAddress;
+
+    @Override
+    public String toString() {
+        return "Account[id: " + id + " name: " + firstName + " " + lastName + " email: " + emailAddress + "]";
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/Account.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,73 @@
+/**
+ * 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.component.mybatis;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisDeleteTest extends MyBatisTestSupport {
+
+    @Test
+    public void testDelete() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+
+        template.sendBody("direct:start", 456);
+
+        assertMockEndpointsSatisfied();
+
+        // there should be 1 rows now
+        Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
+        assertEquals("There should be 1 rows", 1, rows.intValue());
+
+        template.sendBody("direct:start", 123);
+
+        // there should be 0 rows now
+        rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
+        assertEquals("There should be 0 rows", 0, rows.intValue());
+    }
+
+    @Test
+    public void testDeleteNotFound() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+
+        template.sendBody("direct:start", 999);
+
+        assertMockEndpointsSatisfied();
+
+        // there should be 2 rows now
+        Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
+        assertEquals("There should be 2 rows", 2, rows.intValue());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .to("mybatis:deleteAccountById?statementType=Delete")
+                    .to("mock:result");
+            }
+        };
+    }
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,60 @@
+/**
+ * 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.component.mybatis;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisInsertTest extends MyBatisTestSupport {
+
+    @Test
+    public void testInsert() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+
+        Account account = new Account();
+        account.setId(444);
+        account.setFirstName("Willem");
+        account.setLastName("Jiang");
+        account.setEmailAddress("Faraway@gmail.com");
+
+        template.sendBody("direct:start", account);
+
+        assertMockEndpointsSatisfied();
+
+        // there should be 3 rows now
+        Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
+        assertEquals("There should be 3 rows", 3, rows.intValue());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .to("mybatis:insertAccount?statementType=Insert")
+                    .to("mock:result");
+            }
+        };
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,60 @@
+/**
+ * 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.component.mybatis;
+
+import java.util.List;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisSelectListTest extends MyBatisTestSupport {
+
+    @Test
+    public void testSelectList() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+
+        template.sendBody("direct:start", null);
+
+        assertMockEndpointsSatisfied();
+
+        List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+        Account james = (Account) list.get(0);
+        Account claus = (Account) list.get(1);
+        assertEquals("James", james.getFirstName());
+        assertEquals("Claus", claus.getFirstName());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // START SNIPPET: e1
+                from("direct:start")
+                    .to("mybatis:selectAllAccounts?statementType=SelectList")
+                    .to("mock:result");
+                // END SNIPPET: e1
+            }
+        };
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,59 @@
+/**
+ * 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.component.mybatis;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisSelectListWithSplitTest extends MyBatisTestSupport {
+
+    @Test
+    public void testSelectList() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(2);
+
+        template.sendBody("direct:start", null);
+
+        assertMockEndpointsSatisfied();
+
+        Account james = mock.getReceivedExchanges().get(0).getIn().getBody(Account.class);
+        Account claus = mock.getReceivedExchanges().get(1).getIn().getBody(Account.class);
+        assertEquals("James", james.getFirstName());
+        assertEquals("Claus", claus.getFirstName());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // START SNIPPET: e1
+                from("direct:start")
+                    .to("mybatis:selectAllAccounts?statementType=SelectList")
+                    // just use split body to split the List into individual objects
+                    .split(body())
+                    .to("mock:result");
+                // END SNIPPET: e1
+            }
+        };
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,66 @@
+/**
+ * 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.component.mybatis;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisSelectOneTest extends MyBatisTestSupport {
+
+    @Test
+    public void testSelectOne() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+        mock.message(0).body().isInstanceOf(Account.class);
+
+        template.sendBody("direct:start", 456);
+
+        assertMockEndpointsSatisfied();
+
+        Account account = mock.getReceivedExchanges().get(0).getIn().getBody(Account.class);
+        assertEquals("Claus", account.getFirstName());
+    }
+
+    @Test
+    public void tesSelectOneNotFound() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+        mock.message(0).body().isNull();
+
+        template.sendBody("direct:start", 999);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // START SNIPPET: e1
+                from("direct:start")
+                    .to("mybatis:selectAccountById?statementType=SelectOne")
+                    .to("mock:result");
+                // END SNIPPET: e1
+            }
+        };
+    }
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,73 @@
+/**
+ * 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.component.mybatis;
+
+import java.sql.Connection;
+import java.sql.Statement;
+
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+
+/**
+ * @version $Revision$
+ */
+public abstract class MyBatisTestSupport extends CamelTestSupport {
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // lets create the database...
+        Connection connection = createConnection();
+        Statement statement = connection.createStatement();
+        statement.execute("create table ACCOUNT ( ACC_ID INTEGER , ACC_FIRST_NAME VARCHAR(255), ACC_LAST_NAME VARCHAR(255), ACC_EMAIL VARCHAR(255)  )");
+        connection.close();
+
+        Account account = new Account();
+        account.setId(123);
+        account.setFirstName("James");
+        account.setLastName("Strachan");
+        account.setEmailAddress("TryGuessing@gmail.com");
+        template.sendBody("mybatis:insertAccount?statementType=Insert", account);
+
+        account = new Account();
+        account.setId(456);
+        account.setFirstName("Claus");
+        account.setLastName("Ibsen");
+        account.setEmailAddress("Noname@gmail.com");
+        template.sendBody("mybatis:insertAccount?statementType=Insert", account);
+    }
+
+    @Override
+    @After
+    public void tearDown() throws Exception {
+        Connection connection = createConnection();
+        Statement statement = connection.createStatement();
+        statement.execute("drop table ACCOUNT");
+        connection.close();
+
+        super.tearDown();
+    }
+
+    private Connection createConnection() throws Exception {
+        MyBatisEndpoint endpoint = resolveMandatoryEndpoint("mybatis:Account", MyBatisEndpoint.class);
+        return endpoint.getSqlSessionFactory().getConfiguration().getEnvironment().getDataSource().getConnection();
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java Mon Feb 14 16:50:54 2011
@@ -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.component.mybatis;
+
+import org.apache.camel.FailedToCreateProducerException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisUnknownStatementTypeTest extends CamelTestSupport {
+
+    @Override
+    public boolean isUseRouteBuilder() {
+        return false;
+    }
+
+    @Test
+    public void testStatementTypeNotSet() throws Exception {
+        context.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("mybatis:selectAllAccounts");
+            }
+        });
+        try {
+            context.start();
+        } catch (FailedToCreateProducerException e) {
+            assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+            assertEquals("statementType must be specified on: Endpoint[mybatis://selectAllAccounts]", e.getCause().getMessage());
+        }
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java (added)
+++ camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java Mon Feb 14 16:50:54 2011
@@ -0,0 +1,67 @@
+/**
+ * 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.component.mybatis;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class MyBatisUpdateTest extends MyBatisTestSupport {
+
+    @Test
+    public void testUpdate() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+
+        Account account = new Account();
+        account.setId(456);
+        account.setFirstName("Claus");
+        account.setLastName("Jensen");
+        account.setEmailAddress("Other@gmail.com");
+
+        template.sendBody("direct:start", account);
+
+        assertMockEndpointsSatisfied();
+
+        // there should be 2 rows now
+        Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
+        assertEquals("There should be 2 rows", 2, rows.intValue());
+
+        Account claus = template.requestBody("mybatis:selectAccountById?statementType=SelectOne", 456, Account.class);
+        assertEquals("Claus", claus.getFirstName());
+        assertEquals("Jensen", claus.getLastName());
+        assertEquals("Other@gmail.com", claus.getEmailAddress());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // START SNIPPET: e1
+                from("direct:start")
+                    .to("mybatis:updateAccount?statementType=Update")
+                    .to("mock:result");
+                // END SNIPPET: e1
+            }
+        };
+    }
+
+}

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml (added)
+++ camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml Mon Feb 14 16:50:54 2011
@@ -0,0 +1,52 @@
+<?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="cacheEnabled" value="false"/>
+    </settings>
+
+    <!-- Use type aliases to avoid typing the full classname every time. -->
+    <typeAliases>
+        <typeAlias alias="Account" type="org.apache.camel.component.mybatis.Account"/>
+    </typeAliases>
+
+    <!-- setup environment with JDBC data source -->
+    <environments default="development">
+        <environment id="development">
+            <transactionManager type="JDBC"/>
+            <dataSource type="POOLED">
+                <property name="driver" value="org.hsqldb.jdbcDriver"/>
+                <property name="url" value="jdbc:hsqldb:mem:camel_ibatis"/>
+                <property name="username" value="sa"/>
+                <property name="password" value=""/>
+            </dataSource>
+        </environment>
+    </environments>
+
+    <!-- mapping files -->
+    <mappers>
+        <mapper resource="org/apache/camel/component/mybatis/Account.xml"/>
+    </mappers>
+
+</configuration>
\ No newline at end of file

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/Configuration.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties Mon Feb 14 16:50:54 2011
@@ -0,0 +1,38 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for testing
+#
+log4j.rootLogger=INFO, out
+
+# uncomment the following to enable debug of Camel
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.com.mybatis=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-mybatis-test.log
+log4j.appender.file.append=true

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml?rev=1070568&view=auto
==============================================================================
--- camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml (added)
+++ camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml Mon Feb 14 16:50:54 2011
@@ -0,0 +1,100 @@
+<?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 mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="Account">
+
+    <!-- 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="AccountResult" type="Account">
+        <result property="id" column="ACC_ID"/>
+        <result property="firstName" column="ACC_FIRST_NAME"/>
+        <result property="lastName" column="ACC_LAST_NAME"/>
+        <result property="emailAddress" column="ACC_EMAIL"/>
+    </resultMap>
+
+    <!-- Select with no parameters using the result map for Account class. -->
+    <select id="selectAllAccounts" resultMap="AccountResult">
+        select * from ACCOUNT order by ACC_ID
+    </select>
+
+    <!-- A simpler select example without the result map.  Note the
+aliases to match the properties of the target result class. -->
+    <select id="selectAccountById" parameterType="int" resultType="Account">
+        select
+        ACC_ID as id,
+        ACC_FIRST_NAME as firstName,
+        ACC_LAST_NAME as lastName,
+        ACC_EMAIL as emailAddress
+        from ACCOUNT
+        where ACC_ID = #{id}
+    </select>
+
+    <!-- Insert example, using the Account parameter class -->
+    <insert id="insertAccount" parameterType="Account">
+        insert into ACCOUNT (
+        ACC_ID,
+        ACC_FIRST_NAME,
+        ACC_LAST_NAME,
+        ACC_EMAIL
+        )
+        values (
+        #{id}, #{firstName}, #{lastName}, #{emailAddress}
+        )
+    </insert>
+
+    <!-- Update example, using the Account parameter class -->
+    <update id="updateAccount" parameterType="Account">
+        update ACCOUNT set
+        ACC_FIRST_NAME = #{firstName},
+        ACC_LAST_NAME = #{lastName},
+        ACC_EMAIL = #{emailAddress}
+        where
+        ACC_ID = #{id}
+    </update>
+
+    <!-- Delete example, using an integer as the parameter class -->
+    <delete id="deleteAccountById" parameterType="int">
+        delete from ACCOUNT where ACC_ID = #{id}
+    </delete>
+
+    <!-- START SNIPPET: e1 -->
+    <select id="selectUnprocessedAccounts" resultMap="AccountResult">
+        select * from ACCOUNT where PROCESSED = false
+    </select>
+    <!-- END SNIPPET: e1 -->
+
+    <select id="selectProcessedAccounts" resultMap="AccountResult">
+        select * from ACCOUNT where PROCESSED = true
+    </select>
+
+    <!-- START SNIPPET: e2 -->
+    <update id="consumeAccount" parameterType="Account">
+        update ACCOUNT set PROCESSED = true where ACC_ID = #{id}
+    </update>
+    <!-- END SNIPPET: e2 -->
+
+    <select id="count" resultType="int">
+        select count(*) from ACCOUNT
+    </select>
+
+</mapper>
\ No newline at end of file

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/components/camel-mybatis/src/test/resources/org/apache/camel/component/mybatis/Account.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1070568&r1=1070567&r2=1070568&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Mon Feb 14 16:50:54 2011
@@ -88,6 +88,7 @@
     <module>camel-mina</module>
     <module>camel-msv</module>
     <module>camel-mvel</module>
+    <module>camel-mybatis</module>
     <module>camel-netty</module>
     <module>camel-nagios</module>
     <module>camel-ognl</module>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1070568&r1=1070567&r2=1070568&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Feb 14 16:50:54 2011
@@ -104,6 +104,7 @@
     <mina-version>1.1.7</mina-version>
     <mockito-version>1.8.2</mockito-version>
     <mvel-version>2.0.18</mvel-version>
+    <mybatis-version>3.0.4</mybatis-version>
     <netty-bundle-version>3.2.3.Final_1</netty-bundle-version>
     <ode-version>1.3.3</ode-version>
     <ognl-version>2.7.3_3</ognl-version>