You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/27 04:56:12 UTC
svn commit: r1634444 - in /manifoldcf/branches/CONNECTORS-1085:
connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/
connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meri...
Author: kwright
Date: Mon Oct 27 03:56:11 2014
New Revision: 1634444
URL: http://svn.apache.org/r1634444
Log:
Get the ant build working too
Modified:
manifoldcf/branches/CONNECTORS-1085/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java
manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
manifoldcf/branches/CONNECTORS-1085/framework/build.xml
manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-1085/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1634444&r1=1634443&r2=1634444&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-1085/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Mon Oct 27 03:56:11 2014
@@ -23,9 +23,9 @@ import org.apache.manifoldcf.agents.inte
import org.apache.manifoldcf.crawler.interfaces.*;
import org.apache.manifoldcf.crawler.system.Logging;
import org.apache.manifoldcf.crawler.system.ManifoldCF;
-import org.apache.manifoldcf.core.common.XThreadInputStream;
-import org.apache.manifoldcf.core.common.XThreadOutputStream;
-import org.apache.manifoldcf.core.common.InterruptibleSocketFactory;
+import org.apache.manifoldcf.connectorcommon.common.XThreadInputStream;
+import org.apache.manifoldcf.connectorcommon.common.XThreadOutputStream;
+import org.apache.manifoldcf.connectorcommon.common.InterruptibleSocketFactory;
import org.apache.manifoldcf.core.common.DateParser;
import org.apache.manifoldcf.livelink.*;
Modified: manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java?rev=1634444&r1=1634443&r2=1634444&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java (original)
+++ manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/meridio/MeridioAuthority.java Mon Oct 27 03:56:11 2014
@@ -228,7 +228,7 @@ public class MeridioAuthority extends or
UserName, Password,
InetAddress.getLocalHost().getHostName(),
mySSLFactory,
- org.apache.manifoldcf.core.common.CommonsHTTPSender.class,
+ org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.class,
"client-config.wsdd");
}
catch (NumberFormatException e)
Modified: manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1634444&r1=1634443&r2=1634444&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-1085/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java Mon Oct 27 03:56:11 2014
@@ -188,7 +188,7 @@ public class MeridioConnector extends or
params.getObfuscatedParameter("Password"),
InetAddress.getLocalHost().getHostName(),
mySSLFactory,
- org.apache.manifoldcf.core.common.CommonsHTTPSender.class,
+ org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.class,
"client-config.wsdd");
}
catch (NumberFormatException e)
Modified: manifoldcf/branches/CONNECTORS-1085/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/build.xml?rev=1634444&r1=1634443&r2=1634444&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/build.xml Mon Oct 27 03:56:11 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">
@@ -178,6 +181,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 +357,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 +391,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 +430,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 +475,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 +515,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 +561,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"/>
@@ -839,60 +605,9 @@
<jar destfile="build/webapp/crawler-ui/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
</target>
- <target name="webapp-crawler-ui-proprietary" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
- <mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
- <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
- <fileset dir="../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>
+ <target name="webapp-crawler-ui-proprietary" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
+ <mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
+ <copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
<fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
@@ -950,57 +665,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 +715,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 +835,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 +1073,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 +1100,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>
@@ -1825,12 +1338,68 @@
<!-- Set up example directories -->
- <target name="example-common" depends="wars,wars-proprietary">
+ <target name="example-common" depends="wars,wars-proprietary,jar-connector-common">
<copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
<copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
<mkdir dir="dist/connector-lib"/>
<mkdir dir="dist/connector-lib-proprietary"/>
<copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
+ <copy todir="dist/connector-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>
<target name="multi-processes-file" depends="lib">
Modified: manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml?rev=1634444&r1=1634443&r2=1634444&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml Mon Oct 27 03:56:11 2014
@@ -105,6 +105,9 @@
</target>
<path id="mcf-connector-build.connector-classpath">
+ <fileset dir="${mcf-dist}/connector-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-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-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-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-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-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-lib">
<include name="castor*.jar"/>
</fileset>
</classpath>