incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1242149 - in /incubator/lcf/branches/CONNECTORS-402: ./ connectors/ connectors/alfresco/ connectors/alfresco/alfresco-war/ connectors/alfresco/alfresco-ws-client/ connectors/alfresco/lib-proprietary/ connectors/alfresco/test-materials-prop...
Date Wed, 08 Feb 2012 22:30:49 GMT
Author: kwright
Date: Wed Feb  8 22:30:48 2012
New Revision: 1242149

URL: http://svn.apache.org/viewvc?rev=1242149&view=rev
Log:
First chunk of work.  Still need to figure out how to suppress proprietary root libs for an
image build, and also how to deal with RMI.  Finally, the documentation needs rework.

Added:
    incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/alfresco-ws-client/
    incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/test-materials-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/alfresco-war/
    incubator/lcf/branches/CONNECTORS-402/connectors/documentum/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/documentum/dfc/
    incubator/lcf/branches/CONNECTORS-402/connectors/filenet/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/filenet/filenet-api/
    incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/jcifs/
    incubator/lcf/branches/CONNECTORS-402/connectors/livelink/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/livelink/lapi/
    incubator/lcf/branches/CONNECTORS-402/connectors/meridio/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/meridio/wsdls/
    incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/lib-proprietary/
      - copied from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/wsdls/
    incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/wsdls/
    incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/wsdls/MCPermissions.wsdl
      - copied unchanged from r1242059, incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/wsdls/MCPermissions.wsdl
    incubator/lcf/branches/CONNECTORS-402/lib-proprietary/   (with props)
    incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt   (with props)
Removed:
    incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/alfresco-war/
    incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/alfresco-ws-client/
    incubator/lcf/branches/CONNECTORS-402/connectors/documentum/dfc/
    incubator/lcf/branches/CONNECTORS-402/connectors/filenet/filenet-api/
    incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/jcifs/
    incubator/lcf/branches/CONNECTORS-402/connectors/livelink/lapi/
    incubator/lcf/branches/CONNECTORS-402/connectors/meridio/wsdls/
    incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/lib-proprietary/MCPermissions.wsdl
Modified:
    incubator/lcf/branches/CONNECTORS-402/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/connector-build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/documentum/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/filenet/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/jdbc/jdbc-drivers/README.txt
    incubator/lcf/branches/CONNECTORS-402/connectors/livelink/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/meridio/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/build.xml
    incubator/lcf/branches/CONNECTORS-402/framework/build.xml
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml

Modified: incubator/lcf/branches/CONNECTORS-402/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/build.xml Wed Feb  8 22:30:48 2012
@@ -983,6 +983,10 @@
         <copy todir="dist/connector-lib">
             <fileset dir="connectors/${connector-name}/dist/lib"/>
         </copy>
+        <mkdir dir="dist/connector-lib-proprietary"/>
+        <copy todir="dist/connector-lib-proprietary">
+            <fileset dir="connectors/${connector-name}/dist/lib-proprietary"/>
+        </copy>
     </target>
 
     <target name="general-connector-doc-check">
@@ -2041,6 +2045,14 @@
           <exclude name="**/test-HSQLDB-output/"/>
           <exclude name="**/test-HSQLDBext-output/"/>
           <exclude name="**/test-mysql-output/"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="**/test-materials-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.war"/>
+          <exclude name="**/test-materials-proprietary/*.war"/>
+          <exclude name="**/lib-proprietary/*.wsdl"/>
+          <exclude name="**/test-materials-proprietary/*.wsdl"/>
+          <exclude name="**/lib-proprietary/*.xsd"/>
+          <exclude name="**/test-materials-proprietary/*.xsd"/>
           <exclude name="/legacy-*/"/>
           <exclude name="/apache-manifoldcf-*"/>
         </zipfileset>
@@ -2064,6 +2076,14 @@
           <exclude name="**/test-HSQLDB-output/"/>
           <exclude name="**/test-HSQLDBext-output/"/>
           <exclude name="**/test-mysql-output/"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="**/test-materials-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.war"/>
+          <exclude name="**/test-materials-proprietary/*.war"/>
+          <exclude name="**/lib-proprietary/*.wsdl"/>
+          <exclude name="**/test-materials-proprietary/*.wsdl"/>
+          <exclude name="**/lib-proprietary/*.xsd"/>
+          <exclude name="**/test-materials-proprietary/*.xsd"/>
           <exclude name="/legacy-*/"/>
           <exclude name="/apache-manifoldcf-*"/>
         </tarfileset>
@@ -2086,8 +2106,17 @@
           <exclude name="**/test-HSQLDB-output/"/>
           <exclude name="**/test-HSQLDBext-output/"/>
           <exclude name="**/test-mysql-output/"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="**/test-materials-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.war"/>
+          <exclude name="**/test-materials-proprietary/*.war"/>
+          <exclude name="**/lib-proprietary/*.wsdl"/>
+          <exclude name="**/test-materials-proprietary/*.wsdl"/>
+          <exclude name="**/lib-proprietary/*.xsd"/>
+          <exclude name="**/test-materials-proprietary/*.xsd"/>
           <exclude name="/legacy-*/"/>
           <exclude name="**/*.pdf"/>
+          <exclude name="dist/connector-lib-proprietary/*"/>
           <exclude name="/apache-manifoldcf-*"/>
         </zipfileset>
       </zip>
@@ -2109,8 +2138,17 @@
           <exclude name="**/test-HSQLDB-output/"/>
           <exclude name="**/test-HSQLDBext-output/"/>
           <exclude name="**/test-mysql-output/"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="**/test-materials-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.war"/>
+          <exclude name="**/test-materials-proprietary/*.war"/>
+          <exclude name="**/lib-proprietary/*.wsdl"/>
+          <exclude name="**/test-materials-proprietary/*.wsdl"/>
+          <exclude name="**/lib-proprietary/*.xsd"/>
+          <exclude name="**/test-materials-proprietary/*.xsd"/>
           <exclude name="/legacy-*/"/>
           <exclude name="**/*.pdf"/>
+          <exclude name="dist/connector-lib-proprietary/*"/>
           <exclude name="/apache-manifoldcf-*"/>
         </tarfileset>
       </tar>
@@ -2274,11 +2312,11 @@ 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/mysql-connector-java.jar"/>
+        <get src="http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.18/mysql-connector-java-5.1.18.jar"
dest="lib-proprietary/mysql-connector-java.jar"/>
     </target>
 
     <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"/>
+        <get src="http://repo1.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.4/jtds-1.2.4.jar"
dest="lib-proprietary/jtds.jar"/>
     </target>
 
     <target name="download-dependencies" depends="download-mysql,download-jtds">

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/build.xml Wed Feb  8 22:30:48
2012
@@ -21,14 +21,14 @@
 
   
     <target name="calculate-condition">
-        <available file="alfresco-ws-client/alfresco-web-service-client-3.4.e.jar" property="alfrescoStatus"/>
+        <available file="lib-proprietary/alfresco-web-service-client-3.4.e.jar" property="alfrescoStatus"/>
         <condition property="canBuild">
             <isset property="alfrescoStatus"/>
         </condition>
     </target>
 
     <target name="calculate-testcode-condition" depends="calculate-condition" if="canBuild">
-        <available file="alfresco-war/alfresco.war" property="alfrescoTestcodeStatus"/>
+        <available file="test-materials-proprietary/alfresco.war" property="alfrescoTestcodeStatus"/>
         <condition property="canTest">
             <isset property="alfrescoTestcodeStatus"/>
         </condition>
@@ -44,7 +44,7 @@
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="alfresco-ws-client" includes="*.jar"/>
+        <fileset dir="lib-proprietary" includes="*.jar"/>
         <fileset dir="../../lib">
             <include name="axis*.jar"/>	
             <include name="saaj*.jar"/>	
@@ -68,9 +68,6 @@
     <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
-            <fileset dir="alfresco-ws-client">
-                <include name="alfresco-web-service-client*.jar"/>
-            </fileset>
             <fileset dir="../../lib">
                 <include name="axis*.jar"/>	
                 <include name="saaj*.jar"/>	
@@ -85,19 +82,25 @@
                 <include name="xmlsec*.jar"/>
             </fileset>
         </copy>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib-proprietary">
+            <fileset dir="lib-proprietary">
+                <include name="alfresco-web-service-client*.jar"/>
+            </fileset>
+        </copy>
     </target>
 
     <target name="build-test-materials" depends="pretest-check" if="canTest">
         <mkdir dir="build/alfresco-war"/>
         <copy todir="build/alfresco-war">
-            <fileset dir="alfresco-war">
+            <fileset dir="test-materials-proprietary">
                 <include name="alfresco*.war"/>
             </fileset>
         </copy>
     </target>
 
     <target name="download-alfresco-ws-client">
-      <get src="http://maven.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/3.4.e/alfresco-web-service-client-3.4.e.jar"
dest="alfresco-ws-client"/>
+      <get src="http://maven.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/3.4.e/alfresco-web-service-client-3.4.e.jar"
dest="lib-proprietary"/>
     </target>
 	
     <target name="download-dependencies" depends="download-alfresco-ws-client"/>

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/connector-build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/connector-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/connector-build.xml Wed Feb  8 22:30:48
2012
@@ -448,6 +448,7 @@
     <target name="lib" depends="lib-rmi,lib-wsdls,lib-xsds,jar-connector,precompile-check"
if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib" file="build/jar/mcf-${ant.project.name}-connector.jar"/>
+        <mkdir dir="dist/lib-proprietary"/>
     </target>
 
     <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,has-RMI-check"
if="hasRMI">

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/documentum/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/documentum/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/documentum/build.xml Wed Feb  8 22:30:48
2012
@@ -20,9 +20,9 @@
     <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
-        <available file="dfc/dfc.jar" property="dfcStatus"/>
-        <available file="dfc/dfcbase.jar" property="dfcbaseStatus"/>
-        <available file="dfc/dctm.jar" property="dctmStatus"/>
+        <available file="lib-proprietary/dfc.jar" property="dfcStatus"/>
+        <available file="lib-proprietary/dfcbase.jar" property="dfcbaseStatus"/>
+        <available file="lib-proprietary/dctm.jar" property="dctmStatus"/>
         <condition property="canBuild">
             <and>
                 <isset property="dfcStatus"/>
@@ -38,7 +38,7 @@
 
     <path id="implementation-classpath">
         <path refid="mcf-connector-build.implementation-classpath"/>
-        <fileset dir="dfc"> 
+        <fileset dir="lib-proprietary"> 
             <include name="*.jar"/> 
         </fileset> 
     </path>
@@ -63,7 +63,7 @@
     <target name="server-process" depends="mcf-connector-build.server-process,has-RMI-check"
if="hasRMI">
         <mkdir dir="dist/server-process/jar"/>
         <copy todir="dist/server-process/jar">
-            <fileset dir="dfc" includes="*.jar"/>
+            <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
     </target>
 

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/filenet/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/filenet/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/filenet/build.xml Wed Feb  8 22:30:48
2012
@@ -20,7 +20,7 @@
     <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
-        <available file="filenet-api/Jace.jar" property="JaceStatus"/>
+        <available file="lib-proprietary/Jace.jar" property="JaceStatus"/>
         <condition property="canBuild">
             <isset property="JaceStatus"/>
         </condition>
@@ -32,7 +32,7 @@
 
     <path id="implementation-classpath">
         <path refid="mcf-connector-build.implementation-classpath"/>
-        <fileset dir="filenet-api"> 
+        <fileset dir="lib-proprietary"> 
             <include name="*.jar"/> 
         </fileset> 
     </path>
@@ -50,7 +50,7 @@
     <target name="server-process" depends="mcf-connector-build.server-process,has-RMI-check"
if="hasRMI">
         <mkdir dir="dist/server-process/jar"/>
         <copy todir="dist/server-process/jar">
-            <fileset dir="filenet-api" includes="*.jar"/>
+            <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
     </target>
 

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/build.xml Wed Feb  8 22:30:48 2012
@@ -20,7 +20,7 @@
     <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
-        <available file="jcifs/jcifs.jar" property="jcifsStatus"/>
+        <available file="lib-proprietary/jcifs.jar" property="jcifsStatus"/>
         <condition property="canBuild">
             <isset property="jcifsStatus"/>
         </condition>
@@ -32,19 +32,19 @@
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="jcifs" includes="*.jar"/>
+        <fileset dir="lib-proprietary" includes="*.jar"/>
     </path>
 
     <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="jcifs" includes="*.jar"/>
+        <mkdir dir="dist/lib-proprietary"/>
+        <copy todir="dist/lib-proprietary">
+            <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
     </target>
 
     <target name="download-jcifs">
         <property name="jcifs-version" value="1.3.17"/>
-        <get src="http://jcifs.samba.org/src/jcifs-${jcifs-version}.jar" dest="jcifs/jcifs.jar"/>
+        <get src="http://jcifs.samba.org/src/jcifs-${jcifs-version}.jar" dest="lib-proprietary/jcifs.jar"/>
     </target>
 
     <target name="download-dependencies" depends="download-jcifs"/>

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/jdbc/jdbc-drivers/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/jdbc/jdbc-drivers/README.txt?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/jdbc/jdbc-drivers/README.txt (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/jdbc/jdbc-drivers/README.txt Wed Feb
 8 22:30:48 2012
@@ -29,7 +29,7 @@ Postgresql: the debian postgresql driver
 None of these required custom changes.
 
 To build this connector with Oracle support, copy the Oracle JDBC
-driver into the root "lib" directory, calling it "ojdbc.jar", before building.
+driver into the root "lib-proprietary" 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.

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/livelink/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/livelink/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/livelink/build.xml Wed Feb  8 22:30:48
2012
@@ -20,7 +20,7 @@
     <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
-        <available file="lapi/lapi.jar" property="lapiStatus"/>
+        <available file="lib-proprietary/lapi.jar" property="lapiStatus"/>
         <condition property="canBuild">
             <isset property="lapiStatus"/>
         </condition>
@@ -32,13 +32,13 @@
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="lapi" includes="*.jar"/>
+        <fileset dir="lib-proprietary" includes="*.jar"/>
     </path>
 
     <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-	    <fileset dir="lapi" includes="*.jar"/>
+        <mkdir dir="dist/lib-proprietary"/>
+        <copy todir="dist/lib-proprietary">
+	    <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
     </target>
 

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/meridio/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/meridio/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/meridio/build.xml Wed Feb  8 22:30:48
2012
@@ -20,11 +20,11 @@
     <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
-        <available file="wsdls/MeridioDMWS_axis.wsdl" property="meridioDMWS_axisStatus"/>
-        <available file="wsdls/MeridioRMWS_axis.wsdl" property="meridioRMWS_axisStatus"/>
-        <available file="wsdls/DMDataSet_castor.xsd" property="DMDataSetStatus"/>
-        <available file="wsdls/RMDataSet_castor.xsd" property="RMDataSetStatus"/>
-        <available file="wsdls/RMClassificationDataSet_castor.xsd" property="RMClassificationDataSetStatus"/>
+        <available file="lib-proprietary/MeridioDMWS_axis.wsdl" property="meridioDMWS_axisStatus"/>
+        <available file="lib-proprietary/MeridioRMWS_axis.wsdl" property="meridioRMWS_axisStatus"/>
+        <available file="lib-proprietary/DMDataSet_castor.xsd" property="DMDataSetStatus"/>
+        <available file="lib-proprietary/RMDataSet_castor.xsd" property="RMDataSetStatus"/>
+        <available file="lib-proprietary/RMClassificationDataSet_castor.xsd" property="RMClassificationDataSetStatus"/>
         <condition property="canBuild">
             <and>
                 <isset property="meridioDMWS_axisStatus"/>
@@ -42,12 +42,12 @@
 
     <target name="copy-wsdls" depends="precompile-check" if="canBuild">
         <mkdir dir="build/wsdls"/>
-        <copy tofile="build/wsdls/MeridioRMWS.wsdl" file="wsdls/MeridioRMWS_axis.wsdl"/>
-        <copy tofile="build/wsdls/MeridioDMWS.wsdl" file="wsdls/MeridioDMWS_axis.wsdl"/>
-        <copy tofile="build/wsdls/RMDataSet.xsd" file="wsdls/RMDataSet_castor.xsd"/>
-        <copy tofile="build/wsdls/DMDataSet.xsd" file="wsdls/DMDataSet_castor.xsd"/>
-        <copy tofile="build/wsdls/RMClassificationDataSet.xsd" file="wsdls/RMClassificationDataSet_castor.xsd"/>
-        <copy tofile="build/wsdls/MetaCartaWS.wsdl" file="wsdls/MetaCartaWS_axis.wsdl"/>
+        <copy tofile="build/wsdls/MeridioRMWS.wsdl" file="lib-proprietary/MeridioRMWS_axis.wsdl"/>
+        <copy tofile="build/wsdls/MeridioDMWS.wsdl" file="lib-proprietary/MeridioDMWS_axis.wsdl"/>
+        <copy tofile="build/wsdls/RMDataSet.xsd" file="lib-proprietary/RMDataSet_castor.xsd"/>
+        <copy tofile="build/wsdls/DMDataSet.xsd" file="lib-proprietary/DMDataSet_castor.xsd"/>
+        <copy tofile="build/wsdls/RMClassificationDataSet.xsd" file="lib-proprietary/RMClassificationDataSet_castor.xsd"/>
+        <copy tofile="build/wsdls/MetaCartaWS.wsdl" file="lib-proprietary/MetaCartaWS_axis.wsdl"/>
     </target>
     
     <target name="classcreate-wsdls" depends="copy-wsdls,precompile-check" if="canBuild">

Modified: incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/build.xml Wed Feb  8 22:30:48
2012
@@ -20,12 +20,12 @@
     <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
-        <available file="wsdls/DspSts.wsdl" property="DspStsStatus"/>
-        <available file="wsdls/Lists.wsdl" property="ListsStatus"/>
-        <available file="wsdls/Permissions.wsdl" property="PermissionsStatus"/>
-        <available file="wsdls/usergroup.wsdl" property="usergroupStatus"/>
-        <available file="wsdls/versions.wsdl" property="versionsStatus"/>
-        <available file="wsdls/webs.wsdl" property="websStatus"/>
+        <available file="lib-proprietary/DspSts.wsdl" property="DspStsStatus"/>
+        <available file="lib-proprietary/Lists.wsdl" property="ListsStatus"/>
+        <available file="lib-proprietary/Permissions.wsdl" property="PermissionsStatus"/>
+        <available file="lib-proprietary/usergroup.wsdl" property="usergroupStatus"/>
+        <available file="lib-proprietary/versions.wsdl" property="versionsStatus"/>
+        <available file="lib-proprietary/webs.wsdl" property="websStatus"/>
         <condition property="canBuild">
             <and>
                 <isset property="DspStsStatus"/>
@@ -44,25 +44,25 @@
 
     <target name="classcreate-wsdls" depends="precompile-check" if="canBuild">
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="wsdls/DspSts.wsdl"/>
+            <param name="wsdlname" value="lib-proprietary/DspSts.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="wsdls/Lists.wsdl"/>
+            <param name="wsdlname" value="lib-proprietary/Lists.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
             <param name="wsdlname" value="wsdls/MCPermissions.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="wsdls/Permissions.wsdl"/>
+            <param name="wsdlname" value="lib-proprietary/Permissions.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="wsdls/usergroup.wsdl"/>
+            <param name="wsdlname" value="lib-proprietary/usergroup.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="wsdls/versions.wsdl"/>
+            <param name="wsdlname" value="lib-proprietary/versions.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="wsdls/webs.wsdl"/>
+            <param name="wsdlname" value="lib-proprietary/webs.wsdl"/>
         </antcall>
     </target>
 
@@ -78,12 +78,12 @@
     </target>
 
     <target name="download-dependencies">
-        <get src="http://www.wssdemo.com/_vti_bin/Permissions.asmx?wsdl=true" dest="wsdls/Permissions.wsdl"/>
-        <get src="http://www.wssdemo.com/_vti_bin/DspSts.asmx?wsdl=true" dest="wsdls/DspSts.wsdl"/>
-        <get src="http://www.wssdemo.com/_vti_bin/Lists.asmx?wsdl=true" dest="wsdls/Lists.wsdl"/>
-        <get src="http://www.wssdemo.com/_vti_bin/usergroup.asmx?wsdl=true" dest="wsdls/usergroup.wsdl"/>
-        <get src="http://www.wssdemo.com/_vti_bin/versions.asmx?wsdl=true" dest="wsdls/versions.wsdl"/>
-        <get src="http://www.wssdemo.com/_vti_bin/webs.asmx?wsdl=true" dest="wsdls/webs.wsdl"/>
+        <get src="http://www.wssdemo.com/_vti_bin/Permissions.asmx?wsdl=true" dest="lib-proprietary/Permissions.wsdl"/>
+        <get src="http://www.wssdemo.com/_vti_bin/DspSts.asmx?wsdl=true" dest="lib-proprietary/DspSts.wsdl"/>
+        <get src="http://www.wssdemo.com/_vti_bin/Lists.asmx?wsdl=true" dest="lib-proprietary/Lists.wsdl"/>
+        <get src="http://www.wssdemo.com/_vti_bin/usergroup.asmx?wsdl=true" dest="lib-proprietary/usergroup.wsdl"/>
+        <get src="http://www.wssdemo.com/_vti_bin/versions.asmx?wsdl=true" dest="lib-proprietary/versions.wsdl"/>
+        <get src="http://www.wssdemo.com/_vti_bin/webs.asmx?wsdl=true" dest="lib-proprietary/webs.wsdl"/>
 
     </target>
 

Modified: incubator/lcf/branches/CONNECTORS-402/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/build.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/build.xml Wed Feb  8 22:30:48 2012
@@ -63,6 +63,8 @@
             <include name="postgresql*.jar"/>
             <include name="derby*.jar"/>
             <include name="hsqldb*.jar"/>
+        </fileset>
+        <fileset dir="../lib-proprietary">
             <include name="mysql*.jar"/>
             <include name="ojdbc*.jar"/>
             <include name="jtds*.jar"/>
@@ -283,6 +285,8 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>
@@ -324,6 +328,8 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>
@@ -370,6 +376,8 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>
@@ -452,6 +460,8 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>
@@ -557,6 +567,8 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>

Modified: incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml Wed
Feb  8 22:30:48 2012
@@ -34,6 +34,7 @@
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
+  <libdir path="../connector-lib-proprietary"/>
   <!-- WSDD references -->
   <!-- Any additional properties go here -->
 </configuration>

Modified: incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml?rev=1242149&r1=1242148&r2=1242149&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml Wed
Feb  8 22:30:48 2012
@@ -28,6 +28,7 @@
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
+  <libdir path="../connector-lib-proprietary"/>
   <!-- WSDD references -->
   <!-- Any additional properties go here -->
 </configuration>

Propchange: incubator/lcf/branches/CONNECTORS-402/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  8 22:30:48 2012
@@ -0,0 +1,3 @@
+jtds.jar
+mysql-connector-java.jar
+ojdbc.jar

Added: incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt?rev=1242149&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt (added)
+++ incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt Wed Feb  8 22:30:48 2012
@@ -0,0 +1,35 @@
+# 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.
+
+This directory is meant to contain root-level proprietary jars, usually JDBC drivers such
as
+Oracle or MySQL, which cannot be redistributed under the Apache license.
+
+The following JDBC drivers are of interest:
+
+Oracle: oracle ojdbc5 jdk1.5 and ojdbc6 jdk1.6
+MSSQL/Sybase: jtds 1.2
+MySQL: mysql 5.1
+
+To build with Oracle JDBC support, copy the Oracle JDBC
+driver into this directory, calling it "ojdbc.jar", before building.
+To build with Mssql/Sybase, copy a version of the jtds driver here,
+and call it "jtds.jar".
+To build with MySQL support, copy a version of the MySQL driver
+here, and call it "mysql-connector-java.jar".
+
+Then, build ManifoldCF using the normal ant build script.  Further information can be
+found on the "how-to-build-and-deploy.html" documentation page.
+
+

Propchange: incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-402/lib-proprietary/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message