camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r570700 - in /activemq/camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/ components/camel-jdbc/ components/camel-jdbc/src/ components/camel-jdbc/src/main/ components/camel-jdbc/src/main/java/ components/camel-jdbc/src/main/ja...
Date Wed, 29 Aug 2007 08:45:56 GMT
Author: jstrachan
Date: Wed Aug 29 01:45:47 2007
New Revision: 570700

URL: http://svn.apache.org/viewvc?rev=570700&view=rev
Log:
added excellent patch from Nicky Sandhu for CAMEL-128 for a new JDBC component. Still working
on the test case to get it passing...

Added:
    activemq/camel/trunk/components/camel-jdbc/
    activemq/camel/trunk/components/camel-jdbc/pom.xml   (with props)
    activemq/camel/trunk/components/camel-jdbc/src/
    activemq/camel/trunk/components/camel-jdbc/src/main/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
  (with props)
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
  (with props)
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
  (with props)
    activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html
  (with props)
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/LICENSE.txt   (with
props)
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/NOTICE.txt   (with
props)
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/component/
    activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/component/jdbc
  (with props)
    activemq/camel/trunk/components/camel-jdbc/src/test/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/org/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/
    activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java
  (with props)
    activemq/camel/trunk/components/camel-jdbc/src/test/resources/
    activemq/camel/trunk/components/camel-jdbc/src/test/resources/log4j.properties   (with
props)
Modified:
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=570700&r1=570699&r2=570700&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Wed Aug 29 01:45:47 2007
@@ -60,10 +60,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-juel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-http</artifactId>
     </dependency>
     <dependency>
@@ -80,6 +76,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms</artifactId>
     </dependency>
     <dependency>
@@ -92,6 +92,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-juel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-mail</artifactId>
     </dependency>
     <dependency>
@@ -191,7 +195,7 @@
             </goals>
             <configuration>
               <includes>camel-activemq,camel-bam,camel-core,camel-cxf,camel-ftp,camel-juel,
-                camel-http,camel-irc,camel-jaxb,camel-jing,camel-jms,camel-josql,
+                camel-http,camel-irc,camel-jaxb,camel-jdbc,camel-jing,camel-jms,camel-josql,
                 camel-jpa,camel-mail,camel-mina,camel-msv,camel-ognl,camel-quartz,camel-rmi,
                 camel-saxon,camel-script,camel-spring,camel-xmpp,commons-logging</includes>
             </configuration>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=570700&r1=570699&r2=570700&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Wed Aug 29 01:45:47
2007
@@ -86,14 +86,15 @@
         <include>org.apache.camel:camel-core</include>
         <include>org.apache.camel:camel-cxf</include>
         <include>org.apache.camel:camel-ftp</include>
-        <include>org.apache.camel:camel-juel</include>
         <include>org.apache.camel:camel-http</include>
         <include>org.apache.camel:camel-irc</include>
         <include>org.apache.camel:camel-jaxb</include>
+        <include>org.apache.camel:camel-jdbc</include>
         <include>org.apache.camel:camel-jing</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-josql</include>
         <include>org.apache.camel:camel-jpa</include>
+        <include>org.apache.camel:camel-juel</include>
         <include>org.apache.camel:camel-mail</include>
         <include>org.apache.camel:camel-msv</include>
         <include>org.apache.camel:camel-ognl</include>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=570700&r1=570699&r2=570700&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Wed Aug 29 01:45:47
2007
@@ -92,14 +92,15 @@
         <include>org.apache.camel:camel-core</include>
         <include>org.apache.camel:camel-cxf</include>
         <include>org.apache.camel:camel-ftp</include>
-        <include>org.apache.camel:camel-juel</include>
         <include>org.apache.camel:camel-http</include>
         <include>org.apache.camel:camel-irc</include>
         <include>org.apache.camel:camel-jaxb</include>
+        <include>org.apache.camel:camel-jdbc</include>
         <include>org.apache.camel:camel-jing</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-josql</include>
         <include>org.apache.camel:camel-jpa</include>
+        <include>org.apache.camel:camel-juel</include>
         <include>org.apache.camel:camel-mail</include>
         <include>org.apache.camel:camel-msv</include>
         <include>org.apache.camel:camel-ognl</include>

Added: activemq/camel/trunk/components/camel-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/pom.xml?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/pom.xml (added)
+++ activemq/camel/trunk/components/camel-jdbc/pom.xml Wed Aug 29 01:45:47 2007
@@ -0,0 +1,58 @@
+<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.camel</groupId>
+		<artifactId>camel-parent</artifactId>
+		<version>1.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>camel-jdbc</artifactId>
+	<name>Camel :: JDBC</name>
+	<description>Camel JDBC support</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-core</artifactId>
+			<type>test-jar</type>
+		</dependency>
+		<!-- test dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+<!--
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<scope>test</scope>
+		</dependency>
+-->
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+	</dependencies>
+</project>

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

Propchange: activemq/camel/trunk/components/camel-jdbc/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
(added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
Wed Aug 29 01:45:47 2007
@@ -0,0 +1,55 @@
+/**
+ * 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 pejdbcssions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jdbc;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.DefaultExchange;
+
+/**
+ * @version $Revision:520964 $
+ */
+public class JdbcComponent extends DefaultComponent<DefaultExchange> {
+
+    public JdbcComponent() {
+    }
+
+    public JdbcComponent(CamelContext context) {
+        super(context);
+    }
+
+    @Override
+    protected Endpoint<DefaultExchange> createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
+        return new JdbcEndpoint(uri, remaining, this);
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        // TODO Auto-generated method stub
+        super.doStart();
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        // TODO Auto-generated method stub
+        super.doStop();
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
(added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
Wed Aug 29 01:45:47 2007
@@ -0,0 +1,76 @@
+/**
+ * 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 pejdbcssions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jdbc;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.DefaultExchange;
+
+/**
+ * @version $Revision:520964 $
+ */
+public class JdbcEndpoint extends DefaultEndpoint<DefaultExchange> {
+
+    private URI uri;
+    private String remaining;
+    private int readSize;
+
+    protected JdbcEndpoint(String endpointUri, String remaining, JdbcComponent component)
throws URISyntaxException {
+        super(endpointUri, component);
+        this.uri = new URI(endpointUri);
+        this.remaining = remaining;
+    }
+
+    public boolean isSingleton() {
+        return false;
+    }
+
+    public DefaultExchange createExchange() {
+        return new DefaultExchange(getContext());
+    }
+
+    public Consumer<DefaultExchange> createConsumer(Processor processor) throws Exception
{
+        throw new RuntimeCamelException("A JDBC Consumer would be the server side of database!
No such support here");
+    }
+
+    public Producer<DefaultExchange> createProducer() throws Exception {
+        return new JdbcProducer(this, remaining, readSize);
+    }
+
+    public String getName() {
+        String path = uri.getPath();
+        if (path == null) {
+            path = uri.getSchemeSpecificPart();
+        }
+        return path;
+    }
+
+    public int getReadSize() {
+        return this.readSize;
+    }
+
+    public void setReadSize(int readSize) {
+        this.readSize = readSize;
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
(added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Wed Aug 29 01:45:47 2007
@@ -0,0 +1,109 @@
+/**
+ * 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 pejdbcssions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jdbc;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.sql.DataSource;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.IntrospectionSupport;
+
+/**
+ * @version $Revision: 533076 $
+ */
+public class JdbcProducer extends DefaultProducer<DefaultExchange> {
+
+    private DataSource source;
+
+    /** The maximum size for reading a result set <code>readSize</code> */
+    private int readSize = 2000;
+
+    public JdbcProducer(JdbcEndpoint endpoint, String remaining, int readSize) throws Exception
{
+        super(endpoint);
+        source = (DataSource) getEndpoint().getContext().getRegistry().lookup(remaining);
+    }
+
+    /**
+     * Execute sql of exchange and set results on output
+     * 
+     * @see org.apache.camel.Processor#process(org.apache.camel.Exchange)
+     */
+    public void process(Exchange exchange) throws Exception {
+        String sql = exchange.getIn().getBody(String.class);
+        Connection conn = null;
+        Statement stmt = null;
+        try {
+            conn = source.getConnection();
+            stmt = conn.createStatement();
+            if (stmt.execute(sql)) {
+                ResultSet rs = stmt.getResultSet();
+                setResultSet(exchange, rs);
+                rs.close();
+            } else {
+                int updateCount = stmt.getUpdateCount();
+                exchange.getOut().setHeader("jdbc.updateCount", updateCount);
+            }
+        } finally {
+            if (stmt != null) {
+                stmt.close();
+            }
+            if (conn != null) {
+                conn.close();
+            }
+        }
+    }
+
+    public int getReadSize() {
+        return this.readSize;
+    }
+
+    public void setReadSize(int readSize) {
+        this.readSize = readSize;
+    }
+
+    public void setResultSet(Exchange exchange, ResultSet rs) throws SQLException {
+        ResultSetMetaData meta = rs.getMetaData();
+        HashMap<String, Object> props = new HashMap<String, Object>();
+        IntrospectionSupport.getProperties(meta, props, "jdbc.");
+        exchange.getOut().setHeaders(props);
+        //
+        int count = meta.getColumnCount();
+        ArrayList<HashMap<String, Object>> data = new ArrayList<HashMap<String,
Object>>();
+        int rowNumber = 0;
+        while (rs.next() && rowNumber < readSize) {
+            HashMap<String, Object> row = new HashMap<String, Object>();
+            for (int i = 0; i < count; i++) {
+                int columnNumber = i + 1;
+                String columnName = meta.getColumnName(columnNumber);
+                row.put(columnName, rs.getObject(columnName));
+            }
+            data.add(row);
+            rowNumber++;
+        }
+        exchange.getOut().setBody(data);
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html
(added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html
Wed Aug 29 01:45:47 2007
@@ -0,0 +1,25 @@
+<!--
+    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.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Defines an JDBC component that can bind to JDBC datasources.</a>
+
+</body>
+</html>

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/package.html
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/LICENSE.txt?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/LICENSE.txt (added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/LICENSE.txt Wed
Aug 29 01:45:47 2007
@@ -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: activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/NOTICE.txt?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/NOTICE.txt (added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/NOTICE.txt Wed
Aug 29 01:45:47 2007
@@ -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: activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/component/jdbc
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/component/jdbc?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/component/jdbc
(added)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/resources/META-INF/services/org/apache/camel/component/jdbc
Wed Aug 29 01:45:47 2007
@@ -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.jdbc.JdbcComponent

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

Added: activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java
(added)
+++ activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java
Wed Aug 29 01:45:47 2007
@@ -0,0 +1,51 @@
+/**
+ * 
+ */
+package org.apache.camel.component.jdbc;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+/**
+ * TODO Provide description for TestDataSource.
+ * 
+ * @author <a href="mailto:nsandhu@raleys.com">nsandhu</a>
+ *
+ */
+public class TestDataSource implements DataSource{
+    private String url, username, password;
+    public TestDataSource(String url, String user, String password){
+        this.url=url;
+        this.username=user;
+        this.password=password;
+    }
+    
+    public Connection getConnection() throws SQLException {
+        return DriverManager.getConnection(url, username, password);
+    }
+
+    public Connection getConnection(String username, String password) throws SQLException
{
+        return DriverManager.getConnection(url, username, password);
+    }
+
+    public int getLoginTimeout() throws SQLException {
+        return DriverManager.getLoginTimeout();
+    }
+
+    public PrintWriter getLogWriter() throws SQLException {
+        return DriverManager.getLogWriter();
+    }
+
+    public void setLoginTimeout(int seconds) throws SQLException {
+       DriverManager.setLoginTimeout(seconds);
+    }
+
+    public void setLogWriter(PrintWriter out) throws SQLException {
+        DriverManager.setLogWriter(out);
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/TestDataSource.java
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/camel/trunk/components/camel-jdbc/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/test/resources/log4j.properties?rev=570700&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/test/resources/log4j.properties (added)
+++ activemq/camel/trunk/components/camel-jdbc/src/test/resources/log4j.properties Wed Aug
29 01:45:47 2007
@@ -0,0 +1,30 @@
+## ------------------------------------------------------------------------
+## 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 eclipse testing, We want to see debug output on the console.
+#
+log4j.rootLogger=INFO, out
+
+#log4j.logger.org.apache.activemq=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n

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

Propchange: activemq/camel/trunk/components/camel-jdbc/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=570700&r1=570699&r2=570700&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Wed Aug 29 01:45:47 2007
@@ -214,12 +214,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-juel</artifactId>
+        <artifactId>camel-http</artifactId>
         <version>${camel-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-http</artifactId>
+        <artifactId>camel-irc</artifactId>
         <version>${camel-version}</version>
       </dependency>
       <dependency>
@@ -229,7 +229,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-irc</artifactId>
+        <artifactId>camel-jdbc</artifactId>
         <version>${camel-version}</version>
       </dependency>
       <dependency>
@@ -250,6 +250,11 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-josql</artifactId>
+        <version>${camel-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-juel</artifactId>
         <version>${camel-version}</version>
       </dependency>
       <dependency>



Mime
View raw message