Return-Path: 
 <connectors-commits-return-2526-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4A2FA9A2D
	for <apmail-incubator-connectors-commits-archive@minotaur.apache.org>;
 Sat, 31 Mar 2012 14:23:53 +0000 (UTC)
Received: (qmail 95961 invoked by uid 500); 31 Mar 2012 14:23:53 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 95906 invoked by uid 500); 31 Mar 2012 14:23:53 -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 95898 invoked by uid 99); 31 Mar 2012 14:23:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 14:23:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 31 Mar 2012 14:23:50 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 157BC2388A56;
	Sat, 31 Mar 2012 14:23:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1307812 [3/3] - in
 /incubator/lcf/branches/CONNECTORS-437: ./
 build.xml connectors/jcifs/build.xml framework/build.xml
 framework/crawler-ui/src/main/webapp/WEB-INF/lib/ lib/
Date: Sat, 31 Mar 2012 14:23:28 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120331142329.157BC2388A56@eris.apache.org>

Modified: incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml?rev=1307812&r1=1307811&r2=1307812&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/jcifs/build.xml Sat Mar 31 14:23:28 2012
@@ -51,7 +51,10 @@
 
     <target name="download-cleanup">
         <delete>
-            <fileset dir="lib-proprietary" excludes="README.txt"/>
+            <fileset dir="lib-proprietary">
+                <exclude name="README.txt"/>
+                <exclude name="*.diffs"/>
+            </fileset>
         </delete>
     </target>
     

Modified: incubator/lcf/branches/CONNECTORS-437/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/build.xml?rev=1307812&r1=1307811&r2=1307812&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/build.xml Sat Mar 31 14:23:28 2012
@@ -189,7 +189,7 @@
         </taskdef > 
         <!-- Compile jsp's to java -->
         <mkdir dir="build/crawler-ui/java"/>
-        <jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="crawler-ui/src/main/webapp/WEB-INF/web-generated.xml" outputDir="build/crawler-ui/java" /> 
+        <jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="build/crawler-ui/web-generated.xml" outputDir="build/crawler-ui/java" /> 
         <!-- Compile java classes -->
         <mkdir dir="build/crawler-ui/classes"/>
         <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -200,8 +200,9 @@
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
                 <pathelement location="build/pull-agent/classes"/>
-                <fileset dir="crawler-ui/src/main/webapp/WEB-INF/lib">
-                    <include name="*.jar"/> 
+                <fileset dir="../lib">
+                    <include name="jstl-api*.jar"/>
+                    <include name="jstl-impl*.jar"/>
                 </fileset>
             </classpath>
 
@@ -409,8 +410,9 @@
     <target name="webapp-crawler-ui" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
         <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
         <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
-            <fileset dir="crawler-ui/src/main/webapp/WEB-INF/lib">
-                <include name="*.jar"/>
+            <fileset dir="../lib">
+                <include name="jstl-api*.jar"/>
+                <include name="jstl-impl*.jar"/>
             </fileset>
             <fileset dir="../build/jar">
                 <include name="json.jar"/>
@@ -437,8 +439,6 @@
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
             </fileset>
-        </copy>
-        <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
             <fileset dir="build/jar">
                 <include name="mcf-core.jar"/>
                 <include name="mcf-agents.jar"/>