incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r959730 - in /incubator/lcf/trunk/modules: ./ connectors/activedirectory/ connectors/activedirectory/crawler-ui/ connectors/documentum/ connectors/documentum/crawler-ui/ connectors/filenet/ connectors/filenet/crawler-ui/ connectors/filesyst...
Date Thu, 01 Jul 2010 17:25:22 GMT
Author: kwright
Date: Thu Jul  1 17:25:21 2010
New Revision: 959730

URL: http://svn.apache.org/viewvc?rev=959730&view=rev
Log:
Build changes for CONNECTORS-40.  The connector builds all produce just a set of jar files under the dist/lib area.  These jars are all folded into the main module dist/lib area, which you have to know to point your configuration file at for everything to work.  (This behavior will be documented shortly.)

Removed:
    incubator/lcf/trunk/modules/connectors/activedirectory/crawler-ui/
    incubator/lcf/trunk/modules/connectors/documentum/crawler-ui/
    incubator/lcf/trunk/modules/connectors/filenet/crawler-ui/
    incubator/lcf/trunk/modules/connectors/filesystem/crawler-ui/
    incubator/lcf/trunk/modules/connectors/gts/crawler-ui/
    incubator/lcf/trunk/modules/connectors/jcifs/crawler-ui/
    incubator/lcf/trunk/modules/connectors/jdbc/crawler-ui/
    incubator/lcf/trunk/modules/connectors/livelink/crawler-ui/
    incubator/lcf/trunk/modules/connectors/memex/crawler-ui/
    incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/
    incubator/lcf/trunk/modules/connectors/nulloutput/crawler-ui/
    incubator/lcf/trunk/modules/connectors/rss/crawler-ui/
    incubator/lcf/trunk/modules/connectors/sharepoint/crawler-ui/
    incubator/lcf/trunk/modules/connectors/solr/crawler-ui/
    incubator/lcf/trunk/modules/connectors/webcrawler/crawler-ui/
Modified:
    incubator/lcf/trunk/modules/build.xml
    incubator/lcf/trunk/modules/connectors/activedirectory/build.xml
    incubator/lcf/trunk/modules/connectors/documentum/build.xml
    incubator/lcf/trunk/modules/connectors/filenet/build.xml
    incubator/lcf/trunk/modules/connectors/filesystem/build.xml
    incubator/lcf/trunk/modules/connectors/gts/build.xml
    incubator/lcf/trunk/modules/connectors/jcifs/build.xml
    incubator/lcf/trunk/modules/connectors/jdbc/build.xml
    incubator/lcf/trunk/modules/connectors/livelink/build.xml
    incubator/lcf/trunk/modules/connectors/memex/build.xml
    incubator/lcf/trunk/modules/connectors/meridio/build.xml
    incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
    incubator/lcf/trunk/modules/connectors/rss/build.xml
    incubator/lcf/trunk/modules/connectors/sharepoint/build.xml
    incubator/lcf/trunk/modules/connectors/solr/build.xml
    incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
    incubator/lcf/trunk/modules/framework/build.xml
    incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/common/LCFResourceLoader.java
    incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/system/LCF.java
    incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
    incubator/lcf/trunk/modules/framework/scripts/executecommand.sh
    incubator/lcf/trunk/modules/tests/org/apache/lcf/tests/TestBase.java

Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Thu Jul  1 17:25:21 2010
@@ -8,49 +8,34 @@
         <delete dir="framework/lib"/>
         <ant dir="connectors/activedirectory" target="clean"/>
         <delete dir="connectors/activedirectory/lib"/>
-        <delete dir="connectors/activedirectory/war"/>
         <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/solr" target="clean"/>
         <delete dir="connectors/solr/lib"/>
-        <delete dir="connectors/solr/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">
@@ -80,73 +65,60 @@
                 <include name="xercesImpl-lcf.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
+            <fileset dir="lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+            </fileset>
         </copy>
         <ant dir="framework"/>
     </target>
 
     <target name="build-activedirectory-connector" depends="build-framework">
         <mkdir dir="connectors/activedirectory/lib"/>
-        <mkdir dir="connectors/activedirectory/war"/>
         <copy todir="connectors/activedirectory/lib">
             <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/activedirectory/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/activedirectory/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/activedirectory"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/documentum/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/documentum/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/documentum"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/filenet/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/filenet/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/filenet"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/filesystem/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/filesystem/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/filesystem"/>
     </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="framework/lib"/>
             <fileset dir="lib">
@@ -156,88 +128,64 @@
         <copy todir="connectors/gts/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/gts/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/gts"/>
     </target>
 
     <target name="build-jcifs-connector" depends="build-framework">
         <mkdir dir="connectors/jcifs/lib"/>
-        <mkdir dir="connectors/jcifs/war"/>
         <copy todir="connectors/jcifs/lib">
             <fileset dir="framework/lib"/>
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/jcifs/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/jcifs"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/jdbc/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/jdbc/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/jdbc"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/livelink/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/livelink/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/livelink"/>
     </target>
 
     <target name="build-solr-connector" depends="build-framework">
         <mkdir dir="connectors/solr/lib"/>
-        <mkdir dir="connectors/solr/war"/>
         <copy todir="connectors/solr/lib">
             <fileset dir="framework/lib"/>
         </copy>
         <copy todir="connectors/solr/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/solr/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/solr"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/memex/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/memex/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/memex"/>
     </target>
 
     <target name="build-meridio-connector" depends="build-framework">
         <mkdir dir="connectors/meridio/lib"/>
-        <mkdir dir="connectors/meridio/war"/>
         <copy todir="connectors/meridio/lib">
             <fileset dir="lib">
                 <include name="axis*.jar"/>
@@ -254,45 +202,33 @@
         <copy todir="connectors/meridio/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/meridio/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/meridio"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/nulloutput/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/nulloutput/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/nulloutput"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/rss/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/rss/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/rss"/>
     </target>
 
     <target name="build-sharepoint-connector" depends="build-framework">
         <mkdir dir="connectors/sharepoint/lib"/>
-        <mkdir dir="connectors/sharepoint/war"/>
         <copy todir="connectors/sharepoint/lib">
             <fileset dir="lib">
                 <include name="axis*.jar"/>
@@ -307,51 +243,20 @@
         <copy todir="connectors/sharepoint/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/sharepoint/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/sharepoint"/>
     </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="framework/lib"/>
         </copy>
         <copy todir="connectors/webcrawler/lib">
             <fileset dir="framework/build/jar"/>
         </copy>
-        <copy todir="connectors/webcrawler/war">
-            <fileset dir="framework/dist/web/war"/>
-        </copy>
         <ant dir="connectors/webcrawler"/>
     </target>
 
-    <target name="deliver-database-support">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar">
-            <fileset dir="lib">
-                <include name="postgresql*.jar"/>
-                <include name="derby*.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/crawler-ui/WEB-INF/lib">
-            <fileset dir="lib">
-                <include name="postgresql*.jar"/>
-                <include name="derby*.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/authority-service/WEB-INF/lib"/>
-        <copy todir="build/authority-service/WEB-INF/lib">
-            <fileset dir="lib">
-                <include name="postgresql*.jar"/>
-                <include name="derby*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-    
     <target name="deliver-framework" depends="build-framework">
         <mkdir dir="dist/processes"/>
         <copy todir="dist/processes">
@@ -359,12 +264,8 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="framework/dist/web" excludes="**/*.war"/>
+            <fileset dir="framework/dist/web"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unwar src="framework/dist/web/war/lcf-crawler-ui.war" dest="build/crawler-ui"/>
-        <mkdir dir="build/authority-service"/>
-        <unwar src="framework/dist/web/war/lcf-authority-service.war" dest="build/authority-service"/>
     </target>
 
     <target name="calculate-activedirectory-condition" depends="build-activedirectory-connector">
@@ -375,18 +276,10 @@
     </target>
 
     <target name="deliver-activedirectory-connector" depends="calculate-activedirectory-condition" if="activedirectory.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/activedirectory/dist/processes"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/activedirectory/dist/lib"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/activedirectory/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/activedirectory/dist/web/war/lcf-activedirectoryconnector-crawler-ui.iar" dest="build/crawler-ui"/>
-        <mkdir dir="build/authority-service"/>
-        <unjar src="connectors/activedirectory/dist/web/war/lcf-activedirectoryconnector-authority-service.iar" dest="build/authority-service"/>
     </target>
 
     <target name="calculate-documentum-condition" depends="build-documentum-connector">
@@ -397,13 +290,9 @@
     </target>
 
     <target name="deliver-documentum-connector" depends="calculate-documentum-condition" if="documentum.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/documentum/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/documentum/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/documentum/dist/lib"/>
         </copy>
         <mkdir dir="dist/documentum-server-process"/>
         <copy todir="dist/documentum-server-process">
@@ -413,10 +302,6 @@
         <copy todir="dist/documentum-registry-process">
             <fileset dir="connectors/documentum/dist/registry-process"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/documentum/dist/web/war/lcf-documentumconnector-crawler-ui.iar" dest="build/crawler-ui"/>
-        <mkdir dir="build/authority-service"/>
-        <unjar src="connectors/documentum/dist/web/war/lcf-documentumconnector-authority-service.iar" dest="build/authority-service"/>
     </target>
 
     <target name="calculate-filenet-condition" depends="build-filenet-connector">
@@ -427,13 +312,9 @@
     </target>
 
     <target name="deliver-filenet-connector" depends="calculate-filenet-condition" if="filenet.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/filenet/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/filenet/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/filenet/dist/lib"/>
         </copy>
         <mkdir dir="dist/filenet-server-process"/>
         <copy todir="dist/filenet-server-process">
@@ -443,8 +324,6 @@
         <copy todir="dist/filenet-registry-process">
             <fileset dir="connectors/filenet/dist/registry-process"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/filenet/dist/web/war/lcf-filenetconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-filesystem-condition" depends="build-filesystem-connector">
@@ -455,16 +334,10 @@
     </target>
 
     <target name="deliver-filesystem-connector" depends="calculate-filesystem-condition" if="filesystem.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/filesystem/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/filesystem/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/filesystem/dist/lib"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/filesystem/dist/web/war/lcf-filesystemconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-gts-condition" depends="build-gts-connector">
@@ -475,16 +348,10 @@
     </target>
 
     <target name="deliver-gts-connector" depends="calculate-gts-condition" if="gts.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/gts/dist/processes"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/gts/dist/lib"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/gts/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/gts/dist/web/war/lcf-gtsconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-jdbc-condition" depends="build-jdbc-connector">
@@ -495,16 +362,10 @@
     </target>
 
     <target name="deliver-jdbc-connector" depends="calculate-jdbc-condition" if="jdbc.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/jdbc/dist/processes"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/jdbc/dist/lib"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/jdbc/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/jdbc/dist/web/war/lcf-jdbcconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-jcifs-condition" depends="build-jcifs-connector">
@@ -515,16 +376,14 @@
     </target>
 
     <target name="deliver-jcifs-connector" depends="calculate-jcifs-condition" if="jcifs.include">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/jcifs/dist/lib"/>
+        </copy>
         <mkdir dir="dist/processes"/>
         <copy todir="dist/processes">
             <fileset dir="connectors/jcifs/dist/processes"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/jcifs/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/jcifs/dist/web/war/lcf-jcifsconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-livelink-condition" depends="build-livelink-connector">
@@ -535,18 +394,10 @@
     </target>
 
     <target name="deliver-livelink-connector" depends="calculate-livelink-condition" if="livelink.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/livelink/dist/processes"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/livelink/dist/lib"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/livelink/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/livelink/dist/web/war/lcf-livelinkconnector-crawler-ui.iar" dest="build/crawler-ui"/>
-        <mkdir dir="build/authority-service"/>
-        <unjar src="connectors/livelink/dist/web/war/lcf-livelinkconnector-authority-service.iar" dest="build/authority-service"/>
     </target>
 
     <target name="calculate-solr-condition" depends="build-solr-connector">
@@ -557,16 +408,10 @@
     </target>
 
     <target name="deliver-solr-connector" depends="calculate-solr-condition" if="solr.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/solr/dist/processes"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/solr/dist/lib"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/solr/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/solr/dist/web/war/lcf-solrconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-memex-condition" depends="build-memex-connector">
@@ -577,18 +422,10 @@
     </target>
 
     <target name="deliver-memex-connector" depends="calculate-memex-condition" if="memex.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/memex/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/memex/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/memex/dist/lib"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/memex/dist/web/war/lcf-memexconnector-crawler-ui.iar" dest="build/crawler-ui"/>
-        <mkdir dir="build/authority-service"/>
-        <unjar src="connectors/memex/dist/web/war/lcf-memexconnector-authority-service.iar" dest="build/authority-service"/>
     </target>
 
     <target name="calculate-meridio-condition" depends="build-meridio-connector">
@@ -599,22 +436,14 @@
     </target>
 
     <target name="deliver-meridio-connector" depends="calculate-meridio-condition" if="meridio.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/meridio/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/meridio/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/meridio/dist/lib"/>
         </copy>
         <mkdir dir="dist/wsdd"/>
         <copy todir="dist/wsdd">
             <fileset dir="connectors/meridio/dist/wsdd"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/meridio/dist/web/war/lcf-meridioconnector-crawler-ui.iar" dest="build/crawler-ui"/>
-        <mkdir dir="build/authority-service"/>
-        <unjar src="connectors/meridio/dist/web/war/lcf-meridioconnector-authority-service.iar" dest="build/authority-service"/>
     </target>
 
     <target name="calculate-nulloutput-condition" depends="build-nulloutput-connector">
@@ -625,16 +454,10 @@
     </target>
 
     <target name="deliver-nulloutput-connector" depends="calculate-nulloutput-condition" if="nulloutput.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/nulloutput/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/nulloutput/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/nulloutput/dist/lib"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/nulloutput/dist/web/war/lcf-nulloutputconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-rss-condition" depends="build-rss-connector">
@@ -645,16 +468,10 @@
     </target>
 
     <target name="deliver-rss-connector" depends="calculate-rss-condition" if="rss.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/rss/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/rss/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/rss/dist/lib"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/rss/dist/web/war/lcf-rssconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-sharepoint-condition" depends="build-sharepoint-connector">
@@ -665,20 +482,14 @@
     </target>
 
     <target name="deliver-sharepoint-connector" depends="calculate-sharepoint-condition" if="sharepoint.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/sharepoint/dist/processes"/>
-        </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/sharepoint/dist/web" excludes="**/*.iar"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/sharepoint/dist/lib"/>
         </copy>
         <mkdir dir="dist/wsdd"/>
         <copy todir="dist/wsdd">
             <fileset dir="connectors/sharepoint/dist/wsdd"/>
         </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/sharepoint/dist/web/war/lcf-sharepointconnector-crawler-ui.iar" dest="build/crawler-ui"/>
     </target>
 
     <target name="calculate-webcrawler-condition" depends="build-webcrawler-connector">
@@ -689,22 +500,10 @@
     </target>
 
     <target name="deliver-webcrawler-connector" depends="calculate-webcrawler-condition" if="webcrawler.include">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
-            <fileset dir="connectors/webcrawler/dist/processes"/>
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/webcrawler/dist/lib"/>
         </copy>
-        <mkdir dir="dist/web"/>
-        <copy todir="dist/web">
-            <fileset dir="connectors/webcrawler/dist/web" excludes="**/*.iar"/>
-        </copy>
-        <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/webcrawler/dist/web/war/lcf-webconnector-crawler-ui.iar" dest="build/crawler-ui"/>
-    </target>
-
-    <target name="deliver-wars" depends="deliver-database-support,deliver-framework,deliver-activedirectory-connector,deliver-documentum-connector,deliver-filenet-connector,deliver-filesystem-connector,deliver-gts-connector,deliver-livelink-connector,deliver-solr-connector,deliver-memex-connector,deliver-meridio-connector,deliver-nulloutput-connector,deliver-rss-connector,deliver-sharepoint-connector,deliver-webcrawler-connector">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-crawler-ui.war" basedir="build/crawler-ui"/>
-        <jar destfile="dist/web/war/lcf-authority-service.war" basedir="build/authority-service"/>
     </target>
 
     <target name="calculate-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">
@@ -763,7 +562,7 @@
     
     <target name="deliver-proprietary-connectors" depends="deliver-documentum-connector,deliver-filenet-connector,deliver-livelink-connector,deliver-memex-connector,deliver-meridio-connector,deliver-sharepoint-connector"/>
     
-    <target name="all" depends="deliver-database-support,deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors,deliver-wars,run-tests"/>
+    <target name="all" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors,run-tests"/>
 
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/activedirectory/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/activedirectory/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/activedirectory/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/activedirectory/build.xml Thu Jul  1 17:25:21 2010
@@ -30,35 +30,11 @@
         <jar destfile="build/jar/lcf-activedirectory-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-activedirectory-connector.jar"/>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-activedirectory-connector.jar"/>
     </target>
 
-    <target name="webapp-authority-service" depends="jar-connector">
-        <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib" file="build/jar/lcf-activedirectory-connector.jar"/>
-    </target>
-
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-activedirectoryconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="iar-authority-service" depends="webapp-authority-service">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-activedirectoryconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-activedirectory-connector.jar"/>
-    </target>
-
-    <target name="all" depends="processes,iar-crawler-ui,iar-authority-service,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/documentum/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/documentum/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/documentum/build.xml Thu Jul  1 17:25:21 2010
@@ -151,45 +151,9 @@
         <jar destfile="build/jar/lcf-documentum-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-rmistub,jar-interface,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-documentum-connector.jar"/>
-                <include name="lcf-documentum-rmistub.jar"/>
-                <include name="lcf-documentum-interface.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-
-    <target name="webapp-authority-service" depends="jar-rmistub,jar-interface,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-documentum-connector.jar"/>
-                <include name="lcf-documentum-rmistub.jar"/>
-                <include name="lcf-documentum-interface.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-documentumconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="iar-authority-service" depends="webapp-authority-service,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-documentumconnector-authority-service.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-interface,jar-rmistub,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-interface,jar-rmistub,jar-connector,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
             <fileset dir="build/jar">
                 <include name="lcf-documentum-connector.jar"/>
                 <include name="lcf-documentum-rmistub.jar"/>
@@ -217,6 +181,6 @@
         <copy todir="dist/registry-process/jar" file="build/jar/lcf-documentum-registry.jar"/>
     </target>
 
-    <target name="all" depends="processes,server-process,registry-process,iar-crawler-ui,iar-authority-service,doc"/>
+    <target name="all" depends="lib,server-process,registry-process,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filenet/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filenet/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/filenet/build.xml Thu Jul  1 17:25:21 2010
@@ -146,29 +146,9 @@
         <jar destfile="build/jar/lcf-filenet-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-rmistub,jar-interface,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-filenet-connector.jar"/>
-                <include name="lcf-filenet-rmistub.jar"/>
-                <include name="lcf-filenet-interface.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-filenetconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-interface,jar-rmistub,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-interface,jar-rmistub,jar-connector,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
             <fileset dir="build/jar">
                 <include name="lcf-filenet-interface.jar"/>
                 <include name="lcf-filenet-rmistub.jar"/>
@@ -196,6 +176,6 @@
         <copy todir="dist/registry-process/jar" file="build/jar/lcf-filenet-registry.jar"/>
     </target>
 
-    <target name="all" depends="processes,server-process,registry-process,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,server-process,registry-process,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filesystem/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/filesystem/build.xml Thu Jul  1 17:25:21 2010
@@ -31,23 +31,9 @@
         <jar destfile="build/jar/lcf-filesystem-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-filesystem-connector.jar"/>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-filesystem-connector.jar"/>
-    </target>
-
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-filesystemconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-filesystem-connector.jar"/>
     </target>
 
     <target name="compile-tests" depends="compile-connector">
@@ -77,6 +63,6 @@
         </junit>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc,run-tests"/>
+    <target name="all" depends="lib,doc,run-tests"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/gts/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/gts/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/gts/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/gts/build.xml Thu Jul  1 17:25:21 2010
@@ -30,35 +30,16 @@
         <jar destfile="build/jar/lcf-gts-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-gts-connector.jar"/>
-	<copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-	    <fileset dir="lib">
-	        <include name="poi*.jar"/>
-	    </fileset>
-	</copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-gtsconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-gts-connector.jar"/>
-	<copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-gts-connector.jar"/>
+	<copy todir="dist/lib">
 	    <fileset dir="lib">
 	        <include name="poi*.jar"/>
 	    </fileset>
 	</copy>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/build.xml Thu Jul  1 17:25:21 2010
@@ -43,44 +43,13 @@
         <jar destfile="build/jar/lcf-jcifs-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-jcifs-connector.jar"/>
-            </fileset>
-            <fileset dir="jcifs" includes="*.jar"/>
+    <target name="lib" depends="jar-connector,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-jcifs-connector.jar"/>
+        <copy todir="dist/lib">
             <fileset dir="lib">
                 <include name="poi*.jar"/>
             </fileset>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-jcifsconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-        <!-- Copy flag values, too -->
-        <mkdir dir="dist/web/define"/>
-        <copy todir="dist/web/define" file="jcifs.resolveOrder"/>
-        <copy todir="dist/web/define" file="jcifs.smb.client.dfs.strictView"/>
-        <copy todir="dist/web/define" file="jcifs.smb.client.listCount"/>
-        <copy todir="dist/web/define" file="jcifs.smb.client.responseTimeout"/>
-        <copy todir="dist/web/define" file="jcifs.smb.client.soTimeout"/>
-    </target>
-
-    <target name="processes" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-jcifs-connector.jar"/>
-        <copy todir="dist/processes/jar">
-            <fileset dir="lib">
-                <include name="poi*.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="dist/processes/jar">
             <fileset dir="jcifs" includes="*.jar"/>
         </copy>
         <!-- Copy flag values, too -->
@@ -92,6 +61,6 @@
         <copy todir="dist/processes/define" file="jcifs.smb.client.soTimeout"/>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/build.xml Thu Jul  1 17:25:21 2010
@@ -30,31 +30,14 @@
         <jar destfile="build/jar/lcf-jdbc-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-jdbc-connector.jar"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="jdbc-drivers" includes="*.jar"/>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-jdbcconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-jdbc-connector.jar"/>
-        <copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-jdbc-connector.jar"/>
+        <copy todir="dist/lib">
             <fileset dir="jdbc-drivers" includes="*.jar"/>
         </copy>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/build.xml Thu Jul  1 17:25:21 2010
@@ -43,44 +43,14 @@
         <jar destfile="build/jar/lcf-livelink-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
+    <target name="lib" depends="jar-connector,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
 	    <fileset dir="build/jar" includes="*.jar"/>
 	    <fileset dir="lapi" includes="*.jar"/>
 	</copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
     </target>
 
-    <target name="webapp-authority-service" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib">
-	    <fileset dir="build/jar" includes="*.jar"/>
-	    <fileset dir="lapi" includes="*.jar"/>
-	</copy>
-    </target>
-
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-livelinkconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="iar-authority-service" depends="webapp-authority-service,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-livelinkconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
-    </target>
-
-    <target name="processes" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar">
-	    <fileset dir="build/jar" includes="*.jar"/>
-	    <fileset dir="lapi" includes="*.jar"/>
-	</copy>
-    </target>
-
-    <target name="all" depends="processes,iar-crawler-ui,iar-authority-service,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/memex/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/memex/build.xml Thu Jul  1 17:25:21 2010
@@ -43,44 +43,14 @@
         <jar destfile="build/jar/lcf-memex-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-memex-connector.jar"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="mxie-java" includes="*.jar"/>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-
-    <target name="webapp-authority-service" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib" file="build/jar/lcf-memex-connector.jar"/>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib">
-            <fileset dir="mxie-java" includes="*.jar"/>
-        </copy>
-    </target>
-
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-memexconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="iar-authority-service" depends="webapp-authority-service,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-memexconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
-    </target>
-
-    <target name="processes" depends="jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-memex-connector.jar"/>
-        <copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-connector,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-memex-connector.jar"/>
+        <copy todir="dist/lib">
             <fileset dir="mxie-java" includes="*.jar"/>
         </copy>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,iar-authority-service,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/build.xml Thu Jul  1 17:25:21 2010
@@ -155,66 +155,14 @@
         <jar destfile="build/jar/lcf-meridio-xsdstub.jar" basedir="build/xsdclasses"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector,jar-wsdls,jar-xsds,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-meridio-connector.jar"/>
-                <include name="lcf-meridio-wsdlstub.jar"/>
-                <include name="lcf-meridio-xsdstub.jar"/>
-            </fileset>
-            <fileset dir="lib">
-                <include name="axis*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="castor*.jar"/>
-                <include name="geronimo-activation_1.1_spec*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-
-    <target name="webapp-authority-service" depends="jar-connector,jar-wsdls,jar-xsds,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
-        <copy todir="build/webapp/authority-service/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-meridio-connector.jar"/>
-                <include name="lcf-meridio-wsdlstub.jar"/>
-                <include name="lcf-meridio-xsdstub.jar"/>
-            </fileset>
-            <fileset dir="lib">
-                <include name="axis*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="commons-discovery*.jar"/>
-                <include name="castor*.jar"/>
-                <include name="geronimo-activation_1.1_spec*.jar"/>
-                <include name="geronimo-javamail_1.4_spec*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
     <target name="wsdd" depends="precompile-check" if="canBuild">
         <mkdir dir="dist/wsdd"/>
         <copy todir="dist/wsdd" file="meridio-client-config.wsdd"/>
     </target>
     
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-meridioconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="iar-authority-service" depends="webapp-authority-service,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-meridioconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
-    </target>
-
-    <target name="processes" depends="jar-connector,jar-wsdls,jar-xsds,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-connector,jar-wsdls,jar-xsds,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
             <fileset dir="build/jar">
                 <include name="lcf-meridio-connector.jar"/>
                 <include name="lcf-meridio-wsdlstub.jar"/>
@@ -231,6 +179,6 @@
         </copy>
     </target>
 
-    <target name="all" depends="processes,wsdd,iar-crawler-ui,iar-authority-service,doc"/>
+    <target name="all" depends="lib,wsdd,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/nulloutput/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/nulloutput/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/nulloutput/build.xml Thu Jul  1 17:25:21 2010
@@ -30,25 +30,11 @@
         <jar destfile="build/jar/lcf-nulloutput-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-nulloutput-connector.jar"/>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-nulloutputconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-nulloutput-connector.jar"/>
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-nulloutput-connector.jar"/>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/rss/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/rss/build.xml Thu Jul  1 17:25:21 2010
@@ -30,25 +30,11 @@
         <jar destfile="build/jar/lcf-rss-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-rss-connector.jar"/>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-rssconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-rss-connector.jar"/>
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-rss-connector.jar"/>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/sharepoint/build.xml Thu Jul  1 17:25:21 2010
@@ -117,38 +117,14 @@
         <jar destfile="build/jar/lcf-sharepoint-wsdlstub.jar" basedir="build/wsdlclasses"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector,jar-wsdls,precompile-check" if="canBuild">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="build/jar">
-                <include name="lcf-sharepoint-connector.jar"/>
-                <include name="lcf-sharepoint-wsdlstub.jar"/>
-            </fileset>
-            <fileset dir="lib">
-                <include name="axis*.jar"/>
-                <include name="wsdl4j*.jar"/>
-                <include name="commons-discovery*.jar"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-
     <target name="wsdd" depends="precompile-check" if="canBuild">
         <mkdir dir="dist/wsdd"/>
         <copy todir="dist/wsdd" file="sharepoint-client-config.wsdd"/>
     </target>
 
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-sharepointconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector,jar-wsdls,precompile-check" if="canBuild">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar">
+    <target name="lib" depends="jar-connector,jar-wsdls,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
             <fileset dir="build/jar">
                 <include name="lcf-sharepoint-connector.jar"/>
                 <include name="lcf-sharepoint-wsdlstub.jar"/>
@@ -161,6 +137,6 @@
         </copy>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,wsdd,doc"/>
+    <target name="all" depends="lib,wsdd,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/solr/build.xml Thu Jul  1 17:25:21 2010
@@ -30,25 +30,11 @@
         <jar destfile="build/jar/lcf-solr-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-solr-connector.jar"/>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-solrconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-solr-connector.jar"/>
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-solr-connector.jar"/>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/build.xml Thu Jul  1 17:25:21 2010
@@ -30,25 +30,11 @@
         <jar destfile="build/jar/lcf-web-connector.jar" basedir="build/connector/classes"/>
     </target>
 
-    <target name="webapp-crawler-ui" depends="jar-connector">
-        <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-web-connector.jar"/>
-        <mkdir dir="build/webapp/crawler-ui"/>
-        <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
-        </copy>
-    </target>
-    
-    <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web/war"/>
-        <jar destfile="dist/web/war/lcf-webconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
-    </target>
-
-    <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes/jar"/>
-        <copy todir="dist/processes/jar" file="build/jar/lcf-web-connector.jar"/>
+    <target name="lib" depends="jar-connector">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/lcf-web-connector.jar"/>
     </target>
 
-    <target name="all" depends="processes,iar-crawler-ui,doc"/>
+    <target name="all" depends="lib,doc"/>
     
 </project>

Modified: incubator/lcf/trunk/modules/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/build.xml?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/build.xml (original)
+++ incubator/lcf/trunk/modules/framework/build.xml Thu Jul  1 17:25:21 2010
@@ -155,12 +155,15 @@
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="log4j*.jar"/>
-                <include name="postgresql*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl-lcf.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
+            <fileset dir="lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+            </fileset>
         </copy>
         <copy todir="build/webapp/authority-service/WEB-INF/lib">
             <fileset dir="build/jar">
@@ -190,12 +193,15 @@
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="log4j*.jar"/>
-                <include name="postgresql*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl-lcf.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
+            <fileset dir="lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+            </fileset>
         </copy>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="build/jar">
@@ -239,13 +245,16 @@
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="log4j*.jar"/>
-                <include name="postgresql*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl-lcf.jar"/>
                 <include name="xml-apis*.jar"/>
             </fileset>
+            <fileset dir="lib">
+                <include name="postgresql*.jar"/>
+                <include name="derby*.jar"/>
+            </fileset>
         </copy>
         <copy todir="dist/processes/jar">
             <fileset dir="build/jar">

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/common/LCFResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/common/LCFResourceLoader.java?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/common/LCFResourceLoader.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/common/LCFResourceLoader.java Thu Jul  1 17:25:21 2010
@@ -181,7 +181,7 @@ public class LCFResourceLoader
         }
       }
       else
-        throw new LCFException("Supposed directory '"+base.toString()+"' is either not readable, or is not a directory");
+        throw new LCFException("Supposed directory '"+base.toString()+"' is either not a directory, or is unreadable.");
       i++;
     }
   }

Modified: incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/system/LCF.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/system/LCF.java?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/system/LCF.java (original)
+++ incubator/lcf/trunk/modules/framework/core/org/apache/lcf/core/system/LCF.java Thu Jul  1 17:25:21 2010
@@ -132,8 +132,6 @@ public class LCF
 
       try
       {
-        // Initialize resource loader
-        resourceLoader = new LCFResourceLoader(System.getProperty("user.dir"),Thread.currentThread().getContextClassLoader());
         
         // Get system properties
         java.util.Properties props = System.getProperties();
@@ -147,6 +145,12 @@ public class LCF
           configPath = configPath.replace('\\', '/');
           propertyFilePath = new File(configPath,"properties.xml").toString();
         }
+
+        // Initialize resource loader.
+        // To do this, we need the "working directory".  But we cannot use the actual system cwd, because different LCF processes will have different ones.
+        // So, instead, we use the location of the property file itself, and call that the "working directory".
+        File wd = new File(propertyFilePath).getAbsoluteFile().getParentFile();
+        resourceLoader = new LCFResourceLoader(wd.toString(),Thread.currentThread().getContextClassLoader());
         
         // Read configuration
         localConfiguration = new ConfigParams();

Modified: incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/executecommand.bat?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/scripts/executecommand.bat (original)
+++ incubator/lcf/trunk/modules/framework/scripts/executecommand.bat Thu Jul  1 17:25:21 2010
@@ -1,7 +1,7 @@
 @echo off
 rem check that JAVA_HOME and LCF_HOME are set
 if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
-if not exist "%LCF_HOME%\properties.ini" goto nolcfhome
+if not exist "%LCF_HOME%\properties.xml" goto nolcfhome
 rem save existing path here
 set OLDDIR=%CD%
 cd "%LCF_HOME%\processes"
@@ -11,7 +11,7 @@ set JAVADEFINES=
 for %%g in (define/*) do call script\setdefine.bat %%g
 rem restore old path here
 cd "%OLDDIR%"
-"%JAVA_HOME%\bin\java" "-Dorg.apache.lcf.configfile=%LCF_HOME%\properties.ini" %JAVADEFINES% -classpath "%CLASSPATH%" %*
+"%JAVA_HOME%\bin\java" "-Dorg.apache.lcf.configfile=%LCF_HOME%\properties.xml" %JAVADEFINES% -classpath "%CLASSPATH%" %*
 goto done
 :nojavahome
 echo Environment variable JAVA_HOME is not set properly.

Modified: incubator/lcf/trunk/modules/framework/scripts/executecommand.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/executecommand.sh?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/scripts/executecommand.sh (original)
+++ incubator/lcf/trunk/modules/framework/scripts/executecommand.sh Thu Jul  1 17:25:21 2010
@@ -8,7 +8,7 @@ fi
 
 #Make sure environment variables are properly set
 if [ -e "$JAVA_HOME"/bin/java ] ; then
-    if [ -f "$LCF_HOME"/properties.ini ] ; then
+    if [ -f "$LCF_HOME"/properties.xml ] ; then
     
         # Build the classpath
         CLASSPATH=""
@@ -21,7 +21,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
         done
         
         # Build the defines
-        DEFINES="-Dorg.apache.lcf.configfile=$LCF_HOME/properties.ini"
+        DEFINES="-Dorg.apache.lcf.configfile=$LCF_HOME/properties.xml"
         if [ -e "$LCF_HOME/processes/define" ] ; then
             for filename in $(ls -1 "$LCF_HOME"/processes/define) ; do
                 DEFINEVAR=-D"$filename"=$(cat "$LCF_HOME"/processes/define/"$filename")

Modified: incubator/lcf/trunk/modules/tests/org/apache/lcf/tests/TestBase.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/tests/org/apache/lcf/tests/TestBase.java?rev=959730&r1=959729&r2=959730&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/tests/org/apache/lcf/tests/TestBase.java (original)
+++ incubator/lcf/trunk/modules/tests/org/apache/lcf/tests/TestBase.java Thu Jul  1 17:25:21 2010
@@ -111,41 +111,6 @@ public class TestBase extends org.apache
       throw currentException;
   }
   
-  @Test
-  public void sanityCheck()
-    throws Exception
-  {
-    // Hey, we were able to install the file system connector etc.
-    // Now, create a local test job and run it.
-    IThreadContext tc = ThreadContextFactory.make();
-    ILockManager lockManager = LockManagerFactory.make(tc);
-    lockManager.setGlobalFlag(agentShutdownSignal);
-
-    // Create a basic file system connection, and save it.
-    IRepositoryConnectionManager mgr = RepositoryConnectionManagerFactory.make(tc);
-    IRepositoryConnection conn = mgr.create();
-    conn.setName("File Connection");
-    conn.setDescription("File Connection");
-    conn.setClassName("org.apache.lcf.crawler.connectors.filesystem.FileConnector");
-    conn.setMaxConnections(100);
-    // Now, save
-    mgr.save(conn);
-    
-    // Create a basic null output connection, and save it.
-    IOutputConnectionManager outputMgr = OutputConnectionManagerFactory.make(tc);
-    IOutputConnection outputConn = outputMgr.create();
-    outputConn.setName("Null Connection");
-    outputConn.setDescription("Null Connection");
-    outputConn.setClassName("org.apache.lcf.agents.output.nullconnector.NullConnector");
-    outputConn.setMaxConnections(100);
-    // Now, save
-    outputMgr.save(outputConn);
-
-    // MHL
-    
-    // Cleanup is automatic by the base class, so we can feel free to leave jobs and connections lying around.
-  }
-  
   protected static class DaemonThread extends Thread
   {
     protected Exception daemonException = null;



Mime
View raw message