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 [2/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
Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Fri Feb 10 22:58:46 2012
@@ -63,6 +63,8 @@
             <include name="postgresql*.jar"/>
             <include name="derby*.jar"/>
             <include name="hsqldb*.jar"/>
+        </fileset>
+        <fileset dir="../lib-proprietary">
             <include name="mysql*.jar"/>
             <include name="ojdbc*.jar"/>
             <include name="jtds*.jar"/>
@@ -266,19 +268,59 @@
                 <include name="postgresql*.jar"/>
                 <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">
@@ -307,12 +349,53 @@
                 <include name="postgresql*.jar"/>
                 <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"/>
@@ -320,7 +403,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">
@@ -353,9 +436,6 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
-                <include name="mysql*.jar"/>
-                <include name="ojdbc*.jar"/>
-                <include name="jtds*.jar"/>
             </fileset>
         </copy>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
@@ -376,13 +456,69 @@
             <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"/>
+        <mkdir dir="dist/connector-lib"/>
+        <mkdir dir="dist/connector-lib-proprietary"/>
+        <copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
     </target>
     
     <target name="war-authority-service" depends="webapp-authority-service">
@@ -390,23 +526,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">
@@ -435,9 +593,6 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
-                <include name="mysql*.jar"/>
-                <include name="ojdbc*.jar"/>
-                <include name="jtds*.jar"/>
             </fileset>
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
@@ -452,15 +607,64 @@
         <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"/>
+                <include name="jtds*.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-proprietary/processes/script"/>
+        <copy todir="dist/multiprocess-example-proprietary/processes/script">
+            <fileset dir="scripts"/>
+        </copy>
+        <mkdir dir="dist/multiprocess-example-proprietary/syncharea"/>
+    </target>
+
     <target name="multi-process-example" depends="jar-core,jar-agents,jar-pull-agent,jar-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">
@@ -489,7 +693,47 @@
         </copy>
         <mkdir dir="dist/multiprocess-example/logs"/>
     </target>
-    
+  
+      <target name="multi-process-example-proprietary" depends="jar-core,jar-agents,jar-pull-agent,jar-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="json.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="commons-logging*.jar"/>
+                <include name="log4j*.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>
+            <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">
@@ -551,9 +795,6 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
-                <include name="mysql*.jar"/>
-                <include name="ojdbc*.jar"/>
-                <include name="jtds*.jar"/>
             </fileset>
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
@@ -569,80 +810,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">
@@ -879,7 +1249,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"/>
     

Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ManifoldCFInstance.java Fri Feb 10 22:58:46 2012
@@ -407,9 +407,9 @@ public class ManifoldCFInstance
     server = new Server( testPort );    
     server.setStopAtShutdown( true );
     
-    String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
-    String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
-    String apiWarPath = "../../framework/build/war/mcf-api-service.war";
+    String crawlerWarPath = "../../framework/build/war-proprietary/mcf-crawler-ui.war";
+    String authorityserviceWarPath = "../../framework/build/war-proprietary/mcf-authority-service.war";
+    String apiWarPath = "../../framework/build/war-proprietary/mcf-api-service.war";
 
     if (System.getProperty("crawlerWarPath") != null)
     	crawlerWarPath = System.getProperty("crawlerWarPath");

Propchange: incubator/lcf/trunk/lib-proprietary/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 10 22:58:46 2012
@@ -0,0 +1,3 @@
+jtds.jar
+mysql-connector-java.jar
+ojdbc.jar

Modified: incubator/lcf/trunk/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/mvn-bootstrap.bat?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/mvn-bootstrap.bat (original)
+++ incubator/lcf/trunk/mvn-bootstrap.bat Fri Feb 10 22:58:46 2012
@@ -21,7 +21,7 @@ cmd /c mvn install:install-file -Dfile=l
 
 cmd /c mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient-mcf -Dversion=3.1  -Dpackaging=jar
 cmd /c mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1  -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=connectors/jcifs/jcifs/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 
 cmd /c mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory -Dversion=0.6.0 -Dpackaging=war
 

Modified: incubator/lcf/trunk/mvn-bootstrap.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/mvn-bootstrap.sh?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/mvn-bootstrap.sh (original)
+++ incubator/lcf/trunk/mvn-bootstrap.sh Fri Feb 10 22:58:46 2012
@@ -28,7 +28,7 @@ mvn install:install-file -Dfile=lib/hsql
 
 mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient-mcf -Dversion=3.1  -Dpackaging=jar
 mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1  -Dpackaging=jar
-mvn install:install-file -Dfile=connectors/jcifs/jcifs/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
+mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 
 mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory -Dversion=0.6.0 -Dpackaging=war
 

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1242970&r1=1242969&r2=1242970&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Fri Feb 10 22:58:46 2012
@@ -81,26 +81,43 @@
           <tr><th><em>dist</em> file/directory</th><th>Meaning</th></tr>
           <tr><td><em>connectors.xml</em></td><td>an xml file describing the connectors that should be registered</td></tr>
           <tr><td><em>connector-lib</em></td><td>jars for all the connectors, referred to by properties.xml</td></tr>
+          <tr><td><em>connector-lib-proprietary</em></td><td>proprietary jars for all the connectors, referred to by properties.xml; not included in binary release</td></tr>
           <tr><td><em>xxx-process</em></td><td>scripts, classpath jars, and -D switch values needed for a required connector-specific process</td></tr>
           <tr><td><em>script-engine</em></td><td>jars and scripts for running the ManifoldCF script interpreter</td></tr>
-          <tr><td><em>multiprocess-example</em></td><td>scripts and jars for an example that uses the multiple process model</td></tr>
-          <tr><td><em>example</em></td><td>a jetty-based example that runs in a single process (except for any connector-specific processes)</td></tr>
+          <tr><td><em>example</em></td><td>a jetty-based example that runs in a single process (except for any connector-specific processes), excluding all proprietary libraries</td></tr>
+          <tr><td><em>example-proprietary</em></td><td>a jetty-based example that runs in a single process (except for any connector-specific processes), including proprietary libraries; not included in binary release</td></tr>
+          <tr><td><em>multiprocess-example</em></td><td>scripts and jars for an example that uses the multiple process model, excluding all proprietary libraries</td></tr>
+          <tr><td><em>multiprocess-example-proprietary</em></td><td>scripts and jars for an example that uses the multiple process model, including proprietary libraries; not included in binary release</td></tr>
           <tr><td><em>doc</em></td><td>javadocs for framework and all included connectors</td></tr>
           <tr><td><em>xxx-integration</em></td><td>pre-built integration components to deploy on target system "xxx", e.g. Solr</td></tr>
         </table>
         <p></p>
-        <p>For all of the <em>dist/xxx-process</em> subdirectories above, any scripts resulting from the build that pertain to that process will be placed in a <em>script</em> subdirectory.  Thus, the scripts for the <em>filenet-process</em> subdirectory will be found in <em>dist/filenet-process/script</em>.
+        <p>If you downloaded the binary distribution, you may notice that the <em>connector-lib-proprietary</em> directory contains only a README.txt file.  This is because under
+            Apache licensing rules, incompatibly-licensed jars may not be redistributed.  Therefore, in order to get a connector with proprietary dependencies to work, you will need to supply the
+            missing jars in the <em>connector-lib-proprietary</em> directory, as well as enable the connector's registration by uncommenting its entry in the <em>connectors.xml</em>
+            connector registration file.</p>
+        <p></p>
+        <p>NOTE: The prebuilt binary distribution cannot, at this time, include support for MySQL.  Nor can the JDBC Connector access MySQL, MSSQL, SyBase, or Oracle databases in that
+            distribution.  In order to use these JDBC drivers, you must build ManifoldCF yourself.  Start by downloading the drivers and placing them in the <em>lib-proprietary</em> directory.  The command
+            <em>ant download-dependencies</em> will do most of this for you, with the exception of the Oracle JDBC driver.</p>
+        <p></p>
+        <p>For all of the <em>dist/xxx-process</em> subdirectories above, any scripts that pertain to that process will be placed in the root level of the subdirectory.
             The supplied scripts for a process generally take care of building an appropriate classpath and setting necessary -D switches.  (Note: none of the current connectors require special -D switches
             at this time.)  If you need to construct a classpath by hand, it is important to remember that "more" is not necessarily "better".  The process deployment strategy implied by the build structure has
             been carefully thought out to avoid jar conflicts.  Indeed, several connectors are structured using multiple processes precisely for that reason.</p>
+        <p>The proprietary libraries required by the secondary process <em>xxx-process</em> should be in the directory <em>xxx-process/lib-proprietary</em>.  These jars are not included in the
+            binary distribution, and you will need to supply them in order to make the process work.  A README.txt file is placed in each <em>lib-proprietary</em> directory describing what needs to
+            be provided there.</p>
         <p></p>
         <p>The <em>xxx-integration</em> directories contain components you may need to deploy on the target system to make the associated connector function correctly.  For example, the Solr
             connector includes plug-in classes for enforcing ManifoldCF security on Solr 3.x and 4.x.  See the README file in each directory for detailed instructions on how to deploy the components.</p>
         <p></p>
-        <p>Inside the <em>examples</em> directory, you will find everything you need to fire up ManifoldCF in a single-process model under Jetty.  Everything is included so that all you need to do is change
-            to that directory, and start it using the command <em>&lt;java&gt; -jar start.jar</em>.  This is described in more detail later, and is the recommended way for beginners to try out ManifoldCF.</p>
+        <p>Inside the <em>example</em> directory, you will find everything you need to fire up ManifoldCF in a single-process model under Jetty.  Everything is included so that all you need to do is change
+            to that directory, and start it using the command <em>&lt;java&gt; -jar start.jar</em>.  This is described in more detail later, and is the recommended way for beginners to try out ManifoldCF.
+            The directory <em>example-proprietary</em> contains an equivalent example that includes proprietary connectors and jars.  This is the standard place to start if you build ManifoldCF yourself.</p>
         <p></p>
-        <p>ManifoldCF can also be deployed in a multi-process model.  Inside the <em>multiprocess-example</em> directory, you will find everything you need to do this.  Below is a list of
+        <p>ManifoldCF can also be deployed in a multi-process model.  Inside the <em>multiprocess-example</em> directory, you will find everything you need to do this.  (The
+            <em>multiprocess-example-proprietary</em> directory is similar but includes proprietary material and is available only if you build ManifoldCF yourself.)  Below is a list of
             what you will find in this directory.</p>
         <p></p>
         <table>
@@ -125,59 +142,68 @@
         <section>
           <title>Building and testing the Alfresco connector</title>
           <p></p>
-          <p>The Alfresco connector requires the Alfresco Web Services Client provided by Alfresco in order to be built. To install this jar you will need to execute the specific build process using Ant or Maven, the jar will be downloaded from the Alfresco Maven repository.</p>
-          <p>Before building with Ant the alfresco-web-service-client.jar download will be done automatically if you type "ant download-dependencies" from the root directory.</p>
+          <p>The Alfresco connector requires the Alfresco Web Services Client provided by Alfresco in order to be built. Place this jar into the directory <em>connectors/alfresco/lib-proprietary</em> before you build.
+              This will occur automatically if you execute the ant target "download-dependencies" from the ManifoldCF root directory.</p>
           <p></p>
-          <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-war (using "mvn package" inside the folder) into the connectors/alfresco/alfresco-war folder. Then use the "ant test" or "mvn integration-test" for the standard build to execute integration tests.</p>
+          <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-war (using "mvn package" inside the folder)
+              into the <em>connectors/alfresco/test-materials-proprietary</em> folder.  Then use the "ant test" or "mvn integration-test" for the standard build to execute integration tests.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the Documentum connector</title>
           <p></p>
-          <p>The Documentum connector requires EMC's DFC product in order to be built.  Install DFC on the build system, and locate the jars it installs.  You will need to copy at least dfc.jar, dfcbase.jar, and dctm.jar into the directory "connectors/documentum/dfc".</p>
+          <p>The Documentum connector requires EMC's DFC product in order to be built.  Install DFC on the build system, and locate the jars it installs.  You will need to copy at least dfc.jar, dfcbase.jar,
+              and dctm.jar into the directory <em>connectors/documentum/lib-proprietary</em>.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the FileNet connector</title>
           <p></p>
-          <p>The FileNet connector requires IBM's FileNet P8 API jar in order to be build.  Install the FileNet P8 API on the build system, and copy at least "Jace.jar" from that installation into "connectors/filenet/filenet-api".</p>
+          <p>The FileNet connector requires IBM's FileNet P8 API jar in order to be build.  Install the FileNet P8 API on the build system, and copy at least "Jace.jar" from that installation
+              into <em>connectors/filenet/lib-proprietary</em>.</p>
           <p></p>
         </section>
         
         <section>
-          <title>Building the JDBC connector, including Oracle, SQLServer, or Sybase JDBC drivers</title>
+          <title>Building the JDBC connector, including Oracle, MSSQL, MySQL, SQLServer, and Sybase JDBC drivers</title>
           <p></p>
-          <p>The JDBC connector also knows how to work with Oracle, SQLServer, and Sybase JDBC drivers.  For Oracle, download the appropriate Oracle JDBC jar from the Oracle site, and copy it into the directory "connectors/jdbc/jdbc-drivers".  For SQLServer and Sybase, download jtds.jar, and copy it into the same directory.  The jtds.jar download will be done automatically if you type "ant download-dependencies" from the root directory.</p>
+          <p>The JDBC connector also knows how to work with Oracle, SQLServer, and Sybase JDBC drivers.  In order to support these databases, start by placing the mysql-connector-java.jar,
+            the jtds.jar, and the ojdbc.jar in the <em>lib-proprietary</em> directory.  The ant target "download-dependencies" will do this for you automatically.  For Oracle, download the appropriate
+            Oracle JDBC jar from the Oracle site, and copy it into the same directory before you build ManifoldCF.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the jCIFS connector</title>
           <p></p>
-          <p>To build this connector, you need to download jcifs.jar from <a href="http://jcifs.samba.org">http://jcifs.samba.org</a>, and copy it into the "connectors/jcifs/jcifs" directory.  You can also just type "ant download-dependencies" and this step will be done for you.</p>
+          <p>To build this connector, you need to download jcifs.jar from <a href="http://jcifs.samba.org">http://jcifs.samba.org</a>, and copy it into the <em>connectors/jcifs/lib-proprietary</em>
+              directory.  You can also just type "ant download-dependencies" from the root ManifoldCF directory and this step will be done for you.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the LiveLink connector</title>
           <p></p>
-          <p>This connector needs LAPI, which is a proprietary java library that allows access to OpenText's LiveLink server.  Copy the lapi.jar into the "connectors/livelink/lapi" directory.</p>
+          <p>This connector needs LAPI, which is a proprietary java library that allows access to OpenText's LiveLink server.  Copy the lapi.jar into the <em>connectors/livelink/lib-proprietary</em>
+              directory.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the Memex connector</title>
           <p></p>
-          <p>This connector needs the Memex API jar, usually called JavaMXIELIB.jar.  Copy this jar into the "connectors/memex/mxie-java" directory.</p>
+          <p>This connector needs the Memex API jar, usually called JavaMXIELIB.jar.  Copy this jar into the <em>connectors/memex/lib-proprietary</em> directory.</p>
           <p></p>
         </section>
         
         <section>
           <title>Building the Meridio connector</title>
           <p></p>
-          <p>The Meridio connector needs wsdls and xsds downloaded from an installed Meridio instance using <strong>disco.exe</strong>, which is installed as part of Microsoft Visual Studio, typically under "c:\Program Files\Microsoft SDKs\Windows\V6.x\bin".  Obtain the preliminary wsdls and xsds by interrogating the following Meridio web services:</p>
+          <p>The Meridio connector needs wsdls and xsds downloaded from an installed Meridio instance using <strong>disco.exe</strong>, which is installed as part of
+              Microsoft Visual Studio, typically under "c:\Program Files\Microsoft SDKs\Windows\V6.x\bin".  Obtain the preliminary wsdls and xsds by interrogating the
+              following Meridio web services:</p>
           <p></p>
           <ul>
              <li>http[s]://&#60;meridio_server&#62;/DMWS/MeridioDMWS.asmx</li>
@@ -194,7 +220,9 @@
              <li>RMClassificationDataSet.xsd</li>
           </ul>
           <p></p>
-          <p>Next, patch these using Microsoft's <strong>xmldiffpatch</strong> utility suite, downloadable for Windows from <a href="http://msdn.microsoft.com/en-us/library/aa302294.aspx">http://msdn.microsoft.com/en-us/library/aa302294.aspx</a>.  The appropriate diff files to apply as patches can be found in "connectors/meridio/upstream-diffs".  After the patching, rename so that you have the files:</p>
+          <p>Next, patch these using Microsoft's <strong>xmldiffpatch</strong> utility suite, downloadable for Windows from
+              <a href="http://msdn.microsoft.com/en-us/library/aa302294.aspx">http://msdn.microsoft.com/en-us/library/aa302294.aspx</a>.  The appropriate diff files to apply as patches can
+              be found in <em>connectors/meridio/lib-proprietary</em>.  After the patching, rename so that you have the files:</p>
           <p></p>
           <ul>
              <li>MeridioDMWS_axis.wsdl</li>
@@ -204,7 +232,7 @@
              <li>RMClassificationDataSet_castor.xsd</li>
           </ul>
           <p></p>
-          <p>Finally, copy all of these to: "connectors/meridio/wsdls".</p>
+          <p>Finally, copy all of these to <em>connectors/meridio/lib-proprietary</em>.</p>
           <p></p>
         </section>
         
@@ -233,7 +261,7 @@
              <li>http[s]://&#60;server_name&#62;/_vti_bin/webs.asmx</li>
           </ul>
           <p></p>
-          <p>When the wsdl files have been downloaded, copy them to the directory <em>connectors/sharepoint/wsdls</em> before building.</p>
+          <p>When the wsdl files have been downloaded, copy them to the directory <em>connectors/sharepoint/lib-proprietary</em> before building.</p>
           <p></p>
           <p>The wsdl files download will be done automatically if you type "ant download-dependencies" from the root directory.</p>
           <p></p>
@@ -476,6 +504,11 @@ cd dist/example
           <table>
             <caption>Property.xml properties</caption>
             <tr><th>Property</th><th>Required?</th><th>Function</th></tr>
+            <tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for Jetty</td><td>Location of Crawler UI war</td></tr>
+            <tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes, for Jetty</td><td>Location of Authority Service war</td></tr>
+            <tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for Jetty</td><td>Location of API Service war</td></tr>
+            <tr><td>org.apache.manifoldcf.usejettyparentclassloader</td><td>Yes, for Jetty</td><td>true for single-process example, false for multiprocess example.</td></tr>
+            <tr><td>org.apache.manifoldcf.jettyport</td><td>No</td><td>Port that Jetty will use; defaults to 8345.</td></tr>
             <tr><td>org.apache.manifoldcf.connectorsconfigurationfile</td><td>No</td><td>Location of connectors.xml file, for QuickStart, so ManifoldCF can register connectors.</td></tr>
             <tr><td>org.apache.manifoldcf.dbsuperusername</td><td>No</td><td>Database superuser name, for QuickStart, so ManifoldCF can create database instance.</td></tr>
             <tr><td>org.apache.manifoldcf.dbsuperuserpassword</td><td>No</td><td>Database superuser password, for QuickStart, so ManifoldCF can create database instance.</td></tr>



Mime
View raw message