manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1542830 - in /manifoldcf/branches/CONNECTORS-553: connectors/alfresco/build.xml connectors/email/build.xml connectors/email/lib-proprietary/ connectors/email/pom.xml framework/build.xml tests/alfresco/build.xml
Date Sun, 17 Nov 2013 21:33:58 GMT
Author: kwright
Date: Sun Nov 17 21:33:57 2013
New Revision: 1542830

URL: http://svn.apache.org/r1542830
Log:
Move mail.jar to the root level; otherwise we can't find the protocol implementations.

Removed:
    manifoldcf/branches/CONNECTORS-553/connectors/email/lib-proprietary/
Modified:
    manifoldcf/branches/CONNECTORS-553/connectors/alfresco/build.xml
    manifoldcf/branches/CONNECTORS-553/connectors/email/build.xml
    manifoldcf/branches/CONNECTORS-553/connectors/email/pom.xml
    manifoldcf/branches/CONNECTORS-553/framework/build.xml
    manifoldcf/branches/CONNECTORS-553/tests/alfresco/build.xml

Modified: manifoldcf/branches/CONNECTORS-553/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/alfresco/build.xml?rev=1542830&r1=1542829&r2=1542830&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/alfresco/build.xml Sun Nov 17 21:33:57 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"/>

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/build.xml?rev=1542830&r1=1542829&r2=1542830&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/build.xml Sun Nov 17 21:33:57 2013
@@ -19,53 +19,4 @@ limitations under the License.
 
     <import file="../connector-build.xml"/>
 
-    <path id="connector-classpath">
-        <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="../../lib">
-            <include name="mail*.jar"/>
-        </fileset>
-    </path>
-
-    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="../../lib">
-                <include name="mail*.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="dist/lib-proprietary-only"/>
-        <copy todir="dist/lib-proprietary-only">
-            <fileset dir="lib-proprietary" includes="*.jar"/>
-        </copy>
-    </target>
-
-    <target name="download-libs">
-        <property name="libs-version" value="1.4.7"/>
-        <antcall target="download-via-maven">
-            <param name="project-path" value="com/sun/mail"/>
-            <param name="artifact-version" value="${libs-version}"/>
-            <param name="target" value="lib-proprietary"/>
-            <param name="artifact-name" value="pop3"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="project-path" value="com/sun/mail"/>
-            <param name="artifact-version" value="${libs-version}"/>
-            <param name="target" value="lib-proprietary"/>
-            <param name="artifact-name" value="imap"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-    </target>
-
-    <target name="download-dependencies" depends="download-libs"/>
-
-    <target name="download-cleanup">
-        <delete>
-            <fileset dir="lib-proprietary">
-                <exclude name="README.txt"/>
-                <exclude name="*.diffs"/>
-            </fileset>
-        </delete>
-    </target>
-
 </project>
\ No newline at end of file

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/pom.xml?rev=1542830&r1=1542829&r2=1542830&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/pom.xml Sun Nov 17 21:33:57 2013
@@ -161,17 +161,5 @@
       <artifactId>mail</artifactId>
       <version>1.4</version>
     </dependency> 
-    <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>pop3</artifactId>
-      <version>1.4.7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>imap</artifactId>
-      <version>1.4.7</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

Modified: manifoldcf/branches/CONNECTORS-553/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/framework/build.xml?rev=1542830&r1=1542829&r2=1542830&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553/framework/build.xml Sun Nov 17 21:33:57 2013
@@ -57,6 +57,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"/>
@@ -324,6 +325,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"/>
@@ -362,6 +364,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"/>
@@ -405,6 +408,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"/>
@@ -444,6 +448,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"/>
@@ -490,6 +495,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"/>
@@ -537,6 +543,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"/>
@@ -591,6 +598,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"/>
@@ -640,6 +648,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"/>
@@ -758,6 +767,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"/>
@@ -798,6 +808,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"/>
@@ -956,6 +967,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"/>
@@ -1044,7 +1056,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"/>
@@ -1083,6 +1096,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"/>
@@ -1179,7 +1193,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/tests/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/tests/alfresco/build.xml?rev=1542830&r1=1542829&r2=1542830&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/tests/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-553/tests/alfresco/build.xml Sun Nov 17 21:33:57 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