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 2013/12/11 13:34:56 UTC
svn commit: r1550121 - in /manifoldcf/branches/CONNECTORS-553-2: ./
build.xml connectors/alfresco/build.xml connectors/email/
connectors/pom.xml framework/build.xml tests/alfresco/build.xml
Author: kwright
Date: Wed Dec 11 12:34:55 2013
New Revision: 1550121
URL: http://svn.apache.org/r1550121
Log:
Pull up changes from the original CONNECTORS-553 branch.
Added:
manifoldcf/branches/CONNECTORS-553-2/connectors/email/ (props changed)
- copied from r1550120, manifoldcf/branches/CONNECTORS-553/connectors/email/
Modified:
manifoldcf/branches/CONNECTORS-553-2/ (props changed)
manifoldcf/branches/CONNECTORS-553-2/build.xml
manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml
manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml
manifoldcf/branches/CONNECTORS-553-2/framework/build.xml
manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml
Propchange: manifoldcf/branches/CONNECTORS-553-2/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-553:r1534730-1550120
Modified: manifoldcf/branches/CONNECTORS-553-2/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/build.xml?rev=1550121&r1=1550120&r2=1550121&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/build.xml Wed Dec 11 12:34:55 2013
@@ -59,6 +59,7 @@
<ant dir="connectors/alfresco" target="clean"/>
<ant dir="connectors/cmis" target="clean"/>
<ant dir="connectors/dropbox" target="clean"/>
+ <ant dir="connectors/email" target="clean"/>
<ant dir="connectors/generic" target="clean"/>
<ant dir="connectors/googledrive" target="clean"/>
<ant dir="connectors/jira" target="clean"/>
@@ -116,6 +117,7 @@
<ant dir="connectors/alfresco" target="clean"/>
<ant dir="connectors/cmis" target="clean"/>
<ant dir="connectors/dropbox" target="clean"/>
+ <ant dir="connectors/email" target="clean"/>
<ant dir="connectors/generic" target="clean"/>
<ant dir="connectors/googledrive" target="clean"/>
<ant dir="connectors/jira" target="clean"/>
@@ -1127,6 +1129,41 @@
<ant dir="connectors/wiki" target="run-tests-HSQLDB"/>
</target>
+ <target name="setup-email-connector" depends="build-framework" if="downloaded"/>
+
+ <target name="setup-email-connector-tests" depends="build-tests-framework" if="downloaded"/>
+
+ <target name="build-email-connector" depends="setup-email-connector" if="downloaded">
+ <ant dir="connectors/email" target="build"/>
+ </target>
+
+ <target name="doc-email-connector" depends="setup-email-connector" if="downloaded">
+ <ant dir="connectors/email" target="doc"/>
+ </target>
+
+ <target name="build-tests-email-connector" depends="setup-email-connector,setup-email-connector-tests" if="downloaded">
+ <ant dir="connectors/email" target="build-tests"/>
+ </target>
+
+ <target name="run-tests-email-connector" depends="setup-email-connector,setup-email-connector-tests" if="downloaded">
+ <ant dir="connectors/email" target="run-tests"/>
+ </target>
+
+ <target name="run-tests-derby-email-connector" depends="setup-email-connector,setup-email-connector-tests" if="downloaded">
+ <ant dir="connectors/email" target="run-tests-derby"/>
+ </target>
+
+ <target name="run-tests-postgresql-email-connector" depends="setup-email-connector,setup-email-connector-tests" if="downloaded">
+ <ant dir="connectors/email" target="run-tests-postgresql"/>
+ </target>
+
+ <target name="run-tests-mysql-email-connector" depends="setup-email-connector,setup-email-connector-tests" if="downloaded">
+ <ant dir="connectors/email" target="run-tests-mysql"/>
+ </target>
+
+ <target name="run-tests-HSQLDB-email-connector" depends="setup-email-connector,setup-email-connector-tests" if="downloaded">
+ <ant dir="connectors/email" target="run-tests-HSQLDB"/>
+ </target>
<target name="deliver-site-doc" depends="presite-check" if="site-exists">
<mkdir dir="dist/doc"/>
@@ -2518,6 +2555,43 @@
</antcall>
</target>
+ <target name="calculate-email-condition" depends="build-email-connector">
+ <available file="connectors/email/dist/lib" type="dir" property="email.exists"/>
+ <condition property="email.include">
+ <and>
+ <isset property="email.exists"/>
+ <isset property="downloaded"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="calculate-email-doc-condition" depends="doc-email-connector">
+ <available file="connectors/email/dist/doc" type="dir" property="email-doc.exists"/>
+ <condition property="email-doc.include">
+ <and>
+ <isset property="email-doc.exists"/>
+ <isset property="downloaded"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="deliver-email-connector" depends="calculate-email-condition" if="email.include">
+ <antcall target="general-connector-delivery">
+ <param name="connector-name" value="email"/>
+ </antcall>
+ <antcall target="general-add-repository-connector">
+ <param name="connector-name" value="email"/>
+ <param name="connector-label" value="EMail"/>
+ <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.email.EmailConnector"/>
+ </antcall>
+ </target>
+
+ <target name="deliver-email-connector-doc" depends="calculate-email-doc-condition" if="email-doc.include">
+ <antcall target="general-connector-doc-delivery">
+ <param name="connector-name" value="email"/>
+ </antcall>
+ </target>
+
<target name="calculate-filesystem-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">
<condition property="filesystem-tests.include">
<and>
@@ -2995,8 +3069,8 @@
<target name="end-to-end-loadtests-HSQLDB" depends="run-filesystem-loadtests-HSQLDB,run-hdfs-loadtests-HSQLDB,run-rss-loadtests-HSQLDB,run-wiki-loadtests-HSQLDB,run-alfresco-loadtests-HSQLDB,run-cmis-loadtests-HSQLDB,run-sharepoint-loadtests-HSQLDB"/>
- <target name="deliver-open-connectors" depends="deliver-generic-connector,deliver-jira-connector,deliver-googledrive-connector,deliver-dropbox-connector,deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-ldap-connector,deliver-alfresco-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-hdfs-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-wiki-connector,deliver-jdbc-connector"/>
- <target name="deliver-open-connectors-doc" depends="deliver-generic-connector-doc,deliver-jira-connector-doc,deliver-googledrive-connector-doc,deliver-dropbox-connector-doc,deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-ldap-connector-doc,deliver-alfresco-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-hdfs-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-wiki-connector-doc,deliver-jdbc-connector-doc"/>
+ <target name="deliver-open-connectors" depends="deliver-email-connector,deliver-generic-connector,deliver-jira-connector,deliver-googledrive-connector,deliver-dropbox-connector,deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-ldap-connector,deliver-alfresco-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-hdfs-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-wiki-connector,deliver-jdbc-connector"/>
+ <target name="deliver-open-connectors-doc" depends="deliver-email-connector-doc,deliver-generic-connector-doc,deliver-jira-connector-doc,deliver-googledrive-connector-doc,deliver-dropbox-connector-doc,deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-ldap-connector-doc,deliver-alfresco-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-hdfs-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-wiki-connector-doc,deliver-jdbc-connector-doc"/>
<target name="deliver-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector,deliver-opensearchserver-connector,deliver-elasticsearch-connector"/>
<target name="deliver-output-connectors-doc" depends="deliver-gts-connector-doc,deliver-solr-connector-doc,deliver-nulloutput-connector-doc,deliver-opensearchserver-connector-doc,deliver-elasticsearch-connector-doc"/>
@@ -4184,6 +4258,7 @@ Use Apache Forrest version forrest-0.9-d
<ant dir="connectors/activedirectory" target="download-dependencies"/>
<ant dir="connectors/ldap" target="download-dependencies"/>
<ant dir="connectors/documentum" target="download-dependencies"/>
+ <ant dir="connectors/email" target="download-dependencies"/>
<ant dir="connectors/filenet" target="download-dependencies"/>
<ant dir="connectors/filesystem" target="download-dependencies"/>
<ant dir="connectors/gts" target="download-dependencies"/>
Modified: manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml?rev=1550121&r1=1550120&r2=1550121&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml Wed Dec 11 12:34:55 2013
@@ -50,7 +50,6 @@
<include name="saaj*.jar"/>
<include name="commons-discovery*.jar"/>
<include name="jaxrpc*.jar"/>
- <include name="mail*.jar"/>
<include name="opensaml*.jar"/>
<include name="wsdl4j*.jar"/>
<include name="wss4j*.jar"/>
@@ -73,7 +72,6 @@
<include name="saaj*.jar"/>
<include name="commons-discovery*.jar"/>
<include name="jaxrpc*.jar"/>
- <include name="mail*.jar"/>
<include name="opensaml*.jar"/>
<include name="wsdl4j*.jar"/>
<include name="wss4j*.jar"/>
Propchange: manifoldcf/branches/CONNECTORS-553-2/connectors/email/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 11 12:34:55 2013
@@ -0,0 +1,10 @@
+build
+dist
+doc
+target
+test-output
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output
Modified: manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml?rev=1550121&r1=1550120&r2=1550121&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml Wed Dec 11 12:34:55 2013
@@ -56,6 +56,7 @@
<module>jira</module>
<module>generic</module>
<module>regexpmapper</module>
+ <module>email</module>
</modules>
</project>
Modified: manifoldcf/branches/CONNECTORS-553-2/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/framework/build.xml?rev=1550121&r1=1550120&r2=1550121&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/framework/build.xml Wed Dec 11 12:34:55 2013
@@ -58,6 +58,7 @@
<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"/>
@@ -326,6 +327,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -365,6 +367,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -409,6 +412,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -449,6 +453,7 @@
<include name="xercesImpl*.jar"/>
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -496,6 +501,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -544,6 +550,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -599,6 +606,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -649,6 +657,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -768,6 +777,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -809,6 +819,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="mail*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -1159,6 +1170,7 @@
<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"/>
@@ -1247,7 +1259,8 @@
<property name="manifest-cp-59" value="${manifest-cp-58} lib/slf4j-simple.jar"/>
<property name="manifest-cp-60" value="${manifest-cp-59} lib/httpcore.jar"/>
<property name="manifest-cp-61" value="${manifest-cp-60} lib/httpclient.jar"/>
- <property name="manifest-cp" value="${manifest-cp-61}"/>
+ <property name="manifest-cp-62" value="${manifest-cp-61} lib/mail.jar"/>
+ <property name="manifest-cp" value="${manifest-cp-62}"/>
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1287,6 +1300,7 @@
<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"/>
@@ -1383,7 +1397,8 @@
<property name="manifest-cp-proprietary-61" value="${manifest-cp-proprietary-60} lib/slf4j-simple.jar"/>
<property name="manifest-cp-proprietary-62" value="${manifest-cp-proprietary-61} lib/httpcore.jar"/>
<property name="manifest-cp-proprietary-63" value="${manifest-cp-proprietary-62} lib/httpclient.jar"/>
- <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-63}"/>
+ <property name="manifest-cp-proprietary-64" value="${manifest-cp-proprietary-63} lib/mail.jar"/>
+ <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-64}"/>
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
Modified: manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml?rev=1550121&r1=1550120&r2=1550121&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml Wed Dec 11 12:34:55 2013
@@ -27,7 +27,6 @@
<include name="saaj*.jar"/>
<include name="commons-discovery*.jar"/>
<include name="jaxrpc*.jar"/>
- <include name="mail*.jar"/>
<include name="opensaml*.jar"/>
<include name="wsdl4j*.jar"/>
<include name="wss4j*.jar"/>