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>
