manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r910917 - in /incubator/lcf/trunk/modules: ./ connectors/documentum/lib/ connectors/documentum/war/ connectors/filenet/lib/ connectors/filenet/war/ connectors/filesystem/lib/ connectors/filesystem/war/ connectors/gts/lib/ connectors/gts/war...
Date Wed, 17 Feb 2010 11:16:30 GMT
Author: kwright
Date: Wed Feb 17 11:16:29 2010
New Revision: 910917

URL: http://svn.apache.org/viewvc?rev=910917&view=rev
Log:
Make it the responsibility of the outer ant script to properly copy all required libraries
for a subproject into place.  This makes it much easier to determine if any errors have been
committed, because the clean can then remove the copied libraries.

Added:
    incubator/lcf/trunk/modules/lib/axis.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/axis.jar
    incubator/lcf/trunk/modules/lib/castor-1.0.5-commons.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-commons.jar
    incubator/lcf/trunk/modules/lib/castor-1.0.5-xml.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-xml.jar
    incubator/lcf/trunk/modules/lib/castor-1.0.5.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5.jar
    incubator/lcf/trunk/modules/lib/commons-discovery.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/commons-discovery.jar
    incubator/lcf/trunk/modules/lib/jakarta-poi.jar
      - copied unchanged from r910006, incubator/lcf/trunk/modules/connectors/jcifs/lib/jakarta-poi.jar
    incubator/lcf/trunk/modules/lib/jaxrpc.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/jaxrpc.jar
    incubator/lcf/trunk/modules/lib/saaj.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/saaj.jar
    incubator/lcf/trunk/modules/lib/wsdl4j.jar
      - copied unchanged from r910240, incubator/lcf/trunk/modules/connectors/meridio/lib/wsdl4j.jar
Removed:
    incubator/lcf/trunk/modules/connectors/documentum/lib/
    incubator/lcf/trunk/modules/connectors/documentum/war/
    incubator/lcf/trunk/modules/connectors/filenet/lib/
    incubator/lcf/trunk/modules/connectors/filenet/war/
    incubator/lcf/trunk/modules/connectors/filesystem/lib/
    incubator/lcf/trunk/modules/connectors/filesystem/war/
    incubator/lcf/trunk/modules/connectors/gts/lib/
    incubator/lcf/trunk/modules/connectors/gts/war/
    incubator/lcf/trunk/modules/connectors/jcifs/lib/
    incubator/lcf/trunk/modules/connectors/jcifs/war/
    incubator/lcf/trunk/modules/connectors/jdbc/lib/
    incubator/lcf/trunk/modules/connectors/jdbc/war/
    incubator/lcf/trunk/modules/connectors/livelink/lib/
    incubator/lcf/trunk/modules/connectors/livelink/war/
    incubator/lcf/trunk/modules/connectors/lucene/lib/
    incubator/lcf/trunk/modules/connectors/lucene/war/
    incubator/lcf/trunk/modules/connectors/memex/lib/
    incubator/lcf/trunk/modules/connectors/memex/war/
    incubator/lcf/trunk/modules/connectors/meridio/lib/
    incubator/lcf/trunk/modules/connectors/meridio/war/
    incubator/lcf/trunk/modules/connectors/nulloutput/lib/
    incubator/lcf/trunk/modules/connectors/nulloutput/war/
    incubator/lcf/trunk/modules/connectors/rss/lib/
    incubator/lcf/trunk/modules/connectors/rss/war/
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/
    incubator/lcf/trunk/modules/connectors/sharepoint/war/
    incubator/lcf/trunk/modules/connectors/webcrawler/lib/
    incubator/lcf/trunk/modules/connectors/webcrawler/war/
    incubator/lcf/trunk/modules/framework/lib/
Modified:
    incubator/lcf/trunk/modules/build.xml

Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=910917&r1=910916&r2=910917&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Wed Feb 17 11:16:29 2010
@@ -2,32 +2,83 @@
 
     <target name="clean">
         <ant dir="framework" target="clean"/>
+        <delete dir="framework/lib"/>
         <ant dir="connectors/documentum" target="clean"/>
+        <delete dir="connectors/documentum/lib"/>
+        <delete dir="connectors/documentum/war"/>
         <ant dir="connectors/filenet" target="clean"/>
+        <delete dir="connectors/filenet/lib"/>
+        <delete dir="connectors/filenet/war"/>
         <ant dir="connectors/filesystem" target="clean"/>
+        <delete dir="connectors/filesystem/lib"/>
+        <delete dir="connectors/filesystem/war"/>
         <ant dir="connectors/gts" target="clean"/>
+        <delete dir="connectors/gts/lib"/>
+        <delete dir="connectors/gts/war"/>
         <ant dir="connectors/jcifs" target="clean"/>
+        <delete dir="connectors/jcifs/lib"/>
+        <delete dir="connectors/jcifs/war"/>
         <ant dir="connectors/jdbc" target="clean"/>
+        <delete dir="connectors/jdbc/lib"/>
+        <delete dir="connectors/jdbc/war"/>
         <ant dir="connectors/livelink" target="clean"/>
+        <delete dir="connectors/livelink/lib"/>
+        <delete dir="connectors/livelink/war"/>
         <ant dir="connectors/lucene" target="clean"/>
+        <delete dir="connectors/lucene/lib"/>
+        <delete dir="connectors/lucene/war"/>
         <ant dir="connectors/memex" target="clean"/>
+        <delete dir="connectors/memex/lib"/>
+        <delete dir="connectors/memex/war"/>
         <ant dir="connectors/meridio" target="clean"/>
+        <delete dir="connectors/meridio/lib"/>
+        <delete dir="connectors/meridio/war"/>
         <ant dir="connectors/nulloutput" target="clean"/>
+        <delete dir="connectors/nulloutput/lib"/>
+        <delete dir="connectors/nulloutput/war"/>
         <ant dir="connectors/rss" target="clean"/>
+        <delete dir="connectors/rss/lib"/>
+        <delete dir="connectors/rss/war"/>
         <ant dir="connectors/sharepoint" target="clean"/>
+        <delete dir="connectors/sharepoint/lib"/>
+        <delete dir="connectors/sharepoint/war"/>
         <ant dir="connectors/webcrawler" target="clean"/>
+        <delete dir="connectors/webcrawler/lib"/>
+        <delete dir="connectors/webcrawler/war"/>
     </target>
     
     <target name="build-framework">
-        <copy todir="framework/lib">
-            <fileset dir="lib"/>
-        </copy>
+    
+        <mkdir dir="framework/lib"/>
+        <!-- Individually specify the needed libraries, since otherwise that information
would not be available readily -->
+        <copy todir="framework/lib" file="lib/commons-codec.jar"/>
+        <copy todir="framework/lib" file="lib/commons-collections.jar"/>
+        <copy todir="framework/lib" file="lib/commons-el.jar"/>
+        <copy todir="framework/lib" file="lib/commons-fileupload.jar"/>
+        <copy todir="framework/lib" file="lib/commons-httpclient.jar"/>
+        <copy todir="framework/lib" file="lib/commons-io.jar"/>
+        <copy todir="framework/lib" file="lib/commons-logging.jar"/>
+        <copy todir="framework/lib" file="lib/jasper-compiler.jar"/>
+        <copy todir="framework/lib" file="lib/jasper-compiler-jdt.jar"/>
+        <copy todir="framework/lib" file="lib/jasper-runtime.jar"/>
+        <copy todir="framework/lib" file="lib/jdbcpool-0.99.jar"/>
+        <copy todir="framework/lib" file="lib/jsp-api.jar"/>
+        <copy todir="framework/lib" file="lib/log4j-1.2.jar"/>
+        <copy todir="framework/lib" file="lib/postgresql.jar"/>
+        <copy todir="framework/lib" file="lib/serializer.jar"/>
+        <copy todir="framework/lib" file="lib/servlet-api.jar"/>
+        <copy todir="framework/lib" file="lib/xalan2.jar"/>
+        <copy todir="framework/lib" file="lib/xercesImpl.jar"/>
+        <copy todir="framework/lib" file="lib/xml-apis.jar"/>
+
         <ant dir="framework"/>
     </target>
 
     <target name="build-documentum-connector" depends="build-framework">
+        <mkdir dir="connectors/documentum/lib"/>
+        <mkdir dir="connectors/documentum/war"/>
         <copy todir="connectors/documentum/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/documentum/lib">
             <fileset dir="framework/build/jar"/>
@@ -39,8 +90,10 @@
     </target>
 
     <target name="build-filenet-connector" depends="build-framework">
+        <mkdir dir="connectors/filenet/lib"/>
+        <mkdir dir="connectors/filenet/war"/>
         <copy todir="connectors/filenet/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/filenet/lib">
             <fileset dir="framework/build/jar"/>
@@ -52,8 +105,10 @@
     </target>
 
     <target name="build-filesystem-connector" depends="build-framework">
+        <mkdir dir="connectors/filesystem/lib"/>
+        <mkdir dir="connectors/filesystem/war"/>
         <copy todir="connectors/filesystem/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/filesystem/lib">
             <fileset dir="framework/build/jar"/>
@@ -65,8 +120,10 @@
     </target>
 
     <target name="build-gts-connector" depends="build-framework">
+        <mkdir dir="connectors/gts/lib"/>
+        <mkdir dir="connectors/gts/war"/>
         <copy todir="connectors/gts/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/gts/lib">
             <fileset dir="framework/build/jar"/>
@@ -78,8 +135,11 @@
     </target>
 
     <target name="build-jcifs-connector" depends="build-framework">
+        <mkdir dir="connectors/jcifs/lib"/>
+        <mkdir dir="connectors/jcifs/war"/>
+        <copy todir="connectors/jcifs/lib" file="lib/jakarta-poi.jar"/>
         <copy todir="connectors/jcifs/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/jcifs/lib">
             <fileset dir="framework/build/jar"/>
@@ -91,8 +151,10 @@
     </target>
 
     <target name="build-jdbc-connector" depends="build-framework">
+        <mkdir dir="connectors/jdbc/lib"/>
+        <mkdir dir="connectors/jdbc/war"/>
         <copy todir="connectors/jdbc/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/jdbc/lib">
             <fileset dir="framework/build/jar"/>
@@ -104,8 +166,10 @@
     </target>
 
     <target name="build-livelink-connector" depends="build-framework">
+        <mkdir dir="connectors/livelink/lib"/>
+        <mkdir dir="connectors/livelink/war"/>
         <copy todir="connectors/livelink/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/livelink/lib">
             <fileset dir="framework/build/jar"/>
@@ -117,8 +181,10 @@
     </target>
 
     <target name="build-lucene-connector" depends="build-framework">
+        <mkdir dir="connectors/lucene/lib"/>
+        <mkdir dir="connectors/lucene/war"/>
         <copy todir="connectors/lucene/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/lucene/lib">
             <fileset dir="framework/build/jar"/>
@@ -130,8 +196,10 @@
     </target>
 
     <target name="build-memex-connector" depends="build-framework">
+        <mkdir dir="connectors/memex/lib"/>
+        <mkdir dir="connectors/memex/war"/>
         <copy todir="connectors/memex/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/memex/lib">
             <fileset dir="framework/build/jar"/>
@@ -143,8 +211,18 @@
     </target>
 
     <target name="build-meridio-connector" depends="build-framework">
+        <mkdir dir="connectors/meridio/lib"/>
+        <mkdir dir="connectors/meridio/war"/>
+        <copy todir="connectors/meridio/lib" file="lib/axis.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/jaxrpc.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/saaj.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/w2dl4j.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/castor-1.0.5-commons.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/castor-1.0.5.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/castor-1.0.5-xml.jar"/>
+        <copy todir="connectors/meridio/lib" file="lib/commons-discovery.jar"/>
         <copy todir="connectors/meridio/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/meridio/lib">
             <fileset dir="framework/build/jar"/>
@@ -156,8 +234,10 @@
     </target>
 
     <target name="build-nulloutput-connector" depends="build-framework">
+        <mkdir dir="connectors/nulloutput/lib"/>
+        <mkdir dir="connectors/nulloutput/war"/>
         <copy todir="connectors/nulloutput/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/nulloutput/lib">
             <fileset dir="framework/build/jar"/>
@@ -169,8 +249,10 @@
     </target>
 
     <target name="build-rss-connector" depends="build-framework">
+        <mkdir dir="connectors/rss/lib"/>
+        <mkdir dir="connectors/rss/war"/>
         <copy todir="connectors/rss/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/rss/lib">
             <fileset dir="framework/build/jar"/>
@@ -182,8 +264,16 @@
     </target>
 
     <target name="build-sharepoint-connector" depends="build-framework">
+        <mkdir dir="connectors/sharepoint/lib"/>
+        <mkdir dir="connectors/sharepoint/war"/>
+        <copy todir="connectors/sharepoint/lib" file="lib/axis.jar"/>
+        <copy todir="connectors/sharepoint/lib" file="lib/jaxrpc.jar"/>
+        <copy todir="connectors/sharepoint/lib" file="lib/saaj.jar"/>
+        <copy todir="connectors/sharepoint/lib" file="lib/w2dl4j.jar"/>
+        <copy todir="connectors/sharepoint/lib" file="lib/commons-discovery.jar"/>
+
         <copy todir="connectors/sharepoint/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/sharepoint/lib">
             <fileset dir="framework/build/jar"/>
@@ -195,8 +285,10 @@
     </target>
 
     <target name="build-webcrawler-connector" depends="build-framework">
+        <mkdir dir="connectors/webcrawler/lib"/>
+        <mkdir dir="connectors/webcrawler/war"/>
         <copy todir="connectors/webcrawler/lib">
-            <fileset dir="lib"/>
+            <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/webcrawler/lib">
             <fileset dir="framework/build/jar"/>



Mime
View raw message