Return-Path: 
 <connectors-commits-return-234-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: (qmail 6669 invoked from network); 25 Apr 2010 21:46:24 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 25 Apr 2010 21:46:24 -0000
Received: (qmail 81994 invoked by uid 500); 25 Apr 2010 21:46:24 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 81956 invoked by uid 500); 25 Apr 2010 21:46:23 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 81949 invoked by uid 99); 25 Apr 2010 21:46:23 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Apr 2010 21:46:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Apr 2010 21:46:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F1EB5238896F; Sun, 25 Apr 2010 21:45:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r937894 - in /incubator/lcf/trunk/modules: ./
 connectors/activedirectory/ connectors/documentum/ connectors/filenet/
 connectors/filesystem/ connectors/gts/ connectors/jcifs/ connectors/jdbc/
 connectors/livelink/ connectors/memex/ connectors...
Date: Sun, 25 Apr 2010 21:45:32 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100425214532.F1EB5238896F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Sun Apr 25 21:45:31 2010
New Revision: 937894

URL: http://svn.apache.org/viewvc?rev=937894&view=rev
Log:
Revamp build process dist targets to work better with automated run scripts, by separating jars from defines in a subfolder.

Added:
    incubator/lcf/trunk/modules/framework/scripts/
    incubator/lcf/trunk/modules/framework/scripts/executecommand.bat   (with props)
    incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat   (with props)
    incubator/lcf/trunk/modules/framework/scripts/setdefine.bat   (with props)
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

Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Sun Apr 25 21:45:31 2010
@@ -92,7 +92,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/activedirectory/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/activedirectory"/>
     </target>
@@ -107,7 +107,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/documentum/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/documentum"/>
     </target>
@@ -122,7 +122,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/filenet/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/filenet"/>
     </target>
@@ -137,7 +137,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/filesystem/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/filesystem"/>
     </target>
@@ -155,7 +155,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/gts/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/gts"/>
     </target>
@@ -168,7 +168,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/jcifs/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/jcifs"/>
     </target>
@@ -183,7 +183,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/jdbc/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/jdbc"/>
     </target>
@@ -198,7 +198,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/livelink/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/livelink"/>
     </target>
@@ -213,7 +213,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/solr/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/solr"/>
     </target>
@@ -228,7 +228,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/memex/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/memex"/>
     </target>
@@ -253,7 +253,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/meridio/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/meridio"/>
     </target>
@@ -268,7 +268,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/nulloutput/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/nulloutput"/>
     </target>
@@ -283,7 +283,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/rss/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/rss"/>
     </target>
@@ -306,7 +306,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/sharepoint/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/sharepoint"/>
     </target>
@@ -321,7 +321,7 @@
             <fileset dir="framework/build/jar"/>
         </copy>
         <copy todir="connectors/webcrawler/war">
-            <fileset dir="framework/dist/web"/>
+            <fileset dir="framework/dist/web/war"/>
         </copy>
         <ant dir="connectors/webcrawler"/>
     </target>
@@ -333,12 +333,12 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="framework/dist/web" excludes="*.war"/>
+            <fileset dir="framework/dist/web" excludes="**/*.war"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unwar src="framework/dist/web/lcf-crawler-ui.war" dest="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/lcf-authority-service.war" dest="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">
@@ -355,12 +355,12 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/activedirectory/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/activedirectory/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/activedirectory/dist/web/lcf-activedirectoryconnector-crawler-ui.iar" dest="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/lcf-activedirectoryconnector-authority-service.iar" dest="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">
@@ -377,7 +377,7 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/documentum/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/documentum/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="dist/documentum-server-process"/>
         <copy todir="dist/documentum-server-process">
@@ -388,9 +388,9 @@
             <fileset dir="connectors/documentum/dist/registry-process"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/documentum/dist/web/lcf-documentumconnector-crawler-ui.iar" dest="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/lcf-documentumconnector-authority-service.iar" dest="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">
@@ -407,7 +407,7 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/filenet/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/filenet/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="dist/filenet-server-process"/>
         <copy todir="dist/filenet-server-process">
@@ -418,7 +418,7 @@
             <fileset dir="connectors/filenet/dist/registry-process"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/filenet/dist/web/lcf-filenetconnector-crawler-ui.iar" dest="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">
@@ -435,10 +435,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/filesystem/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/filesystem/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/filesystem/dist/web/lcf-filesystemconnector-crawler-ui.iar" dest="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">
@@ -455,10 +455,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/gts/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/gts/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/gts/dist/web/lcf-gtsconnector-crawler-ui.iar" dest="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">
@@ -475,10 +475,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/jdbc/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/jdbc/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/jdbc/dist/web/lcf-jdbcconnector-crawler-ui.iar" dest="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">
@@ -495,10 +495,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/jcifs/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/jcifs/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/jcifs/dist/web/lcf-jcifsconnector-crawler-ui.iar" dest="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">
@@ -515,12 +515,12 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/livelink/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/livelink/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/livelink/dist/web/lcf-livelinkconnector-crawler-ui.iar" dest="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/lcf-livelinkconnector-authority-service.iar" dest="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">
@@ -537,10 +537,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/solr/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/solr/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/solr/dist/web/lcf-solrconnector-crawler-ui.iar" dest="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">
@@ -557,12 +557,12 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/memex/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/memex/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/memex/dist/web/lcf-memexconnector-crawler-ui.iar" dest="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/lcf-memexconnector-authority-service.iar" dest="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">
@@ -579,16 +579,16 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/meridio/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/meridio/dist/web" excludes="**/*.iar"/>
         </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/lcf-meridioconnector-crawler-ui.iar" dest="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/lcf-meridioconnector-authority-service.iar" dest="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">
@@ -605,10 +605,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/nulloutput/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/nulloutput/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/nulloutput/dist/web/lcf-nulloutputconnector-crawler-ui.iar" dest="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">
@@ -625,10 +625,10 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/rss/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/rss/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/rss/dist/web/lcf-rssconnector-crawler-ui.iar" dest="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">
@@ -645,14 +645,14 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/sharepoint/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/sharepoint/dist/web" excludes="**/*.iar"/>
         </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/lcf-sharepointconnector-crawler-ui.iar" dest="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">
@@ -669,16 +669,16 @@
         </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
-            <fileset dir="connectors/webcrawler/dist/web" excludes="*.iar"/>
+            <fileset dir="connectors/webcrawler/dist/web" excludes="**/*.iar"/>
         </copy>
         <mkdir dir="build/crawler-ui"/>
-        <unjar src="connectors/webcrawler/dist/web/lcf-webconnector-crawler-ui.iar" dest="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-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"/>
-        <jar destfile="dist/web/lcf-crawler-ui.war" basedir="build/crawler-ui"/>
-        <jar destfile="dist/web/lcf-authority-service.war" basedir="build/authority-service"/>
+        <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="deliver-open-connectors" depends="deliver-activedirectory-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-jdbc-connector"/>

Modified: incubator/lcf/trunk/modules/connectors/activedirectory/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/activedirectory/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/activedirectory/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/activedirectory/build.xml Sun Apr 25 21:45:31 2010
@@ -104,18 +104,18 @@
     </target>
 
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-activedirectoryconnector-crawler-ui.iar" basedir="build/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"/>
-        <jar destfile="dist/web/lcf-activedirectoryconnector-authority-service.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-activedirectory-connector.jar"/>
+        <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"/>

Modified: incubator/lcf/trunk/modules/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/documentum/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/documentum/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/documentum/build.xml Sun Apr 25 21:45:31 2010
@@ -242,18 +242,18 @@
     </target>
 
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-documentumconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <jar destfile="dist/web/lcf-documentumconnector-authority-service.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="build/jar">
                 <include name="lcf-documentum-connector.jar"/>
                 <include name="lcf-documentum-rmistub.jar"/>
@@ -263,11 +263,11 @@
     </target>
 
     <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,precompile-check" if="canBuild">
-        <mkdir dir="dist/server-process"/>
-        <copy todir="dist/server-process">
+        <mkdir dir="dist/server-process/jar"/>
+        <copy todir="dist/server-process/jar">
             <fileset dir="dfc" includes="*.jar"/>
         </copy>
-        <copy todir="dist/server-process">
+        <copy todir="dist/server-process/jar">
             <fileset dir="build/jar">
                 <include name="lcf-documentum-interface.jar"/>
                 <include name="lcf-documentum-rmiskel.jar"/>
@@ -277,8 +277,8 @@
     </target>
 
     <target name="registry-process" depends="jar-registry,precompile-check" if="canBuild">
-        <mkdir dir="dist/registry-process"/>
-        <copy todir="dist/registry-process" file="build/jar/lcf-documentum-registry.jar"/>
+        <mkdir dir="dist/registry-process/jar"/>
+        <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"/>

Modified: incubator/lcf/trunk/modules/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filenet/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filenet/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/filenet/build.xml Sun Apr 25 21:45:31 2010
@@ -226,13 +226,13 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-filenetconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="build/jar">
                 <include name="lcf-filenet-interface.jar"/>
                 <include name="lcf-filenet-rmistub.jar"/>
@@ -242,11 +242,11 @@
     </target>
 
     <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,precompile-check" if="canBuild">
-        <mkdir dir="dist/server-process"/>
-        <copy todir="dist/server-process">
+        <mkdir dir="dist/server-process/jar"/>
+        <copy todir="dist/server-process/jar">
             <fileset dir="filenet-api" includes="*.jar"/>
         </copy>
-        <copy todir="dist/server-process">
+        <copy todir="dist/server-process/jar">
             <fileset dir="build/jar">
                 <include name="lcf-filenet-interface.jar"/>
                 <include name="lcf-filenet-rmiskel.jar"/>
@@ -256,8 +256,8 @@
     </target>
 
     <target name="registry-process" depends="jar-registry,precompile-check" if="canBuild">
-        <mkdir dir="dist/registry-process"/>
-        <copy todir="dist/registry-process" file="build/jar/lcf-filenet-registry.jar"/>
+        <mkdir dir="dist/registry-process/jar"/>
+        <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"/>

Modified: incubator/lcf/trunk/modules/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filesystem/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/filesystem/build.xml Sun Apr 25 21:45:31 2010
@@ -99,13 +99,13 @@
     </target>
     
     <target name="processes" depends="jar-connector">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes" file="build/jar/lcf-filesystem-connector.jar"/>
+        <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"/>
-        <jar destfile="dist/web/lcf-filesystemconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <mkdir dir="dist/web/war"/>
+        <jar destfile="dist/web/war/lcf-filesystemconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/gts/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/gts/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/gts/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/gts/build.xml Sun Apr 25 21:45:31 2010
@@ -99,13 +99,13 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-gtsconnector-crawler-ui.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-gts-connector.jar"/>
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-gts-connector.jar"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/build.xml Sun Apr 25 21:45:31 2010
@@ -126,33 +126,35 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-jcifsconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <mkdir dir="dist/web/jar"/>
+        <jar destfile="dist/web/jar/lcf-jcifsconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
         <!-- Copy flag values, too -->
-        <copy todir="dist/web" file="jcifs.resolveOrder"/>
-        <copy todir="dist/web" file="jcifs.smb.client.dfs.strictView"/>
-        <copy todir="dist/web" file="jcifs.smb.client.listCount"/>
-        <copy todir="dist/web" file="jcifs.smb.client.responseTimeout"/>
-        <copy todir="dist/web" file="jcifs.smb.client.soTimeout"/>
+        <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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-jcifs-connector.jar"/>
-        <copy todir="dist/processes">
+        <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">
+        <copy todir="dist/processes/jar">
             <fileset dir="jcifs" includes="*.jar"/>
         </copy>
         <!-- Copy flag values, too -->
-        <copy todir="dist/processes" file="jcifs.resolveOrder"/>
-        <copy todir="dist/processes" file="jcifs.smb.client.dfs.strictView"/>
-        <copy todir="dist/processes" file="jcifs.smb.client.listCount"/>
-        <copy todir="dist/processes" file="jcifs.smb.client.responseTimeout"/>
-        <copy todir="dist/processes" file="jcifs.smb.client.soTimeout"/>
+        <mkdir dir="dist/processes/define"/>
+        <copy todir="dist/processes/define" file="jcifs.resolveOrder"/>
+        <copy todir="dist/processes/define" file="jcifs.smb.client.dfs.strictView"/>
+        <copy todir="dist/processes/define" file="jcifs.smb.client.listCount"/>
+        <copy todir="dist/processes/define" file="jcifs.smb.client.responseTimeout"/>
+        <copy todir="dist/processes/define" file="jcifs.smb.client.soTimeout"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/build.xml Sun Apr 25 21:45:31 2010
@@ -102,14 +102,14 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-jdbcconnector-crawler-ui.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-jdbc-connector.jar"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-jdbc-connector.jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="jdbc-drivers" includes="*.jar"/>
         </copy>
     </target>

Modified: incubator/lcf/trunk/modules/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/build.xml Sun Apr 25 21:45:31 2010
@@ -123,18 +123,18 @@
     </target>
 
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-livelinkconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <jar destfile="dist/web/lcf-livelinkconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
+        <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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-livelink-connector.jar"/>
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-livelink-connector.jar"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,iar-authority-service,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/memex/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/memex/build.xml Sun Apr 25 21:45:31 2010
@@ -129,19 +129,19 @@
     </target>
 
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-memexconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <jar destfile="dist/web/lcf-memexconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
+        <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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-memex-connector.jar"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-memex-connector.jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="mxie-java" includes="*.jar"/>
         </copy>
     </target>

Modified: incubator/lcf/trunk/modules/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/build.xml Sun Apr 25 21:45:31 2010
@@ -266,18 +266,18 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-meridioconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <jar destfile="dist/web/lcf-meridioconnector-authority-service.iar" basedir="build/webapp/authority-service"/>
+        <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"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="build/jar">
                 <include name="lcf-meridio-connector.jar"/>
                 <include name="lcf-meridio-wsdlstub.jar"/>

Modified: incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/nulloutput/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/nulloutput/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/nulloutput/build.xml Sun Apr 25 21:45:31 2010
@@ -99,13 +99,13 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-nulloutputconnector-crawler-ui.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-nulloutput-connector.jar"/>
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-nulloutput-connector.jar"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/rss/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/rss/build.xml Sun Apr 25 21:45:31 2010
@@ -99,13 +99,13 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-rssconnector-crawler-ui.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-rss-connector.jar"/>
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-rss-connector.jar"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/sharepoint/build.xml Sun Apr 25 21:45:31 2010
@@ -203,13 +203,13 @@
     </target>
 
     <target name="iar-crawler-ui" depends="webapp-crawler-ui,precompile-check" if="canBuild">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-sharepointconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+        <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"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="build/jar">
                 <include name="lcf-sharepoint-connector.jar"/>
                 <include name="lcf-sharepoint-wsdlstub.jar"/>

Modified: incubator/lcf/trunk/modules/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/solr/build.xml Sun Apr 25 21:45:31 2010
@@ -99,13 +99,13 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-solrconnector-crawler-ui.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-solr-connector.jar"/>
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-solr-connector.jar"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/build.xml Sun Apr 25 21:45:31 2010
@@ -99,13 +99,13 @@
     </target>
     
     <target name="iar-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <jar destfile="dist/web/lcf-webconnector-crawler-ui.iar" basedir="build/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"/>
-        <copy todir="dist/processes" file="build/jar/lcf-web-connector.jar"/>
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar" file="build/jar/lcf-web-connector.jar"/>
     </target>
 
     <target name="all" depends="processes,iar-crawler-ui,doc"/>

Modified: incubator/lcf/trunk/modules/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/build.xml?rev=937894&r1=937893&r2=937894&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/build.xml (original)
+++ incubator/lcf/trunk/modules/framework/build.xml Sun Apr 25 21:45:31 2010
@@ -218,18 +218,18 @@
     </target>
     
     <target name="war-authority-service" depends="webapp-authority-service">
-        <mkdir dir="dist/web"/>
-        <war destfile="dist/web/lcf-authority-service.war" webxml="authority-service/WEB-INF/web.xml" basedir="build/webapp/authority-service"/>
+        <mkdir dir="dist/web/war"/>
+        <war destfile="dist/web/war/lcf-authority-service.war" webxml="authority-service/WEB-INF/web.xml" basedir="build/webapp/authority-service"/>
     </target>
     
     <target name="war-crawler-ui" depends="webapp-crawler-ui">
-        <mkdir dir="dist/web"/>
-        <war destfile="dist/web/lcf-crawler-ui.war" webxml="crawler-ui/WEB-INF/web.xml" basedir="build/webapp/crawler-ui"/>
+        <mkdir dir="dist/web/war"/>
+        <war destfile="dist/web/war/lcf-crawler-ui.war" webxml="crawler-ui/WEB-INF/web.xml" basedir="build/webapp/crawler-ui"/>
     </target>
 
     <target name="processes" depends="jar-core,jar-agents,jar-pull-agent">
-        <mkdir dir="dist/processes"/>
-        <copy todir="dist/processes">
+        <mkdir dir="dist/processes/jar"/>
+        <copy todir="dist/processes/jar">
             <fileset dir="lib">
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
@@ -248,13 +248,17 @@
                 <include name="xml-apis*.jar"/>
             </fileset>
         </copy>
-        <copy todir="dist/processes">
+        <copy todir="dist/processes/jar">
             <fileset dir="build/jar">
                 <include name="lcf-core.jar"/>
                 <include name="lcf-agents.jar"/>
                 <include name="lcf-pull-agent.jar"/>
             </fileset>
         </copy>
+        <mkdir dir="dist/processes/script"/>
+        <copy todir="dist/processes/script">
+            <fileset dir="scripts">
+        </copy>
     </target>
 
     <target name="all" depends="processes,war-authority-service,war-crawler-ui,doc"/>

Added: incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/executecommand.bat?rev=937894&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/scripts/executecommand.bat (added)
+++ incubator/lcf/trunk/modules/framework/scripts/executecommand.bat Sun Apr 25 21:45:31 2010
@@ -0,0 +1,12 @@
+@echo off
+rem check that JAVA_HOME and LCF_HOME are set
+rem save existing path here
+set OLDDIR=%CD%
+cd %LCF_HOME%\processes
+set CLASSPATH=.
+for %%f in (jar/*) do call script\setclasspath.bat %%f
+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% %1 %2 %3 %4 %5 %6 %7 %8 %9

Propchange: incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat?rev=937894&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat (added)
+++ incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat Sun Apr 25 21:45:31 2010
@@ -0,0 +1 @@
+set CLASSPATH=%CLASSPATH%;%LCF_HOME%\processes\jar\%1

Propchange: incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/lcf/trunk/modules/framework/scripts/setdefine.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/setdefine.bat?rev=937894&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/scripts/setdefine.bat (added)
+++ incubator/lcf/trunk/modules/framework/scripts/setdefine.bat Sun Apr 25 21:45:31 2010
@@ -0,0 +1,2 @@
+
+for /f "delims=" %%a in ('type %LCF_HOME%\processes\define\%1') do set JAVADEFINES=-D%1=%%a %JAVADEFINES%

Propchange: incubator/lcf/trunk/modules/framework/scripts/setdefine.bat
------------------------------------------------------------------------------
    svn:eol-style = native