You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/04/02 11:58:34 UTC
svn commit: r1308277 - in /incubator/lcf/trunk: CHANGES.txt build.xml
connectors/sharepoint/build.xml connectors/sharepoint/integration/
connectors/solr/build.xml connectors/solr/integration/README.txt
Author: kwright
Date: Mon Apr 2 09:58:33 2012
New Revision: 1308277
URL: http://svn.apache.org/viewvc?rev=1308277&view=rev
Log:
Fix for CONNECTORS-441.
Removed:
incubator/lcf/trunk/connectors/sharepoint/integration/
incubator/lcf/trunk/connectors/solr/integration/README.txt
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/build.xml
incubator/lcf/trunk/connectors/sharepoint/build.xml
incubator/lcf/trunk/connectors/solr/build.xml
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1308277&r1=1308276&r2=1308277&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Apr 2 09:58:33 2012
@@ -3,6 +3,10 @@ $Id$
======================= 0.6-dev =====================
+CONNECTORS-441: Refactor how integration packages are delivered for
+better consistency.
+(Karl Wright)
+
CONNECTORS-436: Refer to older releases via archive.apache.org, not
via the mirrors.
(Karl Wright)
Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1308277&r1=1308276&r2=1308277&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Mon Apr 2 09:58:33 2012
@@ -2405,10 +2405,6 @@
<zip destfile="apache-manifoldcf-${release-version}-src.zip" update="false">
<zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
<exclude name="/lib/"/>
- <exclude name="/connectors/sharepoint/integration/*.wsp"/>
- <exclude name="/connectors/sharepoint/integration/*.bat"/>
- <exclude name="/connectors/sharepoint/integration/Installation Readme.bat"/>
- <exclude name="/connectors/solr/integration/*.jar"/>
<exclude name="/connectors/*/lib/"/>
<exclude name="/framework/lib/"/>
<exclude name="**/build/"/>
@@ -2443,10 +2439,6 @@
<tar destfile="apache-manifoldcf-${release-version}-src.tar.gz" compression="gzip" longfile="gnu">
<tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
<exclude name="/lib/"/>
- <exclude name="/connectors/sharepoint/integration/*.wsp"/>
- <exclude name="/connectors/sharepoint/integration/*.bat"/>
- <exclude name="/connectors/sharepoint/integration/Installation Readme.bat"/>
- <exclude name="/connectors/solr/integration/*.jar"/>
<exclude name="/connectors/*/lib/"/>
<exclude name="/framework/lib/"/>
<exclude name="**/build/"/>
Modified: incubator/lcf/trunk/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/build.xml?rev=1308277&r1=1308276&r2=1308277&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/connectors/sharepoint/build.xml Mon Apr 2 09:58:33 2012
@@ -69,7 +69,7 @@
<target name="integration">
<mkdir dir="dist/integration"/>
<copy todir="dist/integration">
- <fileset dir="integration">
+ <fileset dir="lib">
<include name="*.bat"/>
<include name="*.wsp"/>
<include name="Installation Readme.txt"/>
@@ -88,24 +88,25 @@
<property name="sharepoint-plugin-version" value="0.1-incubating"/>
<property name="sharepoint-plugin-description" value="mcf-sharepoint-3.0-plugin"/>
- <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+ <mkdir dir="lib"/>
+ <antcall target="download-via-svn"><param name="target" value="lib"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
<param name="artifact-name" value="MetaCarta.SharePoint.MCPermissionsService"/>
<param name="artifact-type" value="wsp"/>
</antcall>
- <antcall target="download-via-escaped-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+ <antcall target="download-via-escaped-svn"><param name="target" value="lib"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
<param name="escaped-artifact-name" value="Installation%20Readme"/>
<param name="artifact-name" value="Installation Readme"/>
<param name="artifact-type" value="txt"/>
</antcall>
- <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+ <antcall target="download-via-svn"><param name="target" value="lib"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
<param name="artifact-name" value="setup"/>
<param name="artifact-type" value="bat"/>
</antcall>
- <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+ <antcall target="download-via-svn"><param name="target" value="lib"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
<param name="artifact-name" value="remove"/>
<param name="artifact-type" value="bat"/>
</antcall>
- <antcall target="download-via-svn"><param name="target" value="integration"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
+ <antcall target="download-via-svn"><param name="target" value="lib"/><param name="project-desc" value="${sharepoint-plugin-description}"/><param name="artifact-version" value="${sharepoint-plugin-version}"/>
<param name="artifact-name" value="upgrade"/>
<param name="artifact-type" value="bat"/>
</antcall>
@@ -114,8 +115,8 @@
<target name="download-cleanup">
<delete>
<fileset dir="lib-proprietary" excludes="README.txt"/>
- <fileset dir="integration" excludes="README.txt"/>
</delete>
+ <delete dir="lib"/>
</target>
</project>
Modified: incubator/lcf/trunk/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/build.xml?rev=1308277&r1=1308276&r2=1308277&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/solr/build.xml (original)
+++ incubator/lcf/trunk/connectors/solr/build.xml Mon Apr 2 09:58:33 2012
@@ -20,13 +20,14 @@
<import file="../connector-build.xml"/>
<target name="download-dependencies">
- <antcall target="download-via-svn"><param name="target" value="integration"/>
+ <mkdir dir="lib"/>
+ <antcall target="download-via-svn"><param name="target" value="lib"/>
<param name="project-desc" value="mcf-solr-3.x-plugin"/>
<param name="artifact-version" value="0.1-incubating"/>
<param name="artifact-name" value="mcf-solr-3.x-plugin"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-svn"><param name="target" value="integration"/>
+ <antcall target="download-via-svn"><param name="target" value="lib"/>
<param name="project-desc" value="mcf-solr-4.x-plugin"/>
<param name="artifact-version" value="0.1-incubating"/>
<param name="artifact-name" value="mcf-solr-4.x-plugin"/>
@@ -35,19 +36,19 @@
</target>
<target name="download-cleanup">
- <delete>
- <fileset dir="integration" excludes="README*.txt"/>
- </delete>
+ <delete dir="lib"/>
</target>
<target name="integration">
<mkdir dir="dist/integration"/>
<copy todir="dist/integration">
<fileset dir="integration">
- <include name="*.jar"/>
<include name="README-3.x.txt"/>
<include name="README-4.x.txt"/>
</fileset>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
</copy>
</target>