manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1646137 [2/2] - in /manifoldcf/branches/release-1.8-branch: ./ connectors/activedirectory/ connectors/alfresco-webscript/ connectors/alfresco/ connectors/amazoncloudsearch/ connectors/cmis/ connectors/documentfilter/ connectors/dropbox/ co...
Date Wed, 17 Dec 2014 02:11:35 GMT
Modified: manifoldcf/branches/release-1.8-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/build.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/build.xml Wed Dec 17 02:11:34 2014
@@ -32,6 +32,55 @@
     
     <path id="framework-classpath">
         <fileset dir="../lib">
+            <include name="zookeeper*.jar"/>
+            <include name="json*.jar"/>
+            <include name="commons-codec*.jar"/>
+            <include name="commons-collections*.jar"/>
+            <include name="commons-el*.jar"/>
+            <include name="commons-fileupload*.jar"/>
+            <include name="httpcore*.jar"/>
+            <include name="httpclient*.jar"/>
+            <include name="commons-io*.jar"/>
+            <include name="commons-lang*.jar"/>
+            <include name="commons-logging*.jar"/>
+            <include name="ecj*.jar"/>
+            <include name="jasper*.jar"/>
+            <include name="jetty*.jar"/>
+            <include name="slf4j*.jar"/>
+            <include name="jsp-2.1*.jar"/>
+            <include name="jsp-api*.jar"/>
+            <include name="log4j*.jar"/>
+            <include name="serializer*.jar"/>
+            <include name="javax.servlet-api*.jar"/>
+            <include name="juli*.jar"/>
+            <include name="xalan*.jar"/>
+            <include name="xercesImpl*.jar"/>
+            <include name="xml-apis*.jar"/>
+            <include name="velocity*.jar"/>
+            <include name="mail*.jar"/>
+        </fileset>
+        <fileset dir="../lib">
+            <include name="postgresql*.jar"/>
+            <include name="derby*.jar"/>
+            <include name="hsqldb*.jar"/>
+        </fileset>
+        <fileset dir="../lib">
+            <include name="junit*.jar"/>
+            <include name="mockito-core*.jar"/>
+            <include name="wiremock*.jar"/>
+            <include name="objenesis*.jar"/>
+        </fileset>
+        <fileset dir="../lib-proprietary">
+            <include name="mysql*.jar"/>
+            <include name="ojdbc*.jar"/>
+            <include name="jtds*.jar"/>
+            <include name="mariadb-java-client*.jar"/>
+        </fileset>
+
+    </path>
+    
+    <path id="connector-common-classpath">
+        <fileset dir="../lib">
             <include name="tika-core*.jar"/>
             <include name="jackson-core*.jar"/>
             <include name="jackson-databind*.jar"/>
@@ -82,54 +131,8 @@
             <include name="opensaml*.jar"/>
             <include name="activation*.jar"/>
         </fileset>
-        <fileset dir="../lib">
-            <include name="zookeeper*.jar"/>
-            <include name="json*.jar"/>
-            <include name="commons-codec*.jar"/>
-            <include name="commons-collections*.jar"/>
-            <include name="commons-el*.jar"/>
-            <include name="commons-fileupload*.jar"/>
-            <include name="httpcore*.jar"/>
-            <include name="httpclient*.jar"/>
-            <include name="commons-io*.jar"/>
-            <include name="commons-lang*.jar"/>
-            <include name="commons-logging*.jar"/>
-            <include name="ecj*.jar"/>
-            <include name="jasper*.jar"/>
-            <include name="jetty*.jar"/>
-            <include name="slf4j*.jar"/>
-            <include name="jsp-2.1*.jar"/>
-            <include name="jsp-api*.jar"/>
-            <include name="log4j*.jar"/>
-            <include name="serializer*.jar"/>
-            <include name="javax.servlet-api*.jar"/>
-            <include name="juli*.jar"/>
-            <include name="xalan*.jar"/>
-            <include name="xercesImpl*.jar"/>
-            <include name="xml-apis*.jar"/>
-            <include name="velocity*.jar"/>
-            <include name="mail*.jar"/>
-        </fileset>
-        <fileset dir="../lib">
-            <include name="postgresql*.jar"/>
-            <include name="derby*.jar"/>
-            <include name="hsqldb*.jar"/>
-        </fileset>
-        <fileset dir="../lib">
-            <include name="junit*.jar"/>
-            <include name="mockito-core*.jar"/>
-            <include name="wiremock*.jar"/>
-            <include name="objenesis*.jar"/>
-        </fileset>
-        <fileset dir="../lib-proprietary">
-            <include name="mysql*.jar"/>
-            <include name="ojdbc*.jar"/>
-            <include name="jtds*.jar"/>
-            <include name="mariadb-java-client*.jar"/>
-        </fileset>
-
     </path>
-    
+
     <target name="doc">
         <mkdir dir="dist/doc"/>
         <javadoc destdir="dist/doc" maxmemory="256M" source="1.7" useexternalfile="true" use="true" locale="en_US">
@@ -137,11 +140,13 @@
             <link href="http://manifoldcf.apache.org/release/trunk/api/framework/"/>
             <classpath>
                 <path refid="framework-classpath"/>
+                <path refid="connector-common-classpath"/>
             </classpath>
             <fileset dir="core/src/main/java" includes="**/*.java"/>
             <fileset dir="agents/src/main/java" includes="**/*.java"/>
             <fileset dir="pull-agent/src/main/java" includes="**/*.java"/>
             <fileset dir="ui-core/src/main/java" includes="**/*.java"/>
+            <fileset dir="connector-common/src/main/java" includes="**/*.java"/>
             <fileset dir="script-engine/src/main/java" includes="**/*.java"/>
             <fileset dir="jetty-runner/src/main/java" includes="**/*.java"/>
         </javadoc>
@@ -180,6 +185,22 @@
         </javac>
     </target>
 
+    <target name="compile-connector-common" depends="compile-core,compile-agents,compile-ui-core">
+        <mkdir dir="build/connector-common/classes"/>
+        <copy todir="build/connector-common/classes">
+            <fileset dir="connector-common/src/main/resources"/>
+        </copy>
+        <javac srcdir="connector-common/src/main/java" destdir="build/connector-common/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <path refid="connector-common-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/agents/classes"/>
+                <pathelement location="build/ui-core/classes"/>
+           </classpath>
+        </javac>
+    </target>
+
     <target name="compile-pull-agent" depends="compile-core,compile-agents">
         <mkdir dir="build/pull-agent/classes"/>
         <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
@@ -343,6 +364,11 @@
         <jar destfile="build/jar/mcf-agents.jar" basedir="build/agents/classes"/>
     </target>
 
+    <target name="jar-connector-common" depends="compile-connector-common">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-connector-common.jar" basedir="build/connector-common/classes"/>
+    </target>
+
     <target name="jar-pull-agent" depends="compile-pull-agent">
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/mcf-pull-agent.jar" basedir="build/pull-agent/classes"/>
@@ -372,57 +398,6 @@
         <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
         <copy todir="build/webapp/authority-service/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
@@ -463,57 +438,6 @@
         <mkdir dir="build/webapp/authority-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
@@ -560,57 +484,6 @@
         <mkdir dir="build/webapp/api-service/WEB-INF/lib"/>
         <copy todir="build/webapp/api-service/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
@@ -652,57 +525,6 @@
         <mkdir dir="build/webapp/api-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
@@ -750,57 +572,6 @@
         <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="jstl*.jar"/>
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
@@ -850,57 +621,6 @@
         <mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="jstl*.jar"/>
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
@@ -934,80 +654,29 @@
                 <include name="mariadb-java-client*.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>
-        <jar destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
-    </target>
-
-    <target name="webapp-combined-service" depends="compile-combined-service,jar-core,jar-ui-core,jar-agents,jar-pull-agent,jar-api-servlet,jar-authority-servlet">
-        <mkdir dir="build/webapp/combined-service/WEB-INF/lib"/>
-        <copy todir="build/webapp/combined-service/WEB-INF/lib">
-            <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
+        <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>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
+        </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>
+        <jar destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
+    </target>
+
+    <target name="webapp-combined-service" depends="compile-combined-service,jar-core,jar-ui-core,jar-agents,jar-pull-agent,jar-api-servlet,jar-authority-servlet">
+        <mkdir dir="build/webapp/combined-service/WEB-INF/lib"/>
+        <copy todir="build/webapp/combined-service/WEB-INF/lib">
             <fileset dir="../lib">
                 <include name="jstl*.jar"/>
                 <include name="zookeeper*.jar"/>
@@ -1060,57 +729,6 @@
         <mkdir dir="build/webapp/combined-service-proprietary/WEB-INF/lib"/>
         <copy todir="build/webapp/combined-service-proprietary/WEB-INF/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="jstl*.jar"/>
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
@@ -1232,57 +850,6 @@
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
             <fileset dir="../lib">
-                <include name="tika-core*.jar"/>
-                <include name="jackson-core*.jar"/>
-                <include name="jackson-databind*.jar"/>
-                <include name="jackson-annotations*.jar"/>
-                <include name="tika-parsers*.jar"/>
-                <include name="tagsoup*.jar"/>
-                <include name="poi*.jar"/>
-                <include name="vorbis-java*.jar"/>
-                <include name="netcdf*.jar"/>
-                <include name="unidataCommon*.jar"/>
-                <include name="commons-httpclient*.jar"/>
-                <include name="apache-mime4j-core*.jar"/>
-                <include name="apache-mime4j-dom*.jar"/>
-                <include name="commons-compress*.jar"/>
-                <include name="pdfbox*.jar"/>
-                <include name="fontbox*.jar"/>
-                <include name="jempbox*.jar"/>
-                <include name="bcmail-jdk15*.jar"/>
-                <include name="bcprov-jdk15*.jar"/>
-                <include name="xmlbeans*.jar"/>
-                <include name="dom4j*.jar"/>
-                <include name="geronimo-stax-api_1.0_spec*.jar"/>
-                <include name="asm*.jar"/>
-                <include name="isoparser*.jar"/>
-                <include name="aspectjrt*.jar"/>
-                <include name="metadata-extractor*.jar"/>
-                <include name="xmpcore*.jar"/>
-                <include name="xml-apis*.jar"/>
-                <include name="boilerpipe*.jar"/>
-                <include name="rome*.jar"/>
-                <include name="jdom*.jar"/>
-                <include name="xercesImpl*.jar"/>
-                <include name="vorbis-java-core*.jar"/>
-                <include name="juniversalchardet*.jar"/>
-                <include name="jhighlight*.jar"/>
-                <include name="jmatio*.jar"/>
-                <include name="java-libpst*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
-                <include name="castor*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="axis*.jar"/>
-                <include name="wss4j*.jar"/>
-                <include name="saaj*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="xmlsec*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="activation*.jar"/>
-            </fileset>
-            <fileset dir="../lib">
                 <include name="zookeeper*.jar"/>
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
@@ -1523,45 +1090,6 @@
     </path>
     
     <path id="process-lib">
-        <fileset dir="../lib">
-            <include name="tika-core*.jar"/>
-            <include name="jackson-core*.jar"/>
-            <include name="jackson-databind*.jar"/>
-            <include name="jackson-annotations*.jar"/>
-            <include name="tika-parsers*.jar"/>
-            <include name="tagsoup*.jar"/>
-            <include name="poi*.jar"/>
-            <include name="vorbis-java*.jar"/>
-            <include name="netcdf*.jar"/>
-            <include name="unidataCommon*.jar"/>
-            <include name="commons-httpclient*.jar"/>
-            <include name="apache-mime4j-core*.jar"/>
-            <include name="apache-mime4j-dom*.jar"/>
-            <include name="commons-compress*.jar"/>
-            <include name="pdfbox*.jar"/>
-            <include name="fontbox*.jar"/>
-            <include name="jempbox*.jar"/>
-            <include name="bcmail-jdk15*.jar"/>
-            <include name="bcprov-jdk15*.jar"/>
-            <include name="xmlbeans*.jar"/>
-            <include name="dom4j*.jar"/>
-            <include name="geronimo-stax-api_1.0_spec*.jar"/>
-            <include name="asm*.jar"/>
-            <include name="isoparser*.jar"/>
-            <include name="aspectjrt*.jar"/>
-            <include name="metadata-extractor*.jar"/>
-            <include name="xmpcore*.jar"/>
-            <include name="xml-apis*.jar"/>
-            <include name="boilerpipe*.jar"/>
-            <include name="rome*.jar"/>
-            <include name="jdom*.jar"/>
-            <include name="xercesImpl*.jar"/>
-            <include name="vorbis-java-core*.jar"/>
-            <include name="juniversalchardet*.jar"/>
-            <include name="jhighlight*.jar"/>
-            <include name="jmatio*.jar"/>
-            <include name="java-libpst*.jar"/>
-          </fileset>
           <fileset dir="../lib">
             <include name="commons-lang*.jar"/>
             <include name="commons-codec*.jar"/>
@@ -1589,16 +1117,6 @@
             <include name="httpclient*.jar"/>
             <include name="mail*.jar"/>
             <include name="zookeeper*.jar"/>
-            <include name="castor*.jar"/>
-            <include name="geronimo-javamail_1.4_spec*.jar"/>
-            <include name="axis*.jar"/>
-            <include name="wsdl4j*.jar"/>
-            <include name="saaj-api*.jar"/>
-            <include name="saaj-impl*.jar"/>
-            <include name="activation*.jar"/>
-            <include name="wss4j*.jar"/>
-            <include name="xmlsec*.jar"/>
-            <include name="opensaml*.jar"/>
         </fileset>
     </path>
     
@@ -1835,9 +1353,71 @@
         </antcall>
     </target>
 
+    <!-- Set up connector-common-lib -->
+    
+    <target name="connector-common-lib" depends="jar-connector-common">
+        <mkdir dir="dist/connector-common-lib"/>
+        <copy todir="dist/connector-common-lib">
+            <fileset dir="build/jar">
+                <include name="mcf-connector-common.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="tika-core*.jar"/>
+                <include name="jackson-core*.jar"/>
+                <include name="jackson-databind*.jar"/>
+                <include name="jackson-annotations*.jar"/>
+                <include name="tika-parsers*.jar"/>
+                <include name="tagsoup*.jar"/>
+                <include name="poi*.jar"/>
+                <include name="vorbis-java*.jar"/>
+                <include name="netcdf*.jar"/>
+                <include name="unidataCommon*.jar"/>
+                <include name="commons-httpclient*.jar"/>
+                <include name="apache-mime4j-core*.jar"/>
+                <include name="apache-mime4j-dom*.jar"/>
+                <include name="commons-compress*.jar"/>
+                <include name="pdfbox*.jar"/>
+                <include name="fontbox*.jar"/>
+                <include name="jempbox*.jar"/>
+                <include name="bcmail-jdk15*.jar"/>
+                <include name="bcprov-jdk15*.jar"/>
+                <include name="xmlbeans*.jar"/>
+                <include name="dom4j*.jar"/>
+                <include name="geronimo-stax-api_1.0_spec*.jar"/>
+                <include name="asm*.jar"/>
+                <include name="isoparser*.jar"/>
+                <include name="aspectjrt*.jar"/>
+                <include name="metadata-extractor*.jar"/>
+                <include name="xmpcore*.jar"/>
+                <include name="xml-apis*.jar"/>
+                <include name="boilerpipe*.jar"/>
+                <include name="rome*.jar"/>
+                <include name="jdom*.jar"/>
+                <include name="xercesImpl*.jar"/>
+                <include name="vorbis-java-core*.jar"/>
+                <include name="juniversalchardet*.jar"/>
+                <include name="jhighlight*.jar"/>
+                <include name="jmatio*.jar"/>
+                <include name="java-libpst*.jar"/>
+            </fileset>
+            <fileset dir="../lib">
+                <include name="castor*.jar"/>
+                <include name="geronimo-javamail_1.4_spec*.jar"/>
+                <include name="commons-discovery*.jar"/>
+                <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
+                <include name="saaj*.jar"/>
+                <include name="wsdl4j*.jar"/>
+                <include name="xmlsec*.jar"/>
+                <include name="opensaml*.jar"/>
+                <include name="activation*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+
     <!-- Set up example directories -->
     
-    <target name="example-common" depends="wars,wars-proprietary">
+    <target name="example-common" depends="wars,wars-proprietary,connector-common-lib">
         <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"/>
@@ -2083,6 +1663,18 @@
         </javac>
     </target>
 
+    <target name="compile-connector-common-tests" depends="compile-connector-common">
+        <mkdir dir="build/connector-common-tests/classes"/>
+        <!--javac srcdir="connector-common/src/test/java" destdir="build/connector-common-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/core-tests/classes"/>
+                <pathelement location="build/connector-common/classes"/>
+            </classpath>
+        </javac -->
+    </target>
+
     <target name="compile-agents-tests" depends="compile-core-tests,compile-agents">
         <mkdir dir="build/agents-tests/classes"/>
         <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
@@ -2187,6 +1779,21 @@
         </junit>
     </target>
 
+    <target name="run-connector-common-tests" depends="compile-connector-common,compile-connector-common-tests,compile-core,compile-core-tests">
+        <mkdir dir="test-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/core-tests/classes"/>
+                <pathelement location="build/connector-common/classes"/>
+                <pathelement location="build/connector-common-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+        </junit>
+    </target>
+
     <target name="run-pull-agent-tests" depends="compile-pull-agent,compile-pull-agent-tests">
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -2240,7 +1847,7 @@
         </junit>
     </target>
 
-    <target name="run-tests" depends="compile-tests,run-core-tests,run-pull-agent-tests,run-script-engine-tests"/>
+    <target name="run-tests" depends="compile-tests,run-core-tests,run-connector-common-tests,run-pull-agent-tests,run-script-engine-tests"/>
 
     <target name="run-tests-derby" depends="compile-tests">
         <mkdir dir="test-derby-output"/>

Modified: manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml Wed Dec 17 02:11:34 2014
@@ -106,6 +106,9 @@
     </target>
 
     <path id="mcf-connector-build.connector-classpath">
+        <fileset dir="${mcf-dist}/connector-common-lib">
+            <include name="mcf-connector-common.jar"/>
+        </fileset>
         <fileset dir="${mcf-dist}/lib">
             <include name="mcf-core.jar"/>
             <include name="mcf-ui-core.jar"/>
@@ -140,7 +143,7 @@
             <include name="xml-apis*.jar"/>
             <include name="velocity*.jar"/>
         </fileset>
-        <fileset dir="${mcf-dist}/lib">
+        <fileset dir="${mcf-dist}/connector-common-lib">
             <include name="tika-core*.jar"/>
             <include name="jackson-core*.jar"/>
             <include name="jackson-databind*.jar"/>
@@ -179,7 +182,7 @@
             <include name="jmatio*.jar"/>
             <include name="java-libpst*.jar"/>
         </fileset>
-        <fileset dir="${mcf-dist}/lib">
+        <fileset dir="${mcf-dist}/connector-common-lib">
             <include name="axis*.jar"/>
             <include name="saaj*.jar"/>
             <include name="wsdl4j*.jar"/>
@@ -369,13 +372,15 @@
         <mkdir dir="build/wsdljava"/>
         <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="axis*.jar"/>
                     <include name="saaj*.jar"/>
                     <include name="wsdl*.jar"/>
                     <include name="mail*.jar"/>
                     <include name="activation*.jar"/>
                     <include name="commons-discovery*.jar"/>
+                </fileset>
+                <fileset dir="${mcf-dist}/lib">
                     <include name="commons-logging*.jar"/>
                 </fileset>
             </classpath>
@@ -393,11 +398,13 @@
         <mkdir dir="build/xsdjava"/>
         <java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="castor*.jar"/>
                     <include name="geronimo-activation_1.1_spec*.jar"/>
                     <include name="geronimo-javamail_1.4_spec*.jar"/>
                     <include name="xerces*.jar"/>
+                </fileset>
+                <fileset dir="${mcf-dist}/lib">
                     <include name="commons-logging*.jar"/>
                 </fileset>
             </classpath>
@@ -422,7 +429,7 @@
         <mkdir dir="build/wsdlclasses"/>
         <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="axis*.jar"/>
                     <include name="saaj*.jar"/>
                     <include name="wsdl*.jar"/>
@@ -444,7 +451,7 @@
         <mkdir dir="build/xsdclasses"/>
         <javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
-                <fileset dir="${mcf-dist}/lib">
+                <fileset dir="${mcf-dist}/connector-common-lib">
                     <include name="castor*.jar"/>
                 </fileset>
             </classpath>

Modified: manifoldcf/branches/release-1.8-branch/framework/connector-common/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/connector-common/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/connector-common/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/connector-common/pom.xml Wed Dec 17 02:11:34 2014
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.manifoldcf</groupId>
     <artifactId>mcf-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

Modified: manifoldcf/branches/release-1.8-branch/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/core/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/core/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/core/pom.xml Wed Dec 17 02:11:34 2014
@@ -109,7 +109,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
       <version>${tika.version}</version>
@@ -190,7 +190,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>
-    </dependency>
+    </dependency -->
     
     <dependency>
       <groupId>javax.mail</groupId>

Modified: manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file-proprietary/properties.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file-proprietary/properties.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file-proprietary/properties.xml Wed Dec 17 02:11:34 2014
@@ -40,6 +40,7 @@
   <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-common-lib"/>
   <libdir path="../connector-lib-proprietary"/>
   <!-- WSDD references -->
   <!-- Any additional properties go here -->

Modified: manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file/properties.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file/properties.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file/properties.xml Wed Dec 17 02:11:34 2014
@@ -40,6 +40,7 @@
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
+  <libdir path="../connector-common-lib"/>
   <libdir path="../connector-lib-proprietary"/>
   <!-- WSDD references -->
   <!-- Any additional properties go here -->

Modified: manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk-proprietary/properties.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk-proprietary/properties.xml Wed Dec 17 02:11:34 2014
@@ -35,6 +35,7 @@
   <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-common-lib"/>
   <libdir path="../connector-lib-proprietary"/>
   <!-- Any additional local properties go here -->
 </configuration>

Modified: manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk/properties.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk/properties.xml Wed Dec 17 02:11:34 2014
@@ -35,6 +35,7 @@
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
+  <libdir path="../connector-common-lib"/>
   <libdir path="../connector-lib-proprietary"/>
   <!-- Any additional local properties go here -->
 </configuration>

Modified: manifoldcf/branches/release-1.8-branch/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/example-singleprocess-proprietary/properties.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/example-singleprocess-proprietary/properties.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/example-singleprocess-proprietary/properties.xml Wed Dec 17 02:11:34 2014
@@ -37,6 +37,7 @@
   <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-common-lib"/>
   <libdir path="../connector-lib-proprietary"/>
   <!-- WSDD references -->
   <!-- Any additional properties go here -->

Modified: manifoldcf/branches/release-1.8-branch/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/example-singleprocess/properties.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/example-singleprocess/properties.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/example-singleprocess/properties.xml Wed Dec 17 02:11:34 2014
@@ -37,6 +37,7 @@
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
+  <libdir path="../connector-common-lib"/>
   <libdir path="../connector-lib-proprietary"/>
   <!-- WSDD references -->
   <!-- Any additional properties go here -->

Modified: manifoldcf/branches/release-1.8-branch/framework/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/framework/pom.xml Wed Dec 17 02:11:34 2014
@@ -33,6 +33,7 @@
 
   <modules>
     <module>core</module>
+    <module>connector-common</module>
     <module>ui-core</module>
     <module>agents</module>
     <module>pull-agent</module>



Mime
View raw message