You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/10/16 17:45:34 UTC
svn commit: r1184852 - in /incubator/lcf/trunk: CHANGES.txt
connectors/jdbc/build.xml framework/api-service/pom.xml
framework/authority-service/pom.xml framework/crawler-ui/pom.xml
framework/jetty-runner/pom.xml
Author: kwright
Date: Sun Oct 16 15:45:34 2011
New Revision: 1184852
URL: http://svn.apache.org/viewvc?rev=1184852&view=rev
Log:
Fix for CONNECTORS-276. Download MySQL jdbc driver from the Maven repository in ant build, and add appropriate dependencies in the Maven build.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/connectors/jdbc/build.xml
incubator/lcf/trunk/framework/api-service/pom.xml
incubator/lcf/trunk/framework/authority-service/pom.xml
incubator/lcf/trunk/framework/crawler-ui/pom.xml
incubator/lcf/trunk/framework/jetty-runner/pom.xml
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1184852&r1=1184851&r2=1184852&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Sun Oct 16 15:45:34 2011
@@ -3,6 +3,12 @@ $Id$
======================= 0.4-dev =====================
+CONNECTORS-276: Pull down jtds and mysql drivers from maven repository
+in the ant build (download-dependencies target),
+and add these dependencies in appropriate places in the maven build as
+well.
+(Karl Wright)
+
CONNECTORS-259: Enable support for MySQL in JDBC connector.
(Karl Wright)
Modified: incubator/lcf/trunk/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/build.xml?rev=1184852&r1=1184851&r2=1184852&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/build.xml (original)
+++ incubator/lcf/trunk/connectors/jdbc/build.xml Sun Oct 16 15:45:34 2011
@@ -67,14 +67,13 @@
<target name="download-ojdbc"/>
<target name="download-jtds">
- <property name="version" value="1.2.5"/>
- <mkdir dir="download/jtds"/>
- <get src="http://sourceforge.net/projects/jtds/files/jtds/${version}/jtds-${version}-dist.zip" dest="download"/>
- <unzip src="download/jtds-${version}-dist.zip" dest="download/jtds"/>
- <copy todir="jdbc-drivers" file="download/jtds/jtds-${version}.jar"/>
- <delete dir="download"/>
+ <get src="http://repo1.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.4/jtds-1.2.4.jar" dest="jdbc-drivers"/>
</target>
- <target name="download-dependencies" depends="download-ojdbc,download-jtds"/>
+ <target name="download-mysql">
+ <get src="http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.18/mysql-connector-java-5.1.18.jar" dest="jdbc-drivers"/>
+ </target>
+
+ <target name="download-dependencies" depends="download-ojdbc,download-jtds,download-mysql"/>
</project>
Modified: incubator/lcf/trunk/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/api-service/pom.xml?rev=1184852&r1=1184851&r2=1184852&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/api-service/pom.xml (original)
+++ incubator/lcf/trunk/framework/api-service/pom.xml Sun Oct 16 15:45:34 2011
@@ -141,5 +141,20 @@
<version>${postgresql.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- jdbc connector databases -->
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.18</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/trunk/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/authority-service/pom.xml?rev=1184852&r1=1184851&r2=1184852&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/authority-service/pom.xml (original)
+++ incubator/lcf/trunk/framework/authority-service/pom.xml Sun Oct 16 15:45:34 2011
@@ -141,6 +141,21 @@
<version>${postgresql.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- jdbc connector databases -->
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.18</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/trunk/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/pom.xml?rev=1184852&r1=1184851&r2=1184852&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/pom.xml (original)
+++ incubator/lcf/trunk/framework/crawler-ui/pom.xml Sun Oct 16 15:45:34 2011
@@ -17,130 +17,145 @@
-->
<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/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.manifoldcf</groupId>
- <artifactId>mcf-framework</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>mcf-crawler-ui</artifactId>
- <name>ManifoldCF - Framework - Crawler UI</name>
- <packaging>war</packaging>
-
- <dependencies>
- <!-- Internal dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-agents</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-pull-agent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mcf-ui-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- web dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- runtime dependencies -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- database dependencies -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.7.1.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.2.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-702.jdbc4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.manifoldcf</groupId>
+ <artifactId>mcf-framework</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>mcf-crawler-ui</artifactId>
+ <name>ManifoldCF - Framework - Crawler UI</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <!-- Internal dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-agents</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-pull-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mcf-ui-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- web dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- runtime dependencies -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.5</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient-mcf</artifactId>
+ <version>3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl-mcf</artifactId>
+ <version>2.9.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- database dependencies -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.7.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.2.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-702.jdbc4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- JDBC connector dependencies -->
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.18</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/jetty-runner/pom.xml?rev=1184852&r1=1184851&r2=1184852&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/trunk/framework/jetty-runner/pom.xml Sun Oct 16 15:45:34 2011
@@ -231,14 +231,34 @@
<version>2.1.v20091210</version>
</dependency>
- <!-- database -->
+ <!-- databases -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
-
+
+ <!-- jdbc connector databases -->
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.18</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-702.jdbc4</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- runtime dependencies -->
<dependency>
<groupId>commons-io</groupId>
@@ -302,6 +322,6 @@
</dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file