incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1242970 [1/2] - in /incubator/lcf/trunk: ./ connectors/ connectors/alfresco/ connectors/alfresco/alfresco-war/ connectors/alfresco/alfresco-ws-client/ connectors/alfresco/lib-proprietary/ connectors/alfresco/test-materials-proprietary/ con...
Date Fri, 10 Feb 2012 22:58:48 GMT
Author: kwright
Date: Fri Feb 10 22:58:46 2012
New Revision: 1242970

URL: http://svn.apache.org/viewvc?rev=1242970&view=rev
Log:
Fix for CONNECTORS-402.

Added:
    incubator/lcf/trunk/connectors/alfresco/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/lib-proprietary/
    incubator/lcf/trunk/connectors/alfresco/test-materials-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/alfresco/test-materials-proprietary/
    incubator/lcf/trunk/connectors/documentum/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/documentum/lib-proprietary/
    incubator/lcf/trunk/connectors/documentum/server/README.txt
      - copied unchanged from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/documentum/server/README.txt
    incubator/lcf/trunk/connectors/filenet/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/filenet/lib-proprietary/
    incubator/lcf/trunk/connectors/filenet/server/README.txt
      - copied unchanged from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/filenet/server/README.txt
    incubator/lcf/trunk/connectors/jcifs/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/jcifs/lib-proprietary/
    incubator/lcf/trunk/connectors/livelink/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/livelink/lib-proprietary/
    incubator/lcf/trunk/connectors/meridio/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/meridio/lib-proprietary/
    incubator/lcf/trunk/connectors/meridio/wsdls/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/meridio/wsdls/
    incubator/lcf/trunk/connectors/sharepoint/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/lib-proprietary/
    incubator/lcf/trunk/connectors/sharepoint/wsdls/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/connectors/sharepoint/wsdls/
    incubator/lcf/trunk/framework/example-common/README.txt
      - copied unchanged from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt
    incubator/lcf/trunk/framework/example-multiprocess/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/
    incubator/lcf/trunk/framework/example-multiprocess-common/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-common/
    incubator/lcf/trunk/framework/example-multiprocess-proprietary/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/
    incubator/lcf/trunk/framework/example-singleprocess/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/
    incubator/lcf/trunk/framework/example-singleprocess-common/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-common/
    incubator/lcf/trunk/framework/example-singleprocess-proprietary/
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/
    incubator/lcf/trunk/lib-proprietary/   (props changed)
      - copied from r1242965, incubator/lcf/branches/CONNECTORS-402/lib-proprietary/
Removed:
    incubator/lcf/trunk/connectors/alfresco/alfresco-war/
    incubator/lcf/trunk/connectors/alfresco/alfresco-ws-client/
    incubator/lcf/trunk/connectors/documentum/dfc/
    incubator/lcf/trunk/connectors/filenet/filenet-api/
    incubator/lcf/trunk/connectors/jcifs/jcifs/
    incubator/lcf/trunk/connectors/livelink/lapi/
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/alfresco/build.xml
    incubator/lcf/trunk/connectors/connector-build.xml
    incubator/lcf/trunk/connectors/documentum/build.xml
    incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat
    incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh
    incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat
    incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat
    incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh
    incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat
    incubator/lcf/trunk/connectors/filenet/build.xml
    incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat
    incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh
    incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat
    incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat
    incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh
    incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat
    incubator/lcf/trunk/connectors/jcifs/build.xml
    incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt
    incubator/lcf/trunk/connectors/livelink/build.xml
    incubator/lcf/trunk/connectors/meridio/build.xml
    incubator/lcf/trunk/connectors/sharepoint/build.xml
    incubator/lcf/trunk/framework/build.xml
    incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java
    incubator/lcf/trunk/mvn-bootstrap.bat
    incubator/lcf/trunk/mvn-bootstrap.sh
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 22:58:46 2012
@@ -19,3 +19,4 @@
 /incubator/lcf/branches/CONNECTORS-336:1222382-1231874
 /incubator/lcf/branches/CONNECTORS-353:1226361-1226428
 /incubator/lcf/branches/CONNECTORS-388:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402:1242059-1242965

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Feb 10 22:58:46 2012
@@ -3,6 +3,12 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-402: Change the ant build process to produce two artifacts -
+one with proprietary material, and the other without.  This allows for
+releases that include built connectors even though we do not ship the
+proprietary material.
+(Karl Wright, Piergiorgio Lucidi)
+
 CONNECTORS-403: Fix the sidecar process scripts to use the same
 definition for MCF_HOME as everything else uses.  Also promote these
 scripts to the root level in their individual process directory.

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Fri Feb 10 22:58:46 2012
@@ -912,9 +912,14 @@
         <mkdir dir="dist"/>
         <mkdir dir="dist/example"/>
         <mkdir dir="dist/multiprocess-example"/>
+        <mkdir dir="dist/example-proprietary"/>
+        <mkdir dir="dist/multiprocess-example-proprietary"/>
         <delete file="dist/connectors.xml"/>
+        <delete file="dist/connectors-proprietary.xml"/>
         <delete file="dist/example/properties.xml"/>
+        <delete file="dist/example-proprietary/properties.xml"/>
         <delete file="dist/multiprocess-example/properties.xml"/>
+        <delete file="dist/multiprocess-example-proprietary/properties.xml"/>
     </target>
     
     <target name="deliver-framework" depends="preclean-for-delivery,build-framework">
@@ -922,10 +927,18 @@
         <copy todir="dist/multiprocess-example">
             <fileset dir="framework/dist/multiprocess-example"/>
         </copy>
+        <mkdir dir="dist/multiprocess-example-proprietary"/>
+        <copy todir="dist/multiprocess-example-proprietary">
+            <fileset dir="framework/dist/multiprocess-example-proprietary"/>
+        </copy>
         <mkdir dir="dist/example"/>
         <copy todir="dist/example">
             <fileset dir="framework/dist/example"/>
         </copy>
+        <mkdir dir="dist/example-proprietary"/>
+        <copy todir="dist/example-proprietary">
+            <fileset dir="framework/dist/example-proprietary"/>
+        </copy>
         <mkdir dir="dist/script-engine"/>
         <copy todir="dist/script-engine">
             <fileset dir="framework/dist/script-engine"/>
@@ -934,8 +947,17 @@
         <copy todir="dist">
             <fileset dir="framework/dist">
                 <include name="connectors.xml"/>
+                <include name="connectors-proprietary.xml"/>
             </fileset>
         </copy>
+        <mkdir dir="dist/connector-lib"/>
+        <copy todir="dist/connector-lib">
+            <fileset dir="framework/dist/connector-lib"/>
+        </copy>
+        <mkdir dir="dist/connector-lib-proprietary"/>
+        <copy todir="dist/connector-lib-proprietary">
+            <fileset dir="framework/dist/connector-lib-proprietary"/>
+        </copy>
     </target>
     
     <target name="deliver-framework-doc" depends="doc-framework">
@@ -978,7 +1000,18 @@
         </copy>
     </target>
 
-    <target name="general-connector-delivery" depends="general-connector-delivery-integration,general-connector-delivery-processes">
+    <target name="general-connector-proprietary-check">
+        <available file="connectors/${connector-name}/dist/lib-proprietary" type="dir" property="${connector-name}.is-proprietary"/>
+    </target>
+
+    <target name="general-connector-proprietary-delivery" depends="general-connector-proprietary-check" if="${connector-name}.is-proprietary">
+        <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-delivery" depends="general-connector-proprietary-delivery,general-connector-delivery-integration,general-connector-delivery-processes">
         <mkdir dir="dist/connector-lib"/>
         <copy todir="dist/connector-lib">
             <fileset dir="connectors/${connector-name}/dist/lib"/>
@@ -996,16 +1029,40 @@
         </copy>
     </target>
 
-    <target name="general-add-authority-connector">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;authorityconnector name=&quot;${connector-name}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="general-add-authority-connector-proprietary" depends="general-connector-proprietary-check" if="${connector-name}.is-proprietary">
+        <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;!--authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
     </target>
 
-    <target name="general-add-output-connector">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;outputconnector name=&quot;${connector-name}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="general-add-authority-connector-non-proprietary" depends="general-connector-proprietary-check" unless="${connector-name}.is-proprietary">
+        <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
-    
-    <target name="general-add-repository-connector">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;${connector-name}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+
+    <target name="general-add-authority-connector" depends="general-add-authority-connector-proprietary,general-add-authority-connector-non-proprietary">
+        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    </target>
+
+    <target name="general-add-output-connector-proprietary" depends="general-connector-proprietary-check" if="${connector-name}.is-proprietary">
+        <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;!--outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    </target>
+
+    <target name="general-add-output-connector-non-proprietary" depends="general-connector-proprietary-check" unless="${connector-name}.is-proprietary">
+        <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    </target>
+
+    <target name="general-add-output-connector" depends="general-add-output-connector-proprietary,general-add-output-connector-non-proprietary">
+        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    </target>
+
+    <target name="general-add-repository-connector-proprietary" depends="general-connector-proprietary-check" if="${connector-name}.is-proprietary">
+        <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;!--repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    </target>
+
+    <target name="general-add-repository-connector-non-proprietary" depends="general-connector-proprietary-check" unless="${connector-name}.is-proprietary">
+        <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    </target>
+
+    <target name="general-add-repository-connector" depends="general-add-repository-connector-proprietary,general-add-repository-connector-non-proprietary">
+        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
     </target>
     
     <target name="calculate-activedirectory-condition" depends="build-activedirectory-connector">
@@ -1027,7 +1084,8 @@
             <param name="connector-name" value="activedirectory"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="Active Directory"/>
+            <param name="connector-name" value="activedirectory"/>
+            <param name="connector-label" value="Active Directory"/>
             <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority"/>
         </antcall>
     </target>
@@ -1067,7 +1125,8 @@
             <param name="connector-name" value="alfresco"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Alfresco"/>
+            <param name="connector-name" value="alfresco"/>
+            <param name="connector-label" value="Alfresco"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.alfresco.AlfrescoRepositoryConnector"/>
         </antcall>
     </target>
@@ -1097,11 +1156,13 @@
             <param name="connector-name" value="cmis"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="CMIS"/>
+            <param name="connector-name" value="cmis"/>
+            <param name="connector-label" value="CMIS"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="CMIS"/>
+            <param name="connector-name" value="cmis"/>
+            <param name="connector-label" value="CMIS"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.cmis.CmisAuthorityConnector"/>
         </antcall>
     </target>
@@ -1131,11 +1192,13 @@
             <param name="connector-name" value="documentum"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="Documentum"/>
+            <param name="connector-name" value="documentum"/>
+            <param name="connector-label" value="Documentum"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Documentum"/>
+            <param name="connector-name" value="documentum"/>
+            <param name="connector-label" value="Documentum"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.DCTM.DCTM"/>
         </antcall>
     </target>
@@ -1165,7 +1228,8 @@
             <param name="connector-name" value="filenet"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="FileNet"/>
+            <param name="connector-name" value="filenet"/>
+            <param name="connector-label" value="FileNet"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector"/>
         </antcall>
     </target>
@@ -1195,7 +1259,8 @@
             <param name="connector-name" value="filesystem"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="File system"/>
+            <param name="connector-name" value="filesystem"/>
+            <param name="connector-label" value="File system"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.filesystem.FileConnector"/>
         </antcall>
     </target>
@@ -1225,7 +1290,8 @@
             <param name="connector-name" value="gts"/>
         </antcall>
         <antcall target="general-add-output-connector">
-            <param name="connector-name" value="MetaCarta GTS"/>
+            <param name="connector-name" value="gts"/>
+            <param name="connector-label" value="MetaCarta GTS"/>
             <param name="connector-class" value="org.apache.manifoldcf.agents.output.gts.GTSConnector"/>
         </antcall>
     </target>
@@ -1255,7 +1321,8 @@
             <param name="connector-name" value="jdbc"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="JDBC"/>
+            <param name="connector-name" value="jdbc"/>
+            <param name="connector-label" value="JDBC"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConnector"/>
         </antcall>
     </target>
@@ -1285,7 +1352,8 @@
             <param name="connector-name" value="jcifs"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Windows shares"/>
+            <param name="connector-name" value="jcifs"/>
+            <param name="connector-label" value="Windows shares"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector"/>
         </antcall>
     </target>
@@ -1315,11 +1383,13 @@
             <param name="connector-name" value="livelink"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="LiveLink"/>
+            <param name="connector-name" value="livelink"/>
+            <param name="connector-label" value="LiveLink"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkAuthority"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="LiveLink"/>
+            <param name="connector-name" value="livelink"/>
+            <param name="connector-label" value="LiveLink"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"/>
         </antcall>
     </target>
@@ -1349,7 +1419,8 @@
             <param name="connector-name" value="solr"/>
         </antcall>
         <antcall target="general-add-output-connector">
-            <param name="connector-name" value="Solr"/>
+            <param name="connector-name" value="solr"/>
+            <param name="connector-label" value="Solr"/>
             <param name="connector-class" value="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>
         </antcall>
     </target>
@@ -1379,11 +1450,13 @@
             <param name="connector-name" value="memex"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="Memex Patriarch"/>
+            <param name="connector-name" value="memex"/>
+            <param name="connector-label" value="Memex Patriarch"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.memex.MemexAuthority"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Memex Patriarch"/>
+            <param name="connector-name" value="memex"/>
+            <param name="connector-label" value="Memex Patriarch"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.memex.MemexConnector"/>
         </antcall>
     </target>
@@ -1413,11 +1486,13 @@
             <param name="connector-name" value="meridio"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="Meridio"/>
+            <param name="connector-name" value="meridio"/>
+            <param name="connector-label" value="Meridio"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.meridio.MeridioAuthority"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Meridio"/>
+            <param name="connector-name" value="meridio"/>
+            <param name="connector-label" value="Meridio"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.meridio.MeridioConnector"/>
         </antcall>
     </target>
@@ -1447,7 +1522,8 @@
             <param name="connector-name" value="opensearchserver"/>
         </antcall>
         <antcall target="general-add-output-connector">
-            <param name="connector-name" value="OpenSearchServer"/>
+            <param name="connector-name" value="opensearchserver"/>
+            <param name="connector-label" value="OpenSearchServer"/>
             <param name="connector-class" value="org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"/>
         </antcall>
     </target>
@@ -1477,7 +1553,8 @@
             <param name="connector-name" value="nullauthority"/>
         </antcall>
         <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="Null"/>
+            <param name="connector-name" value="nullauthority"/>
+            <param name="connector-label" value="Null"/>
             <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.nullauthority.NullAuthority"/>
         </antcall>
     </target>
@@ -1507,7 +1584,8 @@
             <param name="connector-name" value="nulloutput"/>
         </antcall>
         <antcall target="general-add-output-connector">
-            <param name="connector-name" value="Null"/>
+            <param name="connector-name" value="nulloutput"/>
+            <param name="connector-label" value="Null"/>
             <param name="connector-class" value="org.apache.manifoldcf.agents.output.nullconnector.NullConnector"/>
         </antcall>
     </target>
@@ -1537,7 +1615,8 @@
             <param name="connector-name" value="rss"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="RSS"/>
+            <param name="connector-name" value="rss"/>
+            <param name="connector-label" value="RSS"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.rss.RSSConnector"/>
         </antcall>
     </target>
@@ -1567,7 +1646,8 @@
             <param name="connector-name" value="sharepoint"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="SharePoint"/>
+            <param name="connector-name" value="sharepoint"/>
+            <param name="connector-label" value="SharePoint"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.sharepoint.SharePointRepository"/>
         </antcall>
     </target>
@@ -1597,7 +1677,8 @@
             <param name="connector-name" value="webcrawler"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Web"/>
+            <param name="connector-name" value="webcrawler"/>
+            <param name="connector-label" value="Web"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"/>
         </antcall>
     </target>
@@ -1627,7 +1708,8 @@
             <param name="connector-name" value="wiki"/>
         </antcall>
         <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="Wiki"/>
+            <param name="connector-name" value="wiki"/>
+            <param name="connector-label" value="Wiki"/>
             <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"/>
         </antcall>
     </target>
@@ -2041,6 +2123,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 +2154,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 +2184,20 @@
           <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/*.jar"/>
+          <exclude name="dist/connectors-proprietary.xml"/>
+          <exclude name="dist/example-proprietary/"/>
+          <exclude name="dist/multiprocess-example-proprietary/"/>
           <exclude name="/apache-manifoldcf-*"/>
         </zipfileset>
       </zip>
@@ -2109,8 +2219,20 @@
           <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/*.jar"/>
+          <exclude name="dist/connectors-proprietary.xml"/>
+          <exclude name="dist/example-proprietary/"/>
+          <exclude name="dist/multiprocess-example-proprietary/"/>
           <exclude name="/apache-manifoldcf-*"/>
         </tarfileset>
       </tar>
@@ -2274,11 +2396,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/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/build.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/build.xml Fri Feb 10 22:58:46 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"/>

Propchange: incubator/lcf/trunk/connectors/alfresco/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1 @@
+alfresco-web-service-client-3.4.e.jar

Propchange: incubator/lcf/trunk/connectors/alfresco/test-materials-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1 @@
+alfresco.war

Modified: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (original)
+++ incubator/lcf/trunk/connectors/connector-build.xml Fri Feb 10 22:58:46 2012
@@ -451,8 +451,8 @@
     </target>
 
     <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,has-RMI-check" if="hasRMI">
-        <mkdir dir="dist/server-process/jar"/>
-        <copy todir="dist/server-process/jar">
+        <mkdir dir="dist/server-process/lib"/>
+        <copy todir="dist/server-process/lib">
             <fileset dir="build/jar">
                 <include name="mcf-${ant.project.name}-connector-server.jar"/>
                 <include name="mcf-${ant.project.name}-connector-interface.jar"/>
@@ -469,8 +469,8 @@
     </target>
 
     <target name="registry-process" depends="jar-registry,has-RMI-check" if="hasRMI">
-        <mkdir dir="dist/registry-process/jar"/>
-        <copy todir="dist/registry-process/jar">
+        <mkdir dir="dist/registry-process/lib"/>
+        <copy todir="dist/registry-process/lib">
             <fileset dir="build/jar">
                 <include name="mcf-${ant.project.name}-connector-registry.jar"/>
                 <include name="mcf-${ant.project.name}-connector-interface.jar"/>

Modified: incubator/lcf/trunk/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/build.xml (original)
+++ incubator/lcf/trunk/connectors/documentum/build.xml Fri Feb 10 22:58:46 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>
@@ -61,10 +61,11 @@
     
     
     <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"/>
+        <mkdir dir="dist/server-process/lib-proprietary"/>
+        <copy todir="dist/server-process/lib-proprietary">
+            <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
+        <copy todir="dist/server-process/lib-proprietary" file="server/README.txt"/>
     </target>
 
 </project>

Propchange: incubator/lcf/trunk/connectors/documentum/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1,3 @@
+dfcbase.jar
+dctm.jar
+dfc.jar

Modified: incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat Fri Feb 10 22:58:46 2012
@@ -21,7 +21,7 @@ rem save existing path here
 set OLDDIR=%CD%
 cd "%MCF_HOME%\..\documentum-registry-process"
 set CLASSPATH=.
-for %%f in (jar/*) do call setclasspath.bat %%f
+for %%f in (lib/*) do call setclasspath.bat %%f
 rem restore old path here
 cd "%OLDDIR%"
 "%JAVA_HOME%\bin\java" -Xmx32m -Xms32m -classpath "%CLASSPATH%" org.apache.manifoldcf.crawler.registry.DCTM.DCTM

Modified: incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh Fri Feb 10 22:58:46 2012
@@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
     
         # Build the classpath
         CLASSPATH=""
-        for filename in $(ls -1 "$MCF_HOME"/../documentum-registry-process/jar) ; do
+        for filename in $(ls -1 "$MCF_HOME"/../documentum-registry-process/lib) ; do
             if [ -n "$CLASSPATH" ] ; then
-                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-registry-process/jar/"$filename"
+                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-registry-process/lib/"$filename"
             else
-                CLASSPATH="$MCF_HOME"/../documentum-registry-process/jar/"$filename"
+                CLASSPATH="$MCF_HOME"/../documentum-registry-process/lib/"$filename"
             fi
         done
         

Modified: incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat Fri Feb 10 22:58:46 2012
@@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF 
 rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-registry-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-registry-process\lib\%1

Modified: incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat Fri Feb 10 22:58:46 2012
@@ -23,7 +23,8 @@ rem save existing path here
 set OLDDIR=%CD%
 cd "%MCF_HOME%\..\documentum-server-process"
 set CLASSPATH=.
-for %%f in (jar/*) do call setclasspath.bat %%f
+for %%f in (lib/*) do call setclasspath.bat %%f lib
+for %%f in (lib-proprietary/*.jar) do call setclasspath.bat %%f lib-proprietary
 rem restore old path here
 cd "%OLDDIR%"
 set LIB_STATEMENT=

Modified: incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh Fri Feb 10 22:58:46 2012
@@ -29,14 +29,22 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
     
             # Build the classpath
             CLASSPATH=""
-            for filename in $(ls -1 "$MCF_HOME"/../documentum-server-process/jar) ; do
+            for filename in $(ls -1 "$MCF_HOME"/../documentum-server-process/lib) ; do
                 if [ -n "$CLASSPATH" ] ; then
-                    CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-server-process/jar/"$filename"
+                    CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-server-process/lib/"$filename"
                 else
-                    CLASSPATH="$MCF_HOME"/../documentum-server-process/jar/"$filename"
+                    CLASSPATH="$MCF_HOME"/../documentum-server-process/lib/"$filename"
                 fi
             done
-            
+
+            for filename in $(ls -1 "$MCF_HOME"/../documentum-server-process/lib-proprietary/*.jar) ; do
+                if [ -n "$CLASSPATH" ] ; then
+                    CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-server-process/lib-proprietary/"$filename"
+                else
+                    CLASSPATH="$MCF_HOME"/../documentum-server-process/lib-proprietary/"$filename"
+                fi
+            done
+
             LIB_STATEMENT=""
             if [[ $JAVA_LIB_PATH != "" ]] ; then
                 LIB_STATEMENT=-Djava.library.path="$JAVA_LIB_PATH"

Modified: incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat Fri Feb 10 22:58:46 2012
@@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF 
 rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-server-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-server-process\%2\%1

Modified: incubator/lcf/trunk/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/build.xml (original)
+++ incubator/lcf/trunk/connectors/filenet/build.xml Fri Feb 10 22:58:46 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>
@@ -48,10 +48,11 @@
     </target>
     
     <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"/>
+        <mkdir dir="dist/server-process/lib-proprietary"/>
+        <copy todir="dist/server-process/lib-proprietary">
+            <fileset dir="lib-proprietary" includes="*.jar"/>
         </copy>
+        <copy todir="dist/server-process/lib-proprietary" file="server/README.txt"/>
     </target>
 
 </project>

Propchange: incubator/lcf/trunk/connectors/filenet/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1 @@
+Jace.jar

Modified: incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat Fri Feb 10 22:58:46 2012
@@ -21,7 +21,7 @@ rem save existing path here
 set OLDDIR=%CD%
 cd "%MCF_HOME%\..\filenet-registry-process"
 set CLASSPATH=.
-for %%f in (jar/*) do call setclasspath.bat %%f
+for %%f in (lib/*) do call setclasspath.bat %%f
 rem restore old path here
 cd "%OLDDIR%"
 "%JAVA_HOME%\bin\java" -Xmx32m -Xms32m -classpath "%CLASSPATH%" org.apache.manifoldcf.crawler.registry.filenet.Filenet

Modified: incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh Fri Feb 10 22:58:46 2012
@@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
     
         # Build the classpath
         CLASSPATH=""
-        for filename in $(ls -1 "$MCF_HOME"/../filenet-registry-process/jar) ; do
+        for filename in $(ls -1 "$MCF_HOME"/../filenet-registry-process/lib) ; do
             if [ -n "$CLASSPATH" ] ; then
-                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-registry-process/jar/"$filename"
+                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-registry-process/lib/"$filename"
             else
-                CLASSPATH="$MCF_HOME"/../filenet-registry-process/jar/"$filename"
+                CLASSPATH="$MCF_HOME"/../filenet-registry-process/lib/"$filename"
             fi
         done
         

Modified: incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat Fri Feb 10 22:58:46 2012
@@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF 
 rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-registry-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-registry-process\lib\%1

Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat Fri Feb 10 22:58:46 2012
@@ -21,7 +21,8 @@ rem save existing path here
 set OLDDIR=%CD%
 cd "%MCF_HOME%\..\filenet-server-process"
 set CLASSPATH=.
-for %%f in (jar/*) do call setclasspath.bat %%f
+for %%f in (lib/*) do call setclasspath.bat %%f lib
+for %%f in (lib-proprietary/*.jar) do call setclasspath.bat %%f lib-proprietary
 rem restore old path here
 cd "%OLDDIR%"
 set WASP_STATEMENT=

Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh Fri Feb 10 22:58:46 2012
@@ -27,14 +27,22 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
     
         # Build the classpath
         CLASSPATH=""
-        for filename in $(ls -1 "$MCF_HOME"/../filenet-server-process/jar) ; do
+        for filename in $(ls -1 "$MCF_HOME"/../filenet-server-process/lib) ; do
             if [ -n "$CLASSPATH" ] ; then
-                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-server-process/jar/"$filename"
+                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-server-process/lib/"$filename"
             else
-                CLASSPATH="$MCF_HOME"/../filenet-server-process/jar/"$filename"
+                CLASSPATH="$MCF_HOME"/../filenet-server-process/lib/"$filename"
             fi
         done
-        
+
+        for filename in $(ls -1 "$MCF_HOME"/../filenet-server-process/lib-proprietary/*.jar) ; do
+            if [ -n "$CLASSPATH" ] ; then
+                CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-server-process/lib-proprietary/"$filename"
+            else
+                CLASSPATH="$MCF_HOME"/../filenet-server-process/lib-proprietary/"$filename"
+            fi
+        done
+
         WASP_STATEMENT=""
         if [[ $WASP_HOME != "" ]] ; then
             WASP_STATEMENT=-Dwasp.location="WASP_HOME"

Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat Fri Feb 10 22:58:46 2012
@@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF 
 rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-server-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-server-process\%2\%1

Modified: incubator/lcf/trunk/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jcifs/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/connectors/jcifs/build.xml Fri Feb 10 22:58:46 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"/>

Propchange: incubator/lcf/trunk/connectors/jcifs/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1 @@
+jcifs.jar

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=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt (original)
+++ incubator/lcf/trunk/connectors/jdbc/jdbc-drivers/README.txt Fri Feb 10 22:58:46 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/trunk/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/build.xml (original)
+++ incubator/lcf/trunk/connectors/livelink/build.xml Fri Feb 10 22:58:46 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>
 

Propchange: incubator/lcf/trunk/connectors/livelink/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1 @@
+lapi.jar

Modified: incubator/lcf/trunk/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/connectors/meridio/build.xml Fri Feb 10 22:58:46 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,11 +42,11 @@
 
     <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/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="wsdls/MetaCartaWS_axis.wsdl"/>
     </target>
     

Propchange: incubator/lcf/trunk/connectors/meridio/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1,5 @@
+MeridioDMWS_axis.wsdl
+RMDataSet_castor.xsd
+MeridioRMWS_axis.wsdl
+RMClassificationDataSet_castor.xsd
+DMDataSet_castor.xsd

Modified: incubator/lcf/trunk/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/connectors/sharepoint/build.xml Fri Feb 10 22:58:46 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>
 

Propchange: incubator/lcf/trunk/connectors/sharepoint/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1,6 @@
+versions.wsdl
+usergroup.wsdl
+Permissions.wsdl
+Lists.wsdl
+webs.wsdl
+DspSts.wsdl



Mime
View raw message