incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1233737 - in /incubator/lcf/trunk: CHANGES.txt build.xml connectors/jdbc/build.xml connectors/jdbc/jdbc-drivers/README.txt framework/build.xml
Date Fri, 20 Jan 2012 02:34:13 GMT
Author: kwright
Date: Fri Jan 20 02:34:13 2012
New Revision: 1233737

URL: http://svn.apache.org/viewvc?rev=1233737&view=rev
Log:
Fix for CONNECTORS-390.  Change instructions for how to supply JDBC drivers to the JDBC connector,
etc.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/jdbc/build.xml
    incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt
    incubator/lcf/trunk/framework/build.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1233737&r1=1233736&r2=1233737&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Jan 20 02:34:13 2012
@@ -3,6 +3,12 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-390: JDBC drivers cannot work from anything other than the
+root classpath.  This is because of a flaw with JDBC.  I've changed the instructions
+accordingly, and provided built-in support for all drivers the JDBC connector
+knows about.
+(Karl Wright)
+
 CONNECTORS-389: Chemistry in-memory war renaming breaks mvn-bootstrap
 (Piergiorgio Lucidi)
 

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1233737&r1=1233736&r2=1233737&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Fri Jan 20 02:34:13 2012
@@ -2261,12 +2261,15 @@ Use Apache Forrest version forrest-0.9-d
     </target>
 
     <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="lib"/>
+        <get src="http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.18/mysql-connector-java-5.1.18.jar"
dest="lib/mysql-connector-java.jar"/>
     </target>
 
-    <target name="download-dependencies" depends="download-mysql">
+    <target name="download-jtds">
+        <get src="http://repo1.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.4/jtds-1.2.4.jar"
dest="lib/jtds.jar"/>
+    </target>
+
+    <target name="download-dependencies" depends="download-mysql,download-jtds">
         <ant dir="connectors/jcifs" target="download-dependencies"/>
-        <ant dir="connectors/jdbc" target="download-dependencies"/>
         <ant dir="connectors/sharepoint" target="download-dependencies"/>
         <ant dir="connectors/alfresco" target="download-dependencies"/>
     </target>

Modified: incubator/lcf/trunk/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/build.xml?rev=1233737&r1=1233736&r2=1233737&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/build.xml (original)
+++ incubator/lcf/trunk/connectors/jdbc/build.xml Fri Jan 20 02:34:13 2012
@@ -19,19 +19,4 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="jdbc-drivers" includes="*.jar"/>
-        </copy>
-    </target>
-
-    <target name="download-ojdbc"/>
-
-    <target name="download-jtds">
-        <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"/>
-    
 </project>

Modified: incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt?rev=1233737&r1=1233736&r2=1233737&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt (original)
+++ incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt Fri Jan 20 02:34:13 2012
@@ -22,16 +22,19 @@ Oracle (via a proprietary, but freely do
 
 The connector was tested against the following versions of the above:
 
-Oracle: oracle jdbc4 jdk1.4 version 10.1.0-2.0
+Oracle: oracle ojdbc5 jdk1.5 and ojdbc6 jdk1.6
 Jtds: version 1.2.2, downloadable from SourceForge
 Postgresql: the debian postgresql driver package for postgresql 8.3.7, aka libpg-java, version
8.2-504-2.
 
 None of these required custom changes.
 
 To build this connector with Oracle support, copy the Oracle JDBC
-driver into this directory before building.  To build with Mssql/Sybase,
-copy a version of the jtds driver into this directory.  Then, build the
-connector using the normal ant build script.  Further information can be
+driver into the root "lib" directory, calling it "ojdbc.jar", before building.
+To build with Mssql/Sybase, copy a version of the jtds driver into that same directory,
+and call it "jtds.jar".  DO NOT COPY JDBC DRIVERS TO THIS DIRECTORY;
+they will not be picked up by ManifoldCF.
+
+Then, build the connector using the normal ant build script.  Further information can be
 found on the "how-to-build-and-deploy.html" documentation page.
 
 

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1233737&r1=1233736&r2=1233737&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Fri Jan 20 02:34:13 2012
@@ -63,6 +63,8 @@
             <include name="derby*.jar"/>
             <include name="hsqldb*.jar"/>
             <include name="mysql*.jar"/>
+            <include name="ojdbc*.jar"/>
+            <include name="jtds*.jar"/>
         </fileset>
 
     </path>
@@ -281,6 +283,8 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
                 <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
             </fileset>
         </copy>
         <copy todir="build/webapp/authority-service/WEB-INF/lib">
@@ -320,6 +324,8 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
                 <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
             </fileset>
         </copy>
         <copy todir="build/webapp/api-service/WEB-INF/lib">
@@ -363,6 +369,8 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
                 <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
             </fileset>
         </copy>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
@@ -442,6 +450,8 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
                 <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
             </fileset>
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
@@ -540,6 +550,8 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
                 <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
             </fileset>
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
@@ -607,7 +619,7 @@
         <property name="manifest-classpath-38" value="${manifest-classpath-37} lib/mcf-ui-core.jar"/>
         <property name="manifest-classpath-39" value="${manifest-classpath-38} lib/log4j-1.2.jar"/>
         <property name="manifest-classpath-40" value="${manifest-classpath-39} lib/postgresql.jar"/>
-        <property name="manifest-classpath-41" value="${manifest-classpath-40} lib/mysql-connector-java-5.1.18.jar"/>
+        <property name="manifest-classpath-41" value="${manifest-classpath-40} lib/mysql-connector-java.jar"/>
         <property name="manifest-classpath-42" value="${manifest-classpath-41} lib/serializer.jar"/>
         <property name="manifest-classpath-43" value="${manifest-classpath-42} lib/servlet-api-2.5-20081211.jar"/>
         <property name="manifest-classpath-44" value="${manifest-classpath-43} lib/tomcat-juli-6.0.24.jar"/>
@@ -616,8 +628,10 @@
         <property name="manifest-classpath-47" value="${manifest-classpath-46} lib/xml-apis.jar"/>
         <property name="manifest-classpath-48" value="${manifest-classpath-47} lib/derbynet.jar"/>
         <property name="manifest-classpath-49" value="${manifest-classpath-48} lib/eclipse-ecj.jar"/>
+        <property name="manifest-classpath-50" value="${manifest-classpath-49} lib/ojdbc.jar"/>
+        <property name="manifest-classpath-51" value="${manifest-classpath-50} lib/jtds.jar"/>
 
-        <property name="manifest-classpath" value="${manifest-classpath-49}"/>
+        <property name="manifest-classpath" value="${manifest-classpath-51}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>



Mime
View raw message