Return-Path: 
 <commits-return-3249-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9A4ECD6F5
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Fri,  7 Sep 2012 06:50:54 +0000 (UTC)
Received: (qmail 37231 invoked by uid 500); 7 Sep 2012 06:50:54 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 37114 invoked by uid 500); 7 Sep 2012 06:50:50 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 37064 invoked by uid 99); 7 Sep 2012 06:50:48 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2012 06:50:48 +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; Fri, 07 Sep 2012 06:50:47 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 232E123888FE;
	Fri,  7 Sep 2012 06:49:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1381906 - in /manifoldcf/trunk: build.xml
 connectors/sharepoint/build.xml connectors/solr/build.xml
Date: Fri, 07 Sep 2012 06:49:56 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120907064957.232E123888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Fri Sep  7 06:49:56 2012
New Revision: 1381906

URL: http://svn.apache.org/viewvc?rev=1381906&view=rev
Log:
Revise build structure to use subdirectories under lib to unpack plugins, since otherwise we will have collisions when the SharePoint 2010 plugin is released.

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/sharepoint/build.xml
    manifoldcf/trunk/connectors/solr/build.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1381906&r1=1381905&r2=1381906&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Sep  7 06:49:56 2012
@@ -3426,33 +3426,34 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
     
-    <target name="download-sharepoint-plugin">
-        <mkdir dir="lib"/>
+    <target name="download-sharepoint-plugins">
+        <mkdir dir="lib/sharepoint-2007"/>
         <!-- Download and unpack binary artifact -->
         <mkdir dir="build/download"/>
-        <get src="http://archive.apache.org/dist/incubator/manifoldcf/apache-manifoldcf-sharepoint-3.0-plugin-0.1-incubating-bin.zip" dest="build/download/apache-manifoldcf-sharepoint-3.0-plugin-bin.zip"/>
-        <unzip src="build/download/apache-manifoldcf-sharepoint-3.0-plugin-bin.zip" dest="build/download/apache-manifoldcf-sharepoint-3.0-plugin-bin"/>
-        <copy todir="lib">
-            <fileset dir="build/download/apache-manifoldcf-sharepoint-3.0-plugin-bin/apache-manifoldcf-sharepoint-3.0-plugin-0.1-incubating/dist"/>
+        <get src="http://archive.apache.org/dist/manifoldcf/apache-manifoldcf-sharepoint-2007-plugin-0.2-bin.zip" dest="build/download/apache-manifoldcf-sharepoint-2007-plugin-bin.zip"/>
+        <unzip src="build/download/apache-manifoldcf-sharepoint-2007-plugin-bin.zip" dest="build/download/apache-manifoldcf-sharepoint-2007-plugin-bin"/>
+        <copy todir="lib/sharepoint-2007">
+            <fileset dir="build/download/apache-manifoldcf-sharepoint-2007-plugin-bin/apache-manifoldcf-sharepoint-2007-plugin-0.2/dist"/>
         </copy>
     </target>
 
     <target name="download-solr-plugins">
-        <mkdir dir="lib"/>
+        <mkdir dir="lib/solr-3.x"/>
         <mkdir dir="build/download"/>
         <get src="http://archive.apache.org/dist/manifoldcf/apache-manifoldcf-solr-3.x-plugin-0.2-bin.zip" dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip"/>
         <unzip src="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip" dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin"/>
-        <copy todir="lib">
+        <copy todir="lib/solr-3.x">
             <fileset dir="build/download/apache-manifoldcf-solr-3.x-plugin-bin/apache-manifoldcf-solr-3.x-plugin-0.2/dist"/>
         </copy>
+        <mkdir dir="lib/solr-4.x"/>
         <get src="http://archive.apache.org/dist/manifoldcf/apache-manifoldcf-solr-4.x-plugin-0.2-bin.zip" dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip"/>
         <unzip src="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip" dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin"/>
-        <copy todir="lib">
+        <copy todir="lib/solr-4.x">
             <fileset dir="build/download/apache-manifoldcf-solr-4.x-plugin-bin/apache-manifoldcf-solr-4.x-plugin-0.2/dist"/>
         </copy>
     </target>
 
-    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: manifoldcf/trunk/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/build.xml?rev=1381906&r1=1381905&r2=1381906&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/build.xml (original)
+++ manifoldcf/trunk/connectors/sharepoint/build.xml Fri Sep  7 06:49:56 2012
@@ -67,13 +67,9 @@
     </target>
 
     <target name="integration">
-        <mkdir dir="dist/integration"/>
-        <copy todir="dist/integration">
-          <fileset dir="../../lib">
-              <include name="*.bat"/>
-              <include name="*.wsp"/>
-              <include name="Installation Readme.txt"/>
-          </fileset>
+        <mkdir dir="dist/integration/sharepoint-2007"/>
+        <copy todir="dist/integration/sharepoint-2007">
+          <fileset dir="../../lib/sharepoint-2007"/>
         </copy>
     </target>
 

Modified: manifoldcf/trunk/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/build.xml?rev=1381906&r1=1381905&r2=1381906&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/build.xml (original)
+++ manifoldcf/trunk/connectors/solr/build.xml Fri Sep  7 06:49:56 2012
@@ -26,7 +26,10 @@
               <include name="README-3.x.txt"/>
               <include name="README-4.x.txt"/>
           </fileset>
-          <fileset dir="../../lib">
+          <fileset dir="../../lib/solr-3.x">
+              <include name="apache-solr-mcf-*.jar"/>
+          </fileset>
+          <fileset dir="../../lib/solr-4.x">
               <include name="apache-solr-mcf-*.jar"/>
           </fileset>
         </copy>