manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1552344 - in /manifoldcf/branches/CONNECTORS-553-2: ./ connectors/ connectors/alfresco/ connectors/email/ connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/ connectors/email/connector/src/main/resource...
Date Thu, 19 Dec 2013 16:37:42 GMT
Author: kwright
Date: Thu Dec 19 16:37:41 2013
New Revision: 1552344

URL: http://svn.apache.org/r1552344
Log:
Pull up changes from old CONNECTORS-553 branch

Added:
    manifoldcf/branches/CONNECTORS-553-2/connectors/email/   (props changed)
      - copied from r1550466, manifoldcf/branches/CONNECTORS-553-2/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/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
    manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
    manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
    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-2:r1550121-1550124,1550464-1550466
  Merged /manifoldcf/branches/CONNECTORS-553:r1534730-1550120,1550125-1550463,1550467-1552343

Modified: manifoldcf/branches/CONNECTORS-553-2/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/build.xml?rev=1552344&r1=1552343&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/build.xml Thu Dec 19 16:37:41 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=1552344&r1=1552343&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/alfresco/build.xml Thu Dec 19 16:37:41
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 Thu Dec 19 16:37:41 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/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java?rev=1552344&r1=1550466&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
(original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
Thu Dec 19 16:37:41 2013
@@ -53,6 +53,15 @@ public class EmailConfig {
   */
   public static final String PROPERTIES_PARAM = "properties";
 
+  public static final String PROTOCOL_IMAP = "IMAP";
+  public static final String PROTOCOL_IMAP_PROVIDER = "imap";
+  public static final String PROTOCOL_IMAPS = "IMAP-SSL";
+  public static final String PROTOCOL_IMAPS_PROVIDER = "imaps";
+  public static final String PROTOCOL_POP3 = "POP3";
+  public static final String PROTOCOL_POP3_PROVIDER = "pop3";
+  public static final String PROTOCOL_POP3S = "POP3-SSL";
+  public static final String PROTOCOL_POP3S_PROVIDER = "pop3s";
+  
   public static final String PROTOCOL_DEFAULT_VALUE = "IMAP";
   public static final String PORT_DEFAULT_VALUE = "25";
 
@@ -71,10 +80,6 @@ public class EmailConfig {
 
 
   public static final String RELATIONSHIP_CHILD = "child";
-  public static final String PROTOCOL_IMAP = "imap";
-  public static final String PROTOCOL_IMAP_PROVIDER = "imaps";
-  public static final String PROTOCOL_POP3 = "POP3";
-  public static final String PROTOCOL_POP3_PROVIDER = "pop3";
   public static final String FOLDER_INBOX = "INBOX";
   public static final String EMAIL_SUBJECT = "subject";
   public static final String EMAIL_FROM = "from";

Modified: manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1552344&r1=1550466&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
(original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Thu Dec 19 16:37:41 2013
@@ -85,7 +85,9 @@ public class EmailConnector extends org.
   {
     providerMap = new HashMap<String,String>();
     providerMap.put(EmailConfig.PROTOCOL_POP3, EmailConfig.PROTOCOL_POP3_PROVIDER);
+    providerMap.put(EmailConfig.PROTOCOL_POP3S, EmailConfig.PROTOCOL_POP3S_PROVIDER);
     providerMap.put(EmailConfig.PROTOCOL_IMAP, EmailConfig.PROTOCOL_IMAP_PROVIDER);
+    providerMap.put(EmailConfig.PROTOCOL_IMAPS, EmailConfig.PROTOCOL_IMAPS_PROVIDER);
   }
   //////////////////////////////////Start of Basic Connector Methods/////////////////////////
 
@@ -863,7 +865,7 @@ public class EmailConnector extends org.
 
   private void fillInSearchableAttributes(Map<String, Object> paramMap) {
     String[] attributes = EmailConfig.BASIC_SEARCHABLE_ATTRIBUTES;
-    paramMap.put("searchableattributes", attributes);
+    paramMap.put("SEARCHABLEATTRIBUTES", attributes);
   }
 
   protected static void fillInFilterTab(Map<String, Object> paramMap,
@@ -882,7 +884,7 @@ public class EmailConnector extends org.
         list.add(row);
       }
     }
-    paramMap.put("matches", list);
+    paramMap.put("MATCHES", list);
   }
 
   /**

Modified: manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html?rev=1552344&r1=1550466&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
(original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
Thu Dec 19 16:37:41 2013
@@ -30,11 +30,21 @@ limitations under the License.
   #else
         <option value="IMAP">IMAP</option>
   #end
+  #if($PROTOCOL == 'IMAP-SSL')
+        <option value="IMAP-SSL" selected="selected">IMAP-SSL</option>
+  #else
+        <option value="IMAP-SSL">IMAP-SSL</option>
+  #end
   #if($PROTOCOL == 'POP3')
         <option value="POP3" selected="selected">POP3</option>
   #else
         <option value="POP3">POP3</option>
   #end
+  #if($PROTOCOL == 'POP3-SSL')
+        <option value="POP3-SSL" selected="selected">POP3-SSL</option>
+  #else
+        <option value="POP3-SSL">POP3-SSL</option>
+  #end
       </select>
     </td>
   </tr>

Modified: manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml?rev=1552344&r1=1552343&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/connectors/pom.xml Thu Dec 19 16:37:41 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=1552344&r1=1552343&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/framework/build.xml Thu Dec 19 16:37:41 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=1552344&r1=1552343&r2=1552344&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553-2/tests/alfresco/build.xml Thu Dec 19 16:37:41 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"/>



Mime
View raw message