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 2012/06/26 09:26:42 UTC

svn commit: r1353842 [1/2] - in /manifoldcf/trunk: ./ connectors/ connectors/documentum/ connectors/documentum/build-stub/ connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/ connectors/documentum/connector/src/main/java/org/apache...

Author: kwright
Date: Tue Jun 26 07:26:38 2012
New Revision: 1353842

URL: http://svn.apache.org/viewvc?rev=1353842&view=rev
Log:
Fix for CONNECTORS-474.  Build Livelink, FileNet, and Documentum connectors against stubs.  Include WSDL and XSD files directly for Meridio and SharePoint connectors.

Added:
    manifoldcf/trunk/connectors/documentum/build-stub/
      - copied from r1349740, incubator/lcf/branches/CONNECTORS-474/connectors/documentum/build-stub/
    manifoldcf/trunk/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfTypedObject.java
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfTypedObject.java
    manifoldcf/trunk/connectors/filenet/build-stub/
      - copied from r1349740, incubator/lcf/branches/CONNECTORS-474/connectors/filenet/build-stub/
    manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/InstantiatingScope.java
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/InstantiatingScope.java
    manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Scope.java
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Scope.java
    manifoldcf/trunk/connectors/livelink/build-stub/
      - copied from r1349740, incubator/lcf/branches/CONNECTORS-474/connectors/livelink/build-stub/
    manifoldcf/trunk/connectors/meridio/wsdls/DMDataSet_castor.xsd
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/meridio/wsdls/DMDataSet_castor.xsd
    manifoldcf/trunk/connectors/meridio/wsdls/MeridioDMWS_axis.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/meridio/wsdls/MeridioDMWS_axis.wsdl
    manifoldcf/trunk/connectors/meridio/wsdls/MeridioRMWS_axis.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/meridio/wsdls/MeridioRMWS_axis.wsdl
    manifoldcf/trunk/connectors/meridio/wsdls/RMClassificationDataSet_castor.xsd
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/meridio/wsdls/RMClassificationDataSet_castor.xsd
    manifoldcf/trunk/connectors/meridio/wsdls/RMDataSet_castor.xsd
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/meridio/wsdls/RMDataSet_castor.xsd
    manifoldcf/trunk/connectors/sharepoint/wsdls/DspSts.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/sharepoint/wsdls/DspSts.wsdl
    manifoldcf/trunk/connectors/sharepoint/wsdls/Lists.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/sharepoint/wsdls/Lists.wsdl
    manifoldcf/trunk/connectors/sharepoint/wsdls/Permissions.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/sharepoint/wsdls/Permissions.wsdl
    manifoldcf/trunk/connectors/sharepoint/wsdls/usergroup.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/sharepoint/wsdls/usergroup.wsdl
    manifoldcf/trunk/connectors/sharepoint/wsdls/versions.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/sharepoint/wsdls/versions.wsdl
    manifoldcf/trunk/connectors/sharepoint/wsdls/webs.wsdl
      - copied unchanged from r1353803, manifoldcf/branches/CONNECTORS-474/connectors/sharepoint/wsdls/webs.wsdl
Removed:
    manifoldcf/trunk/connectors/meridio/lib-proprietary/
    manifoldcf/trunk/connectors/sharepoint/lib-proprietary/
Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/LICENSE.txt
    manifoldcf/trunk/connectors/connector-build.xml
    manifoldcf/trunk/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfPersistentObject.java
    manifoldcf/trunk/connectors/documentum/build.xml
    manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
    manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
    manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Factory.java
    manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/ObjectStore.java
    manifoldcf/trunk/connectors/filenet/build.xml
    manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
    manifoldcf/trunk/connectors/livelink/build.xml
    manifoldcf/trunk/connectors/meridio/build.xml
    manifoldcf/trunk/connectors/sharepoint/build.xml
    manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl   (props changed)
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
    manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
  Merged /incubator/lcf/branches/CONNECTORS-474:r1340041-1349740
  Merged /manifoldcf/branches/CONNECTORS-474:r1349741-1353803

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jun 26 07:26:38 2012
@@ -3,6 +3,13 @@ $Id$
 
 ======================= 0.6-dev =====================
 
+CONNECTORS-474: Make it possible to build a complete release candidate
+and site javadoc without requiring any proprietary libraries or interface
+code installed.  This is accomplished by: (a) including stub non-proprietary
+classes that can be compiled against, and (b) including WSDLs and XSDs
+generated from proprietary .NET libraries, but which are not proprietary
+themselves (according to LEGAL-137).
+
 CONNECTORS-484: The FileNet connector UI has been broken since
 the i18n work was done on it.
 (Joe Becknell, Karl Wright)

Modified: manifoldcf/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/LICENSE.txt?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/LICENSE.txt (original)
+++ manifoldcf/trunk/LICENSE.txt Tue Jun 26 07:26:38 2012
@@ -175,3 +175,13 @@
 
    END OF TERMS AND CONDITIONS
 
+
+The Meridio Connector portion of this software includes application
+interface descriptions generated in part from proprietary libraries licensed
+by Meridio, Inc., a division of Autonomy, Inc., a subsidiary of Hewlett
+Packard, Inc.
+
+The SharePoint Connector portion of this software includes application
+interface descriptions generated in part from proprietary libraries licensed
+by Microsoft, Inc.
+

Modified: manifoldcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/connector-build.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/connector-build.xml (original)
+++ manifoldcf/trunk/connectors/connector-build.xml Tue Jun 26 07:26:38 2012
@@ -70,6 +70,7 @@
             <include name="commons-discovery*.jar"/>
         </fileset>
         <fileset dir="../../framework/build/jar"/>
+        <pathelement location="build/stubclasses"/>
         <pathelement location="build/wsdlclasses"/>
         <pathelement location="build/xsdclasses"/>
         <pathelement location="build/interface/classes"/>
@@ -104,6 +105,7 @@
 
     <path id="implementation-classpath">
         <path refid="mcf-connector-build.implementation-classpath"/>
+        <pathelement location="build/stubclasses"/>
     </path>
 
     <path id="mcf-connector-build.interface-classpath">
@@ -125,6 +127,18 @@
 
     <target name="pretest-check" depends="calculate-testcode-condition" unless="canTest"/>
 
+    <target name="has-stubs-check" depends="precompile-check" if="canBuild">
+        <available file="build-stub/src/main/java" property="hasStubs"/>
+    </target>
+    
+    <target name="compile-stubs" depends="has-stubs-check" if="hasStubs">
+        <mkdir dir="build/stubclasses"/>
+        <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+            </classpath>
+        </javac>
+    </target>
+
     <target name="has-tests-check" depends="precompile-check" if="canBuild">
         <available file="connector/src/test/java" property="hasTests"/>
     </target>
@@ -328,7 +342,7 @@
         </javac>
     </target>
 
-    <target name="compile-connector" depends="compile-connector-native2ascii,compile-connector-resources,compile-wsdls,compile-xsds,compile-interface,compile-rmic,precompile-check" if="canBuild">
+    <target name="compile-connector" depends="compile-stubs,compile-connector-native2ascii,compile-connector-resources,compile-wsdls,compile-xsds,compile-interface,compile-rmic,precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
         <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
@@ -337,7 +351,7 @@
         </javac>
     </target>
 
-    <target name="compile-implementation" depends="compile-interface,has-RMI-check" if="hasRMI">
+    <target name="compile-implementation" depends="compile-stubs,compile-interface,has-RMI-check" if="hasRMI">
         <mkdir dir="build/implementation/classes"/>
         <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>

Modified: manifoldcf/trunk/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfPersistentObject.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfPersistentObject.java?rev=1353842&r1=1349740&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfPersistentObject.java (original)
+++ manifoldcf/trunk/connectors/documentum/build-stub/src/main/java/com/documentum/fc/client/IDfPersistentObject.java Tue Jun 26 07:26:38 2012
@@ -22,16 +22,8 @@ import com.documentum.fc.common.*;
 
 /** Stub interface to allow the connector to build fully.
 */
-public interface IDfPersistentObject
+public interface IDfPersistentObject extends IDfTypedObject
 {
-  public String getObjectId()
-    throws DfException;
   public boolean isDeleted()
     throws DfException;
-  public int getValueCount(String attribute)
-    throws DfException;
-  public String getRepeatingString(String attribute, int index)
-    throws DfException;
-  public String getString(String attribute)
-    throws DfException;
 }

Modified: manifoldcf/trunk/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/build.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/build.xml (original)
+++ manifoldcf/trunk/connectors/documentum/build.xml Tue Jun 26 07:26:38 2012
@@ -19,7 +19,7 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="calculate-condition">
+    <!-- target name="calculate-condition">
         <available file="lib-proprietary/dfc.jar" property="dfcStatus"/>
         <available file="lib-proprietary/dfcbase.jar" property="dfcbaseStatus"/>
         <available file="lib-proprietary/dctm.jar" property="dctmStatus"/>
@@ -30,18 +30,18 @@
                 <isset property="dctmStatus"/>
             </and>
         </condition>
-    </target>
+    </target -->
 
-    <target name="precompile-check" depends="calculate-condition" unless="canBuild">
+    <!-- target name="precompile-check" depends="calculate-condition" unless="canBuild">
         <echo message="Documentum Connector cannot be built without dfc.jar, dfcbase.jar, and dctm.jar"/>
-    </target>
+    </target -->
 
-    <path id="implementation-classpath">
+    <!-- path id="implementation-classpath">
         <path refid="mcf-connector-build.implementation-classpath"/>
         <fileset dir="lib-proprietary"> 
             <include name="*.jar"/> 
         </fileset> 
-    </path>
+    </path -->
 
     <target name="rmic-build-all" depends="compile-implementation,compile-interface,setup-rmic,has-RMI-check" if="hasRMI">
         <!-- The ant version I have doesn't seem to handle class specifications based on file names, so this is the best I could come up with -->

Modified: manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java (original)
+++ manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java Tue Jun 26 07:26:38 2012
@@ -183,6 +183,8 @@ public class AuthorityConnector extends 
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -299,6 +301,8 @@ public class AuthorityConnector extends 
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -425,6 +429,8 @@ public class AuthorityConnector extends 
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -678,6 +684,8 @@ public class AuthorityConnector extends 
               throw (RemoteException)thr;
             else if (thr instanceof DocumentumException)
               throw (DocumentumException)thr;
+            else if (thr instanceof RuntimeException)
+              throw (RuntimeException)thr;
             else
               throw (Error)thr;
           }
@@ -747,6 +755,8 @@ public class AuthorityConnector extends 
               throw (RemoteException)thr;
             else if (thr instanceof DocumentumException)
               throw (DocumentumException)thr;
+            else if (thr instanceof RuntimeException)
+              throw (RuntimeException)thr;
             else
               throw (Error)thr;
           }
@@ -922,6 +932,8 @@ public class AuthorityConnector extends 
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }

Modified: manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java (original)
+++ manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java Tue Jun 26 07:26:38 2012
@@ -269,6 +269,8 @@ public class DCTM extends org.apache.man
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -345,6 +347,8 @@ public class DCTM extends org.apache.man
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -428,6 +432,8 @@ public class DCTM extends org.apache.man
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -507,6 +513,8 @@ public class DCTM extends org.apache.man
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -652,6 +660,8 @@ public class DCTM extends org.apache.man
             throw (RemoteException)thr;
           else if (thr instanceof DocumentumException)
             throw (DocumentumException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -1118,6 +1128,8 @@ public class DCTM extends org.apache.man
                   throw (DocumentumException)thr;
                 else if (thr instanceof InterruptedException)
                   throw (InterruptedException)thr;
+                else if (thr instanceof RuntimeException)
+                  throw (RuntimeException)thr;
                 else
                   throw (Error)thr;
               }
@@ -1460,6 +1472,8 @@ public class DCTM extends org.apache.man
                 throw (RemoteException)thr;
               else if (thr instanceof DocumentumException)
                 throw (DocumentumException)thr;
+              else if (thr instanceof RuntimeException)
+                throw (RuntimeException)thr;
               else
                 throw (Error)thr;
             }
@@ -1778,6 +1792,8 @@ public class DCTM extends org.apache.man
                     throw (DocumentumException)thr;
                   else if (thr instanceof ManifoldCFException)
                     throw (ManifoldCFException)thr;
+                  else if (thr instanceof RuntimeException)
+                    throw (RuntimeException)thr;
                   else
                     throw (Error)thr;
                 }
@@ -3586,6 +3602,8 @@ public class DCTM extends org.apache.man
               throw (RemoteException)thr;
             else if (thr instanceof DocumentumException)
               throw (DocumentumException)thr;
+            else if (thr instanceof RuntimeException)
+              throw (RuntimeException)thr;
             else
               throw (Error)thr;
           }
@@ -3660,6 +3678,8 @@ public class DCTM extends org.apache.man
               throw (RemoteException)thr;
             else if (thr instanceof DocumentumException)
               throw (DocumentumException)thr;
+            else if (thr instanceof RuntimeException)
+              throw (RuntimeException)thr;
             else
               throw (Error)thr;
           }
@@ -3813,6 +3833,8 @@ public class DCTM extends org.apache.man
               throw (RemoteException)thr;
             else if (thr instanceof DocumentumException)
               throw (DocumentumException)thr;
+            else if (thr instanceof RuntimeException)
+              throw (RuntimeException)thr;
             else
               throw (Error)thr;
           }
@@ -3882,6 +3904,8 @@ public class DCTM extends org.apache.man
               throw (RemoteException)thr;
             else if (thr instanceof DocumentumException)
               throw (DocumentumException)thr;
+            else if (thr instanceof RuntimeException)
+              throw (RuntimeException)thr;
             else
               throw (Error)thr;
           }

Modified: manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Factory.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Factory.java?rev=1353842&r1=1349740&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Factory.java (original)
+++ manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/Factory.java Tue Jun 26 07:26:38 2012
@@ -77,7 +77,7 @@ public class Factory
   
   public static class ClassDescription
   {
-    public static com.filenet.api.meta.ClassDescription fetchInstance(com.filenet.api.core.ObjectStore os, String className, PropertyFilter filter)
+    public static com.filenet.api.meta.ClassDescription fetchInstance(com.filenet.api.core.Scope scope, String className, PropertyFilter filter)
     {
       return null;
     }

Modified: manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/ObjectStore.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/ObjectStore.java?rev=1353842&r1=1349740&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/ObjectStore.java (original)
+++ manifoldcf/trunk/connectors/filenet/build-stub/src/main/java/com/filenet/api/core/ObjectStore.java Tue Jun 26 07:26:38 2012
@@ -20,7 +20,7 @@ package com.filenet.api.core;
 
 /** Stub interface to allow the connector to build fully.
 */
-public interface ObjectStore
+public interface ObjectStore extends InstantiatingScope
 {
   public Folder get_RootFolder();
 }

Modified: manifoldcf/trunk/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filenet/build.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filenet/build.xml (original)
+++ manifoldcf/trunk/connectors/filenet/build.xml Tue Jun 26 07:26:38 2012
@@ -19,23 +19,23 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="calculate-condition">
+    <!--target name="calculate-condition">
         <available file="lib-proprietary/Jace.jar" property="JaceStatus"/>
         <condition property="canBuild">
             <isset property="JaceStatus"/>
         </condition>
-    </target>
+    </target -->
 
-    <target name="precompile-check" depends="calculate-condition" unless="canBuild">
+    <!-- target name="precompile-check" depends="calculate-condition" unless="canBuild">
         <echo message="FileNet Connector cannot be built without Jace.jar"/>
-    </target>
+    </target -->
 
-    <path id="implementation-classpath">
+    <!-- path id="implementation-classpath">
         <path refid="mcf-connector-build.implementation-classpath"/>
         <fileset dir="lib-proprietary"> 
             <include name="*.jar"/> 
         </fileset> 
-    </path>
+    </path -->
 
     <target name="rmic-build-all" depends="compile-implementation,compile-interface,setup-rmic,has-RMI-check" if="hasRMI">
         <!-- The ant version I have doesn't seem to handle class specifications based on file names, so this is the best I could come up with -->

Modified: manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Tue Jun 26 07:26:38 2012
@@ -199,6 +199,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -300,6 +302,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -489,6 +493,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3267,6 +3273,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3349,6 +3357,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3433,6 +3443,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3519,6 +3531,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3604,6 +3618,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3688,6 +3704,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3776,6 +3794,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }
@@ -3859,6 +3879,8 @@ public class FilenetConnector extends or
             throw (RemoteException)thr;
           else if (thr instanceof FilenetException)
             throw (FilenetException)thr;
+          else if (thr instanceof RuntimeException)
+            throw (RuntimeException)thr;
           else
             throw (Error)thr;
         }

Modified: manifoldcf/trunk/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/build.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/build.xml (original)
+++ manifoldcf/trunk/connectors/livelink/build.xml Tue Jun 26 07:26:38 2012
@@ -19,7 +19,7 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="calculate-condition">
+    <!-- target name="calculate-condition">
         <available file="lib-proprietary/lapi.jar" property="lapiStatus"/>
         <condition property="canBuild">
             <isset property="lapiStatus"/>
@@ -33,7 +33,7 @@
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
         <fileset dir="lib-proprietary" includes="*.jar"/>
-    </path>
+    </path -->
 
     <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
         <mkdir dir="dist/lib-proprietary"/>

Modified: manifoldcf/trunk/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/build.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/build.xml (original)
+++ manifoldcf/trunk/connectors/meridio/build.xml Tue Jun 26 07:26:38 2012
@@ -19,7 +19,7 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="calculate-condition">
+    <!-- target name="calculate-condition">
         <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"/>
@@ -38,15 +38,15 @@
 
     <target name="precompile-check" depends="calculate-condition" unless="canBuild">
         <echo message="Meridio Connector cannot be built without MeridioDMWS_axis.wsdl, MeridioRMWS_axis.wsdl, DMDataSet_castor.xsd, RMDataSet_castor.xsd, and RMClassificationDataSet_castor.xsd"/>
-    </target>
+    </target -->
 
     <target name="copy-wsdls" depends="precompile-check" if="canBuild">
         <mkdir dir="build/wsdls"/>
-        <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/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"/>
     </target>
     

Modified: manifoldcf/trunk/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/build.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/build.xml (original)
+++ manifoldcf/trunk/connectors/sharepoint/build.xml Tue Jun 26 07:26:38 2012
@@ -19,7 +19,7 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="calculate-condition">
+    <!-- target name="calculate-condition">
         <available file="lib-proprietary/DspSts.wsdl" property="DspStsStatus"/>
         <available file="lib-proprietary/Lists.wsdl" property="ListsStatus"/>
         <available file="lib-proprietary/Permissions.wsdl" property="PermissionsStatus"/>
@@ -40,29 +40,29 @@
     
     <target name="precompile-check" depends="calculate-condition" unless="canBuild">
         <echo message="SharePoint Connector cannot be built without DspSts.wsdl, Lists.wsdl, Permissions.wsdl, usergroup.wsdl, versions.wsdl, and webs.wsdl"/>
-    </target>
+    </target -->
 
     <target name="classcreate-wsdls" depends="precompile-check" if="canBuild">
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="lib-proprietary/DspSts.wsdl"/>
+            <param name="wsdlname" value="wsdls/DspSts.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="lib-proprietary/Lists.wsdl"/>
+            <param name="wsdlname" value="wsdls/Lists.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
             <param name="wsdlname" value="wsdls/MCPermissions.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="lib-proprietary/Permissions.wsdl"/>
+            <param name="wsdlname" value="wsdls/Permissions.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="lib-proprietary/usergroup.wsdl"/>
+            <param name="wsdlname" value="wsdls/usergroup.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="lib-proprietary/versions.wsdl"/>
+            <param name="wsdlname" value="wsdls/versions.wsdl"/>
         </antcall>
         <antcall target="classcreate-wsdl">
-            <param name="wsdlname" value="lib-proprietary/webs.wsdl"/>
+            <param name="wsdlname" value="wsdls/webs.wsdl"/>
         </antcall>
     </target>
 
@@ -77,7 +77,7 @@
         </copy>
     </target>
 
-    <target name="download-dependencies">
+    <!-- target name="download-dependencies">
         <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"/>
@@ -90,6 +90,6 @@
         <delete>
             <fileset dir="lib-proprietary" excludes="README.txt"/>
         </delete>
-    </target>
+    </target -->
 
 </project>

Propchange: manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/connectors/sharepoint/wsdls/MCPermissions.wsdl
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1353842&r1=1353841&r2=1353842&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Tue Jun 26 07:26:38 2012
@@ -41,19 +41,26 @@
         <ol>
           <li>Check out the desired release from https://svn.apache.org/repos/asf/manifoldcf/tags, or unpack the desired source distribution.</li>
           <li>cd to the top-level directory.</li>
-          <li>EITHER: overlay the lib directory from the corresponding lib distribution (preferred), OR run "ant make-core-deps" to build the code dependencies.</li>
+          <li><strong>EITHER:</strong> overlay the lib directory from the corresponding lib distribution (preferred), <strong>OR</strong> run "ant make-core-deps" to build the code dependencies.</li>
           <li>Run "ant make-deps", to download LGPL and other open source but non-Apache compatible libraries.</li>
-          <li>Install desired dependent proprietary libraries, wsdls, and xsds.  See below for details.</li>
+          <li>Install proprietary build dependencies.  See below for details.</li>
           <li>Run "ant build".</li>
+          <li>Install desired dependent proprietary libraries.  See below for details.</li>
         </ol>
         <p></p>
-        <p>If you do not run the ant "make-deps" target, and you supply <strong>no</strong> LGPL or proprietary libraries, the framework itself and only the following repository connectors will be built:</p>
+        <p>If you do not run the ant "make-deps" target, and you supply <strong>NO</strong> LGPL or proprietary libraries, not all capabilities of ManifoldCF will be available.
+            The framework itself and the following repository connectors will be built:</p>
         <p></p>
         <ul>
           <li>CMIS connector</li>
+          <li>Documentum connector, built against a Documentum API stub</li>
+          <li>FileNet connector, built against a FileNet API stub</li>
           <li>Filesystem connector</li>
           <li>JDBC connector, with just the PostgreSQL jdbc driver</li>
+          <li>LiveLink connector, built against a LiveLink API stub</li>
+          <li>Meridio connector, built against modified Meridio API WSDLs and XSDs</li>
           <li>RSS connector</li>
+          <li>SharePoint connector, built against SharePoint API WSDLs</li>
           <li>Webcrawler connector</li>
           <li>Wiki connector</li>
         </ul>
@@ -63,6 +70,8 @@
         <ul>
           <li>Active Directory authority</li>
           <li>CMIS authority</li>
+          <li>Documentum authority</li>
+          <li>LiveLink authority</li>
           <li>Null authority connector</li>
         </ul>
         <p></p>
@@ -76,7 +85,7 @@
           <li>Null output connector</li>
         </ul>
         <p></p>
-        <p>The LGPL and proprietary connector dependencies are described in separate sections below.</p>
+        <p>Each individual LGPL and proprietary connector's dependencies and build limitations are described in separate sections below.</p>
         <p></p>
         <p>The output of the ant build is produced in the <em>dist</em> directory, which is further broken down by process.  (The number of produced <em>xxx-process</em> directories may vary, because optional individual connectors do sometimes supply processes that must be run to support the connector.)  See the table below for a description of the <em>dist</em> folder.</p>
         <p></p>
@@ -145,11 +154,12 @@
         <p></p>
         <p>The basic multiprocess command scripts will be placed in the <em>processes</em> subdirectory.  The script for executing commands is <em>processes/executecommand[.sh|.bat]</em>.
             This script requires two environment variables to be set before execution: JAVA_HOME, and MCF_HOME, which should point to ManifoldCF's home execution directory, where the <em>properties.xml</em> file is found.)</p>
+            
         <section>
           <title>Building and testing the Alfresco connector</title>
           <p></p>
           <p>The Alfresco connector requires the Alfresco Web Services Client provided by Alfresco in order to be built. Place this jar into the directory <em>connectors/alfresco/lib-proprietary</em> before you build.
-              This will occur automatically if you execute the ant target "download-dependencies" from the ManifoldCF root directory.</p>
+              This will occur automatically if you execute the ant target "make-deps" from the ManifoldCF root directory.</p>
           <p></p>
           <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-war (using "mvn package" inside the folder)
               into the <em>connectors/alfresco/test-materials-proprietary</em> folder.  Then use the "ant test" or "mvn integration-test" for the standard build to execute integration tests.</p>
@@ -157,106 +167,75 @@
         </section>
         
         <section>
-          <title>Building the Documentum connector</title>
+          <title>Building and running the Documentum connector</title>
           <p></p>
-          <p>The Documentum connector requires EMC's DFC product in order to be built.  Install DFC on the build system, and locate the jars it installs.  You will need to copy at least dfc.jar, dfcbase.jar,
-              and dctm.jar into the directory <em>connectors/documentum/lib-proprietary</em>.</p>
+          <p>The Documentum connector requires EMC's DFC product in order to be run, but is built against a set of stub classes.  After building, you must install DFC on the build system, and locate the jars it installs.  Copy
+              these jars to the directory <em>dist/documentum-server-process/lib-proprietary</em>.</p>
+          <p>For a binary distribution, copy the DFC jars to <em>documentum-server-process/lib-proprietary</em> instead.</p>
+          <p>If you have done everything right, you should be able to start the Documentum connector's registry and server processes, as per the instructions.</p>
           <p></p>
         </section>
         
         <section>
-          <title>Building the FileNet connector</title>
+          <title>Building and running the FileNet connector</title>
           <p></p>
-          <p>The FileNet connector requires IBM's FileNet P8 API jar in order to be build.  Install the FileNet P8 API on the build system, and copy at least "Jace.jar" from that installation
-              into <em>connectors/filenet/lib-proprietary</em>.</p>
+          <p>The FileNet connector requires IBM's FileNet P8 API jar in order to be run, but is built against a set of stub classes.  After building, install the FileNet P8 API on your system,
+              and copy "Jace.jar" and the other dependent jars from that installation into <em>dist/filenet-server-process/lib-proprietary</em>.</p>
+          <p>If you have downloaded a binary distribution, place the jar in <em>filenet-server-process/lib-proprietary</em>.</p>
+          <p>If correctly done, you will be able to start the FileNet connector's registry and server processes, as per the instructions.</p>
           <p></p>
         </section>
         
         <section>
-          <title>Building the JDBC connector, including Oracle, MSSQL, MySQL, SQLServer, and Sybase JDBC drivers</title>
+          <title>Building and running the JDBC connector, including Oracle, MSSQL, MySQL, SQLServer, and Sybase JDBC drivers</title>
           <p></p>
-          <p>The JDBC connector also knows how to work with Oracle, SQLServer, and Sybase JDBC drivers.  In order to support these databases, start by placing the mysql-connector-java.jar,
-            the jtds.jar, and the ojdbc.jar in the <em>lib-proprietary</em> directory.  The ant target "download-dependencies" will do this for you automatically.  For Oracle, download the appropriate
+          <p>The JDBC connector also knows how to work with Oracle, SQLServer, and Sybase JDBC drivers.  In order to support these databases, start by placing the mysql-connector-java.jar
+            and the jtds.jar in the <em>lib-proprietary</em> directory.  The ant target "make-deps" will do this for you automatically.  For Oracle, download the appropriate
             Oracle JDBC jar from the Oracle site, and copy it into the same directory before you build ManifoldCF.</p>
           <p></p>
         </section>
         
         <section>
-          <title>Building the jCIFS connector</title>
+          <title>Building and running the jCIFS/Windows Shares connector</title>
           <p></p>
           <p>To build this connector, you need to download jcifs.jar from <a href="http://jcifs.samba.org">http://jcifs.samba.org</a>, and copy it into the <em>connectors/jcifs/lib-proprietary</em>
-              directory.  You can also just type "ant download-dependencies" from the root ManifoldCF directory and this step will be done for you.</p>
+              directory before building.  You can also just type "ant make-deps" from the root ManifoldCF directory and this step will be done for you.</p>
+          <p>If you have downloaded a binary distribution, place the jcifs.jar into the <em>connector-lib-proprietary</em> directory, and uncomment the Windows Shares line in the <em>connectors.xml</em> file.</p>
           <p></p>
         </section>
         
         <section>
-          <title>Building the LiveLink connector</title>
+          <title>Building and running the LiveLink connector</title>
           <p></p>
-          <p>This connector needs LAPI, which is a proprietary java library that allows access to OpenText's LiveLink server.  Copy the lapi.jar into the <em>connectors/livelink/lib-proprietary</em>
-              directory.</p>
-          <p></p>
-        </section>
-        
-        <section>
-          <title>Building the Memex connector</title>
-          <p></p>
-          <p>This connector needs the Memex API jar, usually called JavaMXIELIB.jar.  Copy this jar into the <em>connectors/memex/lib-proprietary</em> directory.</p>
+          <p>This connector needs OpenText's LAPI package in order to be run, but is built against a set of stubs.  After building, copy the lapi.jar into the <em>dist/connector-lib-proprietary</em>
+              directory, and uncomment the LiveLink-related connector lines in <em>dist/connectors.xml</em>.</p>
+          <p>If you have downloaded a binary distribution, place the jar in <em>connector-lib-proprietary</em>, and modify the <em>connectors.xml</em> file.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the Meridio connector</title>
           <p></p>
-          <p>The Meridio connector needs wsdls and xsds downloaded from an installed Meridio instance using <strong>disco.exe</strong>, which is installed as part of
-              Microsoft Visual Studio, typically under "c:\Program Files\Microsoft SDKs\Windows\V6.x\bin".  Obtain the preliminary wsdls and xsds by interrogating the
-              following Meridio web services:</p>
+          <p>The Meridio connector generates interface classes using checked-in wsdls and xsds originally obtained
+              from an installed Meridio instance using <strong>disco.exe</strong>, and subsequently modified to work
+              around limitations in Apache Axis.  The <strong>disco.exe</strong> utility is installed as part of
+              Microsoft Visual Studio, and is typically found under "c:\Program Files\Microsoft SDKs\Windows\V6.x\bin".
+              If desired, you can obtain unmodified wsdls and xsds by interrogating the following Meridio web services:</p>
           <p></p>
           <ul>
              <li>http[s]://&#60;meridio_server&#62;/DMWS/MeridioDMWS.asmx</li>
              <li>http[s]://&#60;meridio_server&#62;/RMWS/MeridioRMWS.asmx</li>
           </ul>
           <p></p>
-          <p>You should have obtained the following files in this step:</p>
-          <p></p>
-          <ul>
-             <li>MeridioDMWS.wsdl</li>
-             <li>MeridioRMWS.wsdl</li>
-             <li>DMDataSet.xsd</li>
-             <li>RMDataSet.xsd</li>
-             <li>RMClassificationDataSet.xsd</li>
-          </ul>
-          <p></p>
-          <p>Next, patch these using Microsoft's <strong>xmldiffpatch</strong> utility suite, downloadable for Windows from
-              <a href="http://msdn.microsoft.com/en-us/library/aa302294.aspx">http://msdn.microsoft.com/en-us/library/aa302294.aspx</a>.  The appropriate diff files to apply as patches can
-              be found in <em>connectors/meridio/lib-proprietary</em>.  After the patching, rename so that you have the files:</p>
-          <p></p>
-          <ul>
-             <li>MeridioDMWS_axis.wsdl</li>
-             <li>MeridioRMWS_axis.wsdl</li>
-             <li>DMDataSet_castor.xsd</li>
-             <li>RMDataSet_castor.xsd</li>
-             <li>RMClassificationDataSet_castor.xsd</li>
-          </ul>
-          <p></p>
-          <p>Finally, copy all of these to <em>connectors/meridio/lib-proprietary</em>.</p>
-          <p></p>
         </section>
         
         <section>
           <title>Building the SharePoint connector</title>
           <p></p>
-          <p>In order to build this connector, you need to download wsdls from an installed SharePoint instance.  The wsdls in question are:</p>
-          <p></p>
-          <ul>
-             <li>Permissions.wsdl</li>
-             <li>Lists.wsdl</li>
-             <li>Dspsts.wsdl</li>
-             <li>usergroup.wsdl</li>
-             <li>versions.wsdl</li>
-             <li>webs.wsdl</li>
-          </ul>
-          <p></p>
-          <p>To download a wsdl, use Microsoft's <strong>disco.exe</strong> tool, which is part of Microsoft's Visual Studio, typically under <em>c:\Program Files\Microsoft SDKs\Windows\V6.x\bin</em>.  You'd want to interrogate the following urls:</p>
+          <p>The SharePoint connector generates interface classes using checked-in wsdls originally obtained
+            from an installed Microsoft SharePoint instance using <strong>disco.exe</strong>.  The <strong>disco.exe</strong> utility is installed as part of
+            Microsoft Visual Studio, and is typically found under "c:\Program Files\Microsoft SDKs\Windows\V6.x\bin".
+            If desired, you can obtain unmodified wsdls by interrogating the following SharePoint web services:</p>
           <p></p>
           <ul>
              <li>http[s]://&#60;server_name&#62;/_vti_bin/Permissions.asmx</li>
@@ -267,14 +246,9 @@
              <li>http[s]://&#60;server_name&#62;/_vti_bin/webs.asmx</li>
           </ul>
           <p></p>
-          <p>When the wsdl files have been downloaded, copy them to the directory <em>connectors/sharepoint/lib-proprietary</em> before building.</p>
-          <p></p>
-          <p>The wsdl files download will be done automatically if you type "ant download-dependencies" from the root directory.</p>
-          <p></p>
           <p>Note well: For SharePoint instances version 3.0 or higher, in order to support file and folder level security, you also must deploy a custom SharePoint web service on the SharePoint instance you intend to connect to.  This is because Microsoft apparently overlooked support for web-service-based access to such security information when SharePoint 3.0 was released.  This service can be found in the directory <em>dist/sharepoint-integration</em> after ManifoldCF is built.
             To install it on your SharePoint 3.0 machine, follow the directions in the file <strong>Installation Readme.txt</strong>, found in that directory.</p>
           <p></p>
-          <p></p>
         </section>
         
         <section>