Return-Path: 
 <connectors-commits-return-2367-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6051B96C0
	for <apmail-incubator-connectors-commits-archive@minotaur.apache.org>;
 Thu,  9 Feb 2012 05:21:59 +0000 (UTC)
Received: (qmail 43228 invoked by uid 500); 9 Feb 2012 05:21:58 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 43130 invoked by uid 500); 9 Feb 2012 05:21:47 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 43118 invoked by uid 99); 9 Feb 2012 05:21:42 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Feb 2012 05:21:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Feb 2012 05:21:38 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9F2F42388865;
	Thu,  9 Feb 2012 05:21:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1242218 - in /incubator/lcf/branches/CONNECTORS-402: ./
 connectors/ framework/ framework/example-multiprocess-common/
 framework/example-multiprocess-proprietary/ framework/example-multiprocess/
 framework/example-singleprocess-common/ frame...
Date: Thu, 09 Feb 2012 05:21:18 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120209052118.9F2F42388865@eris.apache.org>

Author: kwright
Date: Thu Feb  9 05:21:17 2012
New Revision: 1242218

URL: http://svn.apache.org/viewvc?rev=1242218&view=rev
Log:
First attempt at providing a dual build, one with proprietary artifacts, the other without, in the same ant target.

Added:
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-common/
      - copied from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/properties.xml
      - copied, changed from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml
      - copied unchanged from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-common/
      - copied from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/properties.xml
      - copied, changed from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml
      - copied unchanged from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml
Removed:
    incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-common/properties.xml
    incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-common/properties.xml
Modified:
    incubator/lcf/branches/CONNECTORS-402/build.xml
    incubator/lcf/branches/CONNECTORS-402/connectors/connector-build.xml
    incubator/lcf/branches/CONNECTORS-402/framework/build.xml

Modified: incubator/lcf/branches/CONNECTORS-402/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/build.xml?rev=1242218&r1=1242217&r2=1242218&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/build.xml Thu Feb  9 05:21:17 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,6 +947,7 @@
         <copy todir="dist">
             <fileset dir="framework/dist">
                 <include name="connectors.xml"/>
+                <include name="connectors-proprietary.xml"/>
             </fileset>
         </copy>
     </target>
@@ -978,16 +992,23 @@
         </copy>
     </target>
 
-    <target name="general-connector-delivery" depends="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"/>
-        </copy>
+    <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"/>
+        </copy>
+    </target>
 
     <target name="general-connector-doc-check">
         <available file="connectors/${connector-name}/dist/doc" type="dir" property="${connector-name}.has-doc"/>
@@ -1000,16 +1021,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">
@@ -1031,7 +1076,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>
@@ -1071,7 +1117,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>
@@ -1101,11 +1148,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>
@@ -1135,11 +1184,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>
@@ -1169,7 +1220,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>
@@ -1199,7 +1251,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>
@@ -1229,7 +1282,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>
@@ -1259,7 +1313,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>
@@ -1289,7 +1344,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>
@@ -1319,11 +1375,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>
@@ -1353,7 +1411,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>
@@ -1383,11 +1442,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>
@@ -1417,11 +1478,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>
@@ -1451,7 +1514,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>
@@ -1481,7 +1545,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>
@@ -1511,7 +1576,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>
@@ -1541,7 +1607,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>
@@ -1571,7 +1638,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>
@@ -1601,7 +1669,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>
@@ -1631,7 +1700,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>

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

Modified: incubator/lcf/branches/CONNECTORS-402/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/build.xml?rev=1242218&r1=1242217&r2=1242218&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/build.xml Thu Feb  9 05:21:17 2012
@@ -286,20 +286,58 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
+        </copy>
+        <copy todir="build/webapp/authority-service/WEB-INF/lib">
+            <fileset dir="build/jar">
+                <include name="mcf-core.jar"/>
+                <include name="mcf-agents.jar"/>
+                <include name="mcf-pull-agent.jar"/>
+            </fileset>
+        </copy>
+        <jar destfile="build/webapp/authority-service/WEB-INF/lib/mcf-authority-servlet.jar" basedir="build/authority-servlet/classes"/>
+    </target>
+
+    <target name="webapp-authority-service-proprietary" depends="jar-core,jar-agents,jar-pull-agent,compile-authority-servlet">
+        <mkdir dir="build/webapp/authority-service-proprietary/WEB-INF/lib"/>
+        <copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
+            <fileset dir="../build/jar">
+                <include name="json.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="commons-codec*.jar"/>
+                <include name="commons-collections*.jar"/>
+                <include name="commons-el*.jar"/>
+                <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
+                <include name="commons-logging*.jar"/>
+                <include name="jdbcpool-0.99.jar"/>
+                <include name="log4j*.jar"/>
+                <include name="serializer*.jar"/>
+                <include name="xalan*.jar"/>
+                <include name="xercesImpl-mcf.jar"/>
+                <include name="xml-apis*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+                <include name="hsqldb*.jar"/>
+            </fileset>
             <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>
             </fileset>
         </copy>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib">
+        <copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
                 <include name="mcf-agents.jar"/>
                 <include name="mcf-pull-agent.jar"/>
             </fileset>
         </copy>
-        <jar destfile="build/webapp/authority-service/WEB-INF/lib/mcf-authority-servlet.jar" basedir="build/authority-servlet/classes"/>
+        <jar destfile="build/webapp/authority-service-proprietary/WEB-INF/lib/mcf-authority-servlet.jar" basedir="build/authority-servlet/classes"/>
     </target>
 
     <target name="webapp-api-service" depends="jar-core,jar-ui-core,jar-agents,jar-pull-agent,compile-api-servlet">
@@ -329,13 +367,52 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
+        </copy>
+        <copy todir="build/webapp/api-service/WEB-INF/lib">
+            <fileset dir="build/jar">
+                <include name="mcf-core.jar"/>
+                <include name="mcf-ui-core.jar"/>
+                <include name="mcf-agents.jar"/>
+                <include name="mcf-pull-agent.jar"/>
+            </fileset>
+        </copy>
+        <jar destfile="build/webapp/api-service/WEB-INF/lib/mcf-api-servlet.jar" basedir="build/api-servlet/classes"/>
+    </target>
+
+    <target name="webapp-api-service-proprietary" depends="jar-core,jar-ui-core,jar-agents,jar-pull-agent,compile-api-servlet">
+        <mkdir dir="build/webapp/api-service-proprietary/WEB-INF/lib"/>
+        <copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
+            <fileset dir="../build/jar">
+                <include name="json.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="commons-codec*.jar"/>
+                <include name="commons-collections*.jar"/>
+                <include name="commons-el*.jar"/>
+                <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
+                <include name="commons-logging*.jar"/>
+                <include name="jdbcpool-0.99.jar"/>
+                <include name="log4j*.jar"/>
+                <include name="serializer*.jar"/>
+                <include name="xalan*.jar"/>
+                <include name="xercesImpl-mcf.jar"/>
+                <include name="xml-apis*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+                <include name="hsqldb*.jar"/>
+            </fileset>
             <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
                 <include name="jtds*.jar"/>
             </fileset>
         </copy>
-        <copy todir="build/webapp/api-service/WEB-INF/lib">
+        <copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
                 <include name="mcf-ui-core.jar"/>
@@ -343,7 +420,7 @@
                 <include name="mcf-pull-agent.jar"/>
             </fileset>
         </copy>
-        <jar destfile="build/webapp/api-service/WEB-INF/lib/mcf-api-servlet.jar" basedir="build/api-servlet/classes"/>
+        <jar destfile="build/webapp/api-service-proprietary/WEB-INF/lib/mcf-api-servlet.jar" basedir="build/api-servlet/classes"/>
     </target>
 
     <target name="webapp-crawler-ui" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
@@ -377,11 +454,6 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
-            <fileset dir="../lib-proprietary">
-                <include name="mysql*.jar"/>
-                <include name="ojdbc*.jar"/>
-                <include name="jtds*.jar"/>
-            </fileset>
         </copy>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="build/jar">
@@ -401,13 +473,66 @@
             <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
         </copy>
     </target>
-    
-    <target name="example-common">
-        <copy todir="dist">
-            <fileset dir="example-common">
-                <include name="connectors.xml"/>
+  
+      <target name="webapp-crawler-ui-proprietary" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
+        <mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
+        <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
+            <fileset dir="crawler-ui/src/main/webapp/WEB-INF/lib">
+                <include name="*.jar"/>
+            </fileset>
+            <fileset dir="../build/jar">
+                <include name="json.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="commons-codec*.jar"/>
+                <include name="commons-collections*.jar"/>
+                <include name="commons-el*.jar"/>
+                <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
+                <include name="commons-logging*.jar"/>
+                <include name="jdbcpool-0.99.jar"/>
+                <include name="log4j*.jar"/>
+                <include name="serializer*.jar"/>
+                <include name="xalan*.jar"/>
+                <include name="xercesImpl-mcf.jar"/>
+                <include name="xml-apis*.jar"/>
+                <include name="velocity*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+                <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
+                <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
+            </fileset>
+        </copy>
+        <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
+            <fileset dir="build/jar">
+                <include name="mcf-core.jar"/>
+                <include name="mcf-agents.jar"/>
+                <include name="mcf-pull-agent.jar"/>
+                <include name="mcf-ui-core.jar"/>
             </fileset>
         </copy>
+        <mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/jsp"/>
+        <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/jsp">
+            <fileset dir="crawler-ui/src/main/webapp/WEB-INF/jsp">
+                <include name="*.tld"/>
+            </fileset>
+        </copy>
+        <copy todir="build/webapp/crawler-ui-proprietary">
+            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+        </copy>
+    </target>
+
+    <target name="example-common">
+        <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
+        <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
     </target>
     
     <target name="war-authority-service" depends="webapp-authority-service">
@@ -415,23 +540,45 @@
         <war destfile="build/war/mcf-authority-service.war" webxml="authority-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/authority-service"/>
     </target>
 
+    <target name="war-authority-service-proprietary" depends="webapp-authority-service-proprietary">
+        <mkdir dir="build/war-proprietary"/>
+        <war destfile="build/war-proprietary/mcf-authority-service.war" webxml="authority-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/authority-service-proprietary"/>
+    </target>
+
     <target name="war-api-service" depends="webapp-api-service">
         <mkdir dir="build/war"/>
         <war destfile="build/war/mcf-api-service.war" webxml="api-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/api-service"/>
     </target>
 
+    <target name="war-api-service-proprietary" depends="webapp-api-service-proprietary">
+        <mkdir dir="build/war-proprietary"/>
+        <war destfile="build/war-proprietary/mcf-api-service.war" webxml="api-service/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/api-service-proprietary"/>
+    </target>
+
     <target name="war-crawler-ui" depends="webapp-crawler-ui">
         <mkdir dir="build/war"/>
         <war destfile="build/war/mcf-crawler-ui.war" webxml="crawler-ui/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/crawler-ui"/>
     </target>
 
+    <target name="war-crawler-ui-proprietary" depends="webapp-crawler-ui-proprietary">
+        <mkdir dir="build/war-proprietary"/>
+        <war destfile="build/war-proprietary/mcf-crawler-ui.war" webxml="crawler-ui/src/main/webapp/WEB-INF/web.xml" basedir="build/webapp/crawler-ui-proprietary"/>
+    </target>
+
     <target name="multi-wars" depends="war-authority-service,war-api-service,war-crawler-ui">
         <mkdir dir="dist/multiprocess-example/web/war"/>
         <copy todir="dist/multiprocess-example/web/war">
             <fileset dir="build/war"/>
         </copy>
     </target>
-    
+
+    <target name="multi-wars-proprietary" depends="war-authority-service-proprietary,war-api-service-proprietary,war-crawler-ui-proprietary">
+        <mkdir dir="dist/multiprocess-example-proprietary/web/war"/>
+        <copy todir="dist/multiprocess-example-proprietary/web/war">
+            <fileset dir="build/war-proprietary"/>
+        </copy>
+    </target>
+
     <target name="multi-processes" depends="jar-core,jar-agents,jar-pull-agent">
         <mkdir dir="dist/multiprocess-example/processes/jar"/>
         <copy todir="dist/multiprocess-example/processes/jar">
@@ -461,6 +608,48 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
+            <fileset dir="build/jar">
+                <include name="mcf-core.jar"/>
+                <include name="mcf-agents.jar"/>
+                <include name="mcf-pull-agent.jar"/>
+            </fileset>
+        </copy>
+        <mkdir dir="dist/multiprocess-example/processes/script"/>
+        <copy todir="dist/multiprocess-example/processes/script">
+            <fileset dir="scripts"/>
+        </copy>
+        <mkdir dir="dist/multiprocess-example/syncharea"/>
+    </target>
+
+    <target name="multi-processes-proprietary" depends="jar-core,jar-agents,jar-pull-agent">
+        <mkdir dir="dist/multiprocess-example-proprietary/processes/jar"/>
+        <copy todir="dist/multiprocess-example-proprietary/processes/jar">
+            <fileset dir="../build/jar">
+                <include name="json.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="commons-codec*.jar"/>
+                <include name="commons-collections*.jar"/>
+                <include name="commons-el*.jar"/>
+                <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
+                <include name="commons-logging*.jar"/>
+                <include name="jdbcpool-0.99.jar"/>
+                <include name="log4j*.jar"/>
+                <include name="serializer*.jar"/>
+                <include name="servlet-api*.jar"/>
+                <include name="xalan*.jar"/>
+                <include name="xercesImpl-mcf.jar"/>
+                <include name="xml-apis*.jar"/>
+                <include name="velocity*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+                <include name="hsqldb*.jar"/>
+            </fileset>
             <fileset dir="../lib-proprietary">
                 <include name="mysql*.jar"/>
                 <include name="ojdbc*.jar"/>
@@ -472,22 +661,24 @@
                 <include name="mcf-pull-agent.jar"/>
             </fileset>
         </copy>
-        <mkdir dir="dist/multiprocess-example/processes/script"/>
-        <copy todir="dist/multiprocess-example/processes/script">
+        <mkdir dir="dist/multiprocess-example-proprietary/processes/script"/>
+        <copy todir="dist/multiprocess-example-proprietary/processes/script">
             <fileset dir="scripts"/>
         </copy>
-        <mkdir dir="dist/multiprocess-example/syncharea"/>
+        <mkdir dir="dist/multiprocess-example-proprietary/syncharea"/>
     </target>
 
     <target name="multi-process-example" depends="jar-multiprocess-jetty-runner,multi-wars,multi-processes">
         <mkdir dir="dist/multiprocess-example"/>
         <copy todir="dist/multiprocess-example">
-            <fileset dir="example-multiprocess">
-                <include name="properties.xml"/>
+            <fileset dir="example-multiprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
             </fileset>
+            <fileset dir="example-multiprocess">
+                <include name="properties.xml"/>
+            </fileset>
         </copy>
         <mkdir dir="dist/multiprocess-example/lib"/>
         <copy todir="dist/multiprocess-example/lib">
@@ -505,7 +696,36 @@
         </copy>
         <mkdir dir="dist/multiprocess-example/logs"/>
     </target>
-    
+  
+      <target name="multi-process-example-proprietary" depends="jar-multiprocess-jetty-runner,multi-wars-proprietary,multi-processes-proprietary">
+        <mkdir dir="dist/multiprocess-example-proprietary"/>
+        <copy todir="dist/multiprocess-example-proprietary">
+            <fileset dir="example-multiprocess-common">
+                <include name="logging.ini"/>
+                <include name="*.sh"/>
+                <include name="*.bat"/>
+            </fileset>
+            <fileset dir="example-multiprocess-proprietary">
+                <include name="properties.xml"/>
+            </fileset>
+        </copy>
+        <mkdir dir="dist/multiprocess-example-proprietary/lib"/>
+        <copy todir="dist/multiprocess-example-proprietary/lib">
+            <fileset dir="build/jar">
+                <include name="mcf-multiprocess-jetty-runner.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="jetty*.jar"/>
+                <include name="servlet-api*.jar"/>
+                <include name="eclipse*.jar"/>
+                <include name="jasper*.jar"/>
+                <include name="tomcat-juli*.jar"/>
+                <include name="jsp-api*.jar"/>
+            </fileset>
+        </copy>
+        <mkdir dir="dist/multiprocess-example-proprietary/logs"/>
+    </target>
+
     <target name="script-engine" depends="jar-script-engine,jar-core">
         <mkdir dir="dist/script-engine/jar"/>
         <copy todir="dist/script-engine/jar">
@@ -568,11 +788,6 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
-            <fileset dir="../lib-proprietary">
-                <include name="mysql*.jar"/>
-                <include name="ojdbc*.jar"/>
-                <include name="jtds*.jar"/>
-            </fileset>
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
                 <include name="mcf-ui-core.jar"/>
@@ -587,80 +802,209 @@
         </copy>
         <mkdir dir="dist/example/logs"/>
         <copy todir="dist/example">
-            <fileset dir="example-singleprocess">
-                <include name="properties.xml"/>
+            <fileset dir="example-singleprocess-common">
                 <include name="logging.ini"/>
                 <include name="*.sh"/>
                 <include name="*.bat"/>
             </fileset>
+            <fileset dir="example-singleprocess">
+                <include name="properties.xml"/>
+            </fileset>
         </copy>
         
         <!-- Build a manifest file.  There doesn't seem to be any good way to do this automatically in ant without developing my own
         custom task, so I've hard coded all the class path libs. -->
-        <property name="manifest-classpath-0" value=""/>
+        <property name="manifest-cp-0" value=""/>
         
-        <property name="manifest-classpath-1" value="${manifest-classpath-0} lib/commons-lang.jar"/>
-        <property name="manifest-classpath-2" value="${manifest-classpath-1} lib/commons-codec.jar"/>
-        <property name="manifest-classpath-3" value="${manifest-classpath-2} lib/commons-collections.jar"/>
-        <property name="manifest-classpath-4" value="${manifest-classpath-3} lib/commons-el.jar"/>
-        <property name="manifest-classpath-5" value="${manifest-classpath-4} lib/commons-fileupload.jar"/>
-        <property name="manifest-classpath-6" value="${manifest-classpath-5} lib/commons-httpclient-mcf.jar"/>
-        <property name="manifest-classpath-7" value="${manifest-classpath-6} lib/commons-io.jar"/>
-        <property name="manifest-classpath-8" value="${manifest-classpath-7} lib/commons-logging.jar"/>
-        <property name="manifest-classpath-9" value="${manifest-classpath-8} lib/hsqldb.jar"/>
-        <property name="manifest-classpath-10" value="${manifest-classpath-9} lib/derbyclient.jar"/>
-        <property name="manifest-classpath-11" value="${manifest-classpath-10} lib/derby.jar"/>
-        <property name="manifest-classpath-12" value="${manifest-classpath-11} lib/derbyLocale_cs.jar"/>
-        <property name="manifest-classpath-13" value="${manifest-classpath-12} lib/derbyLocale_de_DE.jar"/>
-        <property name="manifest-classpath-14" value="${manifest-classpath-13} lib/derbyLocale_es.jar"/>
-        <property name="manifest-classpath-15" value="${manifest-classpath-14} lib/derbyLocale_fr.jar"/>
-        <property name="manifest-classpath-16" value="${manifest-classpath-15} lib/derbyLocale_hu.jar"/>
-        <property name="manifest-classpath-17" value="${manifest-classpath-16} lib/derbyLocale_it.jar"/>
-        <property name="manifest-classpath-18" value="${manifest-classpath-17} lib/derbyLocale_ja_JP"/>
-        <property name="manifest-classpath-19" value="${manifest-classpath-18} lib/derbyLocale_ko_KR.jar"/>
-        <property name="manifest-classpath-20" value="${manifest-classpath-19} lib/derbyLocale_pl.jar"/>
-        <property name="manifest-classpath-21" value="${manifest-classpath-20} lib/derbyLocale_pt_BR.jar"/>
-        <property name="manifest-classpath-22" value="${manifest-classpath-21} lib/derbyLocale_ru.jar"/>
-        <property name="manifest-classpath-23" value="${manifest-classpath-22} lib/derbyLocale_zh_CN.jar"/>
-        <property name="manifest-classpath-24" value="${manifest-classpath-23} lib/derbyLocale_zh_TW.jar"/>
-        <property name="manifest-classpath-25" value="${manifest-classpath-24} lib/derbyrun.jar"/>
-        <property name="manifest-classpath-26" value="${manifest-classpath-25} lib/derbytools.jar"/>
-        <property name="manifest-classpath-27" value="${manifest-classpath-26} lib/jasper-6.0.24.jar"/>
-        <property name="manifest-classpath-28" value="${manifest-classpath-27} lib/jasper-el-6.0.24.jar"/>
-        <property name="manifest-classpath-29" value="${manifest-classpath-28} lib/jdbcpool-0.99.jar"/>
-        <property name="manifest-classpath-30" value="${manifest-classpath-29} lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
-        <property name="manifest-classpath-31" value="${manifest-classpath-30} lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
-        <property name="manifest-classpath-32" value="${manifest-classpath-31} lib/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
-        <property name="manifest-classpath-33" value="${manifest-classpath-32} lib/json.jar"/>
-        <property name="manifest-classpath-34" value="${manifest-classpath-33} lib/mcf-core.jar"/>
-        <property name="manifest-classpath-35" value="${manifest-classpath-34} lib/mcf-agents.jar"/>
-        <property name="manifest-classpath-36" value="${manifest-classpath-35} lib/mcf-jetty-runner.jar"/>
-        <property name="manifest-classpath-37" value="${manifest-classpath-36} lib/mcf-pull-agent.jar"/>
-        <property name="manifest-classpath-38" value="${manifest-classpath-37} lib/mcf-ui-core.jar"/>
-        <property name="manifest-classpath-39" value="${manifest-classpath-38} lib/log4j-1.2.jar"/>
-        <property name="manifest-classpath-40" value="${manifest-classpath-39} lib/postgresql.jar"/>
-        <property name="manifest-classpath-41" value="${manifest-classpath-40} lib/mysql-connector-java.jar"/>
-        <property name="manifest-classpath-42" value="${manifest-classpath-41} lib/serializer.jar"/>
-        <property name="manifest-classpath-43" value="${manifest-classpath-42} lib/servlet-api-2.5-20081211.jar"/>
-        <property name="manifest-classpath-44" value="${manifest-classpath-43} lib/tomcat-juli-6.0.24.jar"/>
-        <property name="manifest-classpath-45" value="${manifest-classpath-44} lib/xalan2.jar"/>
-        <property name="manifest-classpath-46" value="${manifest-classpath-45} lib/xercesImpl-mcf.jar"/>
-        <property name="manifest-classpath-47" value="${manifest-classpath-46} lib/xml-apis.jar"/>
-        <property name="manifest-classpath-48" value="${manifest-classpath-47} lib/derbynet.jar"/>
-        <property name="manifest-classpath-49" value="${manifest-classpath-48} lib/eclipse-ecj.jar"/>
-        <property name="manifest-classpath-50" value="${manifest-classpath-49} lib/ojdbc.jar"/>
-        <property name="manifest-classpath-51" value="${manifest-classpath-50} lib/jtds.jar"/>
-        <property name="manifest-classpath-52" value="${manifest-classpath-51} lib/velocity-1.7.jar"/>
-        <property name="manifest-classpath" value="${manifest-classpath-52}"/>
+        <property name="manifest-cp-1" value="${manifest-cp-0} lib/commons-lang.jar"/>
+        <property name="manifest-cp-2" value="${manifest-cp-1} lib/commons-codec.jar"/>
+        <property name="manifest-cp-3" value="${manifest-cp-2} lib/commons-collections.jar"/>
+        <property name="manifest-cp-4" value="${manifest-cp-3} lib/commons-el.jar"/>
+        <property name="manifest-cp-5" value="${manifest-cp-4} lib/commons-fileupload.jar"/>
+        <property name="manifest-cp-6" value="${manifest-cp-5} lib/commons-httpclient-mcf.jar"/>
+        <property name="manifest-cp-7" value="${manifest-cp-6} lib/commons-io.jar"/>
+        <property name="manifest-cp-8" value="${manifest-cp-7} lib/commons-logging.jar"/>
+        <property name="manifest-cp-9" value="${manifest-cp-8} lib/hsqldb.jar"/>
+        <property name="manifest-cp-10" value="${manifest-cp-9} lib/derbyclient.jar"/>
+        <property name="manifest-cp-11" value="${manifest-cp-10} lib/derby.jar"/>
+        <property name="manifest-cp-12" value="${manifest-cp-11} lib/derbyLocale_cs.jar"/>
+        <property name="manifest-cp-13" value="${manifest-cp-12} lib/derbyLocale_de_DE.jar"/>
+        <property name="manifest-cp-14" value="${manifest-cp-13} lib/derbyLocale_es.jar"/>
+        <property name="manifest-cp-15" value="${manifest-cp-14} lib/derbyLocale_fr.jar"/>
+        <property name="manifest-cp-16" value="${manifest-cp-15} lib/derbyLocale_hu.jar"/>
+        <property name="manifest-cp-17" value="${manifest-cp-16} lib/derbyLocale_it.jar"/>
+        <property name="manifest-cp-18" value="${manifest-cp-17} lib/derbyLocale_ja_JP"/>
+        <property name="manifest-cp-19" value="${manifest-cp-18} lib/derbyLocale_ko_KR.jar"/>
+        <property name="manifest-cp-20" value="${manifest-cp-19} lib/derbyLocale_pl.jar"/>
+        <property name="manifest-cp-21" value="${manifest-cp-20} lib/derbyLocale_pt_BR.jar"/>
+        <property name="manifest-cp-22" value="${manifest-cp-21} lib/derbyLocale_ru.jar"/>
+        <property name="manifest-cp-23" value="${manifest-cp-22} lib/derbyLocale_zh_CN.jar"/>
+        <property name="manifest-cp-24" value="${manifest-cp-23} lib/derbyLocale_zh_TW.jar"/>
+        <property name="manifest-cp-25" value="${manifest-cp-24} lib/derbyrun.jar"/>
+        <property name="manifest-cp-26" value="${manifest-cp-25} lib/derbytools.jar"/>
+        <property name="manifest-cp-27" value="${manifest-cp-26} lib/jasper-6.0.24.jar"/>
+        <property name="manifest-cp-28" value="${manifest-cp-27} lib/jasper-el-6.0.24.jar"/>
+        <property name="manifest-cp-29" value="${manifest-cp-28} lib/jdbcpool-0.99.jar"/>
+        <property name="manifest-cp-30" value="${manifest-cp-29} lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
+        <property name="manifest-cp-31" value="${manifest-cp-30} lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
+        <property name="manifest-cp-32" value="${manifest-cp-31} lib/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
+        <property name="manifest-cp-33" value="${manifest-cp-32} lib/json.jar"/>
+        <property name="manifest-cp-34" value="${manifest-cp-33} lib/mcf-core.jar"/>
+        <property name="manifest-cp-35" value="${manifest-cp-34} lib/mcf-agents.jar"/>
+        <property name="manifest-cp-36" value="${manifest-cp-35} lib/mcf-jetty-runner.jar"/>
+        <property name="manifest-cp-37" value="${manifest-cp-36} lib/mcf-pull-agent.jar"/>
+        <property name="manifest-cp-38" value="${manifest-cp-37} lib/mcf-ui-core.jar"/>
+        <property name="manifest-cp-39" value="${manifest-cp-38} lib/log4j-1.2.jar"/>
+        <property name="manifest-cp-40" value="${manifest-cp-39} lib/postgresql.jar"/>
+        <property name="manifest-cp-42" value="${manifest-cp-39} lib/serializer.jar"/>
+        <property name="manifest-cp-43" value="${manifest-cp-42} lib/servlet-api-2.5-20081211.jar"/>
+        <property name="manifest-cp-44" value="${manifest-cp-43} lib/tomcat-juli-6.0.24.jar"/>
+        <property name="manifest-cp-45" value="${manifest-cp-44} lib/xalan2.jar"/>
+        <property name="manifest-cp-46" value="${manifest-cp-45} lib/xercesImpl-mcf.jar"/>
+        <property name="manifest-cp-47" value="${manifest-cp-46} lib/xml-apis.jar"/>
+        <property name="manifest-cp-48" value="${manifest-cp-47} lib/derbynet.jar"/>
+        <property name="manifest-cp-49" value="${manifest-cp-48} lib/eclipse-ecj.jar"/>
+        <property name="manifest-cp-52" value="${manifest-cp-49} lib/velocity-1.7.jar"/>
+        <property name="manifest-cp" value="${manifest-cp-52}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
-            <attribute name="Class-Path" value="${manifest-classpath}"/>
+            <attribute name="Class-Path" value="${manifest-cp}"/>
         </manifest>
         <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
 
     </target>
 
+    <target name="single-process-example-proprietary" depends="war-crawler-ui-proprietary,war-api-service-proprietary,war-authority-service-proprietary,jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
+        <mkdir dir="dist/example-proprietary/lib"/>
+        <copy todir="dist/example-proprietary/lib">
+            <fileset dir="../build/jar">
+                <include name="json.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="commons-codec*.jar"/>
+                <include name="commons-collections*.jar"/>
+                <include name="commons-el*.jar"/>
+                <include name="commons-fileupload*.jar"/>
+                <include name="commons-httpclient-mcf.jar"/>
+                <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
+                <include name="commons-logging*.jar"/>
+                <include name="eclipse*.jar"/>
+                <include name="jasper*.jar"/>
+                <include name="jdbcpool-0.99.jar"/>
+                <include name="jetty*.jar"/>
+                <include name="jsp-api*.jar"/>
+                <include name="jsp-2.5*.jar"/>
+                <include name="log4j*.jar"/>
+                <include name="serializer*.jar"/>
+                <include name="servlet-api*.jar"/>
+                <include name="tomcat-juli*.jar"/>
+                <include name="xalan*.jar"/>
+                <include name="xercesImpl-mcf.jar"/>
+                <include name="xml-apis*.jar"/>
+                <include name="velocity*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+                <include name="hsqldb*.jar"/>
+            </fileset>
+            <fileset dir="../lib-proprietary">
+                <include name="mysql*.jar"/>
+                <include name="ojdbc*.jar"/>
+                <include name="jtds*.jar"/>
+            </fileset>
+            <fileset dir="build/jar">
+                <include name="mcf-core.jar"/>
+                <include name="mcf-ui-core.jar"/>
+                <include name="mcf-agents.jar"/>
+                <include name="mcf-pull-agent.jar"/>
+                <include name="mcf-jetty-runner.jar"/>
+            </fileset>
+        </copy>
+        <mkdir dir="dist/example-proprietary/war"/>
+        <copy todir="dist/example-proprietary/war">
+            <fileset dir="build/war-proprietary"/>
+        </copy>
+        <mkdir dir="dist/example-proprietary/logs"/>
+        <copy todir="dist/example-proprietary">
+            <fileset dir="example-singleprocess-common">
+                <include name="logging.ini"/>
+                <include name="*.sh"/>
+                <include name="*.bat"/>
+            </fileset>
+            <fileset dir="example-singleprocess-proprietary">
+                <include name="properties.xml"/>
+            </fileset>
+        </copy>
+        
+        <!-- Build a manifest file.  There doesn't seem to be any good way to do this automatically in ant without developing my own
+        custom task, so I've hard coded all the class path libs. -->
+        <property name="manifest-cp-proprietary-0" value=""/>
+        
+        <property name="manifest-cp-proprietary-1" value="${manifest-cp-proprietary-0} lib/commons-lang.jar"/>
+        <property name="manifest-cp-proprietary-2" value="${manifest-cp-proprietary-1} lib/commons-codec.jar"/>
+        <property name="manifest-cp-proprietary-3" value="${manifest-cp-proprietary-2} lib/commons-collections.jar"/>
+        <property name="manifest-cp-proprietary-4" value="${manifest-cp-proprietary-3} lib/commons-el.jar"/>
+        <property name="manifest-cp-proprietary-5" value="${manifest-cp-proprietary-4} lib/commons-fileupload.jar"/>
+        <property name="manifest-cp-proprietary-6" value="${manifest-cp-proprietary-5} lib/commons-httpclient-mcf.jar"/>
+        <property name="manifest-cp-proprietary-7" value="${manifest-cp-proprietary-6} lib/commons-io.jar"/>
+        <property name="manifest-cp-proprietary-8" value="${manifest-cp-proprietary-7} lib/commons-logging.jar"/>
+        <property name="manifest-cp-proprietary-9" value="${manifest-cp-proprietary-8} lib/hsqldb.jar"/>
+        <property name="manifest-cp-proprietary-10" value="${manifest-cp-proprietary-9} lib/derbyclient.jar"/>
+        <property name="manifest-cp-proprietary-11" value="${manifest-cp-proprietary-10} lib/derby.jar"/>
+        <property name="manifest-cp-proprietary-12" value="${manifest-cp-proprietary-11} lib/derbyLocale_cs.jar"/>
+        <property name="manifest-cp-proprietary-13" value="${manifest-cp-proprietary-12} lib/derbyLocale_de_DE.jar"/>
+        <property name="manifest-cp-proprietary-14" value="${manifest-cp-proprietary-13} lib/derbyLocale_es.jar"/>
+        <property name="manifest-cp-proprietary-15" value="${manifest-cp-proprietary-14} lib/derbyLocale_fr.jar"/>
+        <property name="manifest-cp-proprietary-16" value="${manifest-cp-proprietary-15} lib/derbyLocale_hu.jar"/>
+        <property name="manifest-cp-proprietary-17" value="${manifest-cp-proprietary-16} lib/derbyLocale_it.jar"/>
+        <property name="manifest-cp-proprietary-18" value="${manifest-cp-proprietary-17} lib/derbyLocale_ja_JP"/>
+        <property name="manifest-cp-proprietary-19" value="${manifest-cp-proprietary-18} lib/derbyLocale_ko_KR.jar"/>
+        <property name="manifest-cp-proprietary-20" value="${manifest-cp-proprietary-19} lib/derbyLocale_pl.jar"/>
+        <property name="manifest-cp-proprietary-21" value="${manifest-cp-proprietary-20} lib/derbyLocale_pt_BR.jar"/>
+        <property name="manifest-cp-proprietary-22" value="${manifest-cp-proprietary-21} lib/derbyLocale_ru.jar"/>
+        <property name="manifest-cp-proprietary-23" value="${manifest-cp-proprietary-22} lib/derbyLocale_zh_CN.jar"/>
+        <property name="manifest-cp-proprietary-24" value="${manifest-cp-proprietary-23} lib/derbyLocale_zh_TW.jar"/>
+        <property name="manifest-cp-proprietary-25" value="${manifest-cp-proprietary-24} lib/derbyrun.jar"/>
+        <property name="manifest-cp-proprietary-26" value="${manifest-cp-proprietary-25} lib/derbytools.jar"/>
+        <property name="manifest-cp-proprietary-27" value="${manifest-cp-proprietary-26} lib/jasper-6.0.24.jar"/>
+        <property name="manifest-cp-proprietary-28" value="${manifest-cp-proprietary-27} lib/jasper-el-6.0.24.jar"/>
+        <property name="manifest-cp-proprietary-29" value="${manifest-cp-proprietary-28} lib/jdbcpool-0.99.jar"/>
+        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-29} lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
+        <property name="manifest-cp-proprietary-31" value="${manifest-cp-proprietary-30} lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
+        <property name="manifest-cp-proprietary-32" value="${manifest-cp-proprietary-31} lib/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
+        <property name="manifest-cp-proprietary-33" value="${manifest-cp-proprietary-32} lib/json.jar"/>
+        <property name="manifest-cp-proprietary-34" value="${manifest-cp-proprietary-33} lib/mcf-core.jar"/>
+        <property name="manifest-cp-proprietary-35" value="${manifest-cp-proprietary-34} lib/mcf-agents.jar"/>
+        <property name="manifest-cp-proprietary-36" value="${manifest-cp-proprietary-35} lib/mcf-jetty-runner.jar"/>
+        <property name="manifest-cp-proprietary-37" value="${manifest-cp-proprietary-36} lib/mcf-pull-agent.jar"/>
+        <property name="manifest-cp-proprietary-38" value="${manifest-cp-proprietary-37} lib/mcf-ui-core.jar"/>
+        <property name="manifest-cp-proprietary-39" value="${manifest-cp-proprietary-38} lib/log4j-1.2.jar"/>
+        <property name="manifest-cp-proprietary-40" value="${manifest-cp-proprietary-39} lib/postgresql.jar"/>
+        <property name="manifest-cp-proprietary-41" value="${manifest-cp-proprietary-40} lib/mysql-connector-java.jar"/>
+        <property name="manifest-cp-proprietary-42" value="${manifest-cp-proprietary-41} lib/serializer.jar"/>
+        <property name="manifest-cp-proprietary-43" value="${manifest-cp-proprietary-42} lib/servlet-api-2.5-20081211.jar"/>
+        <property name="manifest-cp-proprietary-44" value="${manifest-cp-proprietary-43} lib/tomcat-juli-6.0.24.jar"/>
+        <property name="manifest-cp-proprietary-45" value="${manifest-cp-proprietary-44} lib/xalan2.jar"/>
+        <property name="manifest-cp-proprietary-46" value="${manifest-cp-proprietary-45} lib/xercesImpl-mcf.jar"/>
+        <property name="manifest-cp-proprietary-47" value="${manifest-cp-proprietary-46} lib/xml-apis.jar"/>
+        <property name="manifest-cp-proprietary-48" value="${manifest-cp-proprietary-47} lib/derbynet.jar"/>
+        <property name="manifest-cp-proprietary-49" value="${manifest-cp-proprietary-48} lib/eclipse-ecj.jar"/>
+        <property name="manifest-cp-proprietary-50" value="${manifest-cp-proprietary-49} lib/ojdbc.jar"/>
+        <property name="manifest-cp-proprietary-51" value="${manifest-cp-proprietary-50} lib/jtds.jar"/>
+        <property name="manifest-cp-proprietary-52" value="${manifest-cp-proprietary-51} lib/velocity-1.7.jar"/>
+        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-52}"/>
+        <mkdir dir="build/example-proprietary"/>
+        <manifest file="build/example-proprietary/manifest">
+            <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
+            <attribute name="Class-Path" value="${manifest-cp-proprietary}"/>
+        </manifest>
+        <jar destfile="dist/example-proprietary/start.jar" manifest="build/example-proprietary/manifest"/>
+
+    </target>
+
     <target name="compile-core-tests" depends="compile-core">
         <mkdir dir="build/core-tests/classes"/>
         <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -897,7 +1241,7 @@
         </java>
     </target>
     
-    <target name="build" depends="multi-process-example,single-process-example,example-common,script-engine"/>
+    <target name="build" depends="multi-process-example,multi-process-example-proprietary,single-process-example,single-process-example-proprietary,example-common,script-engine"/>
     
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB,run-tests-HSQLDBext"/>
     

Copied: incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/properties.xml (from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/properties.xml?p2=incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/properties.xml&p1=incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml&r1=1242176&r2=1242218&rev=1242218&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/example-multiprocess-proprietary/properties.xml Thu Feb  9 05:21:17 2012
@@ -31,7 +31,7 @@
   <!-- Point to a specific (common) logging file -->
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
-  <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
+  <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-lib-proprietary"/>

Copied: incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/properties.xml (from r1242176, incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/properties.xml?p2=incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/properties.xml&p1=incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml&r1=1242176&r2=1242218&rev=1242218&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/example-singleprocess-proprietary/properties.xml Thu Feb  9 05:21:17 2012
@@ -25,7 +25,7 @@
   <!-- Point to a specific logging file -->
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
-  <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
+  <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-lib-proprietary"/>