Modified: manifoldcf/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/build.xml (original) +++ manifoldcf/trunk/framework/build.xml Mon Oct 27 13:41:45 2014 @@ -31,6 +31,54 @@ <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="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"/> @@ -81,51 +129,6 @@ <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="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"> @@ -135,11 +138,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> @@ -178,6 +183,19 @@ </javac> </target> + <target name="compile-connector-common" depends="compile-core,compile-agents,compile-ui-core"> + <mkdir dir="build/connector-common/classes"/> + <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"> @@ -341,6 +359,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"/> @@ -370,57 +393,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"/> @@ -460,57 +432,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"/> @@ -556,57 +477,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"/> @@ -647,57 +517,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"/> @@ -744,57 +563,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"/> @@ -843,57 +611,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"/> @@ -950,57 +667,6 @@ <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"/> - </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"/> @@ -1051,57 +717,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"/> @@ -1222,57 +837,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"/> @@ -1511,45 +1075,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"/> @@ -1577,16 +1102,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> @@ -1823,9 +1338,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"/>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original) +++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Mon Oct 27 13:41:45 2014 @@ -105,6 +105,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"/> @@ -139,10 +142,46 @@ <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"/> + <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="${mcf-dist}/lib"> + <fileset dir="${mcf-dist}/connector-common-lib"> <include name="axis*.jar"/> <include name="saaj*.jar"/> <include name="wsdl4j*.jar"/> @@ -331,13 +370,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> @@ -355,11 +396,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> @@ -384,7 +427,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"/> @@ -406,7 +449,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/trunk/framework/core/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/pom.xml (original) +++ manifoldcf/trunk/framework/core/pom.xml Mon Oct 27 13:41:45 2014 @@ -109,12 +109,7 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>${tika.version}</version> - </dependency> - <dependency> + <!--dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>${activation.version}</version> @@ -190,7 +185,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> - </dependency> + </dependency --> <dependency> <groupId>javax.mail</groupId> Modified: manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml Mon Oct 27 13:41:45 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/trunk/framework/example-multiprocess-file/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file/properties.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-file/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-file/properties.xml Mon Oct 27 13:41:45 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/trunk/framework/example-multiprocess-zk-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml Mon Oct 27 13:41:45 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/trunk/framework/example-multiprocess-zk/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml Mon Oct 27 13:41:45 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/trunk/framework/example-singleprocess-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml (original) +++ manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml Mon Oct 27 13:41:45 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/trunk/framework/example-singleprocess/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess/properties.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess/properties.xml (original) +++ manifoldcf/trunk/framework/example-singleprocess/properties.xml Mon Oct 27 13:41:45 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/trunk/framework/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pom.xml?rev=1634534&r1=1634533&r2=1634534&view=diff ============================================================================== --- manifoldcf/trunk/framework/pom.xml (original) +++ manifoldcf/trunk/framework/pom.xml Mon Oct 27 13:41:45 2014 @@ -33,6 +33,7 @@ <modules> <module>core</module> + <module>connector-common</module> <module>ui-core</module> <module>agents</module> <module>pull-agent</module>
