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/04 12:20:09 UTC
svn commit: r1309322 - in /incubator/lcf/trunk: CHANGES.txt DEPENDENCIES.txt
build.xml lib-license/README.txt
Author: kwright
Date: Wed Apr 4 10:20:09 2012
New Revision: 1309322
URL: http://svn.apache.org/viewvc?rev=1309322&view=rev
Log:
Fixes for both CONNECTORS-446 and CONNECTORS-447.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/DEPENDENCIES.txt
incubator/lcf/trunk/build.xml
incubator/lcf/trunk/lib-license/README.txt
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1309322&r1=1309321&r2=1309322&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Wed Apr 4 10:20:09 2012
@@ -24,6 +24,12 @@ CONNECTORS-431: Update pom.xml versions.
======================= Release 0.5 =========================
+CONNECTORS-447: Deliver lib contents at root level in lib package.
+(Karl Wright)
+
+CONNECTORS-446: Correct problems blocking build in Japan.
+(Karl Wright, Shinichiro Abe)
+
CONNECTORS-445: Each distribution has its own licensing and readme files.
(Karl Wright)
Modified: incubator/lcf/trunk/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/DEPENDENCIES.txt?rev=1309322&r1=1309321&r2=1309322&view=diff
==============================================================================
--- incubator/lcf/trunk/DEPENDENCIES.txt (original)
+++ incubator/lcf/trunk/DEPENDENCIES.txt Wed Apr 4 10:20:09 2012
@@ -1,6 +1,9 @@
ManifoldCF requires
------------------
* JRE 1.5 or above
+* SVN client, version 1.7 or above
+* Apache Ant, version 1.7 or above
+* Apache Forrest, version 0.9-dev or above
* Many other libraries, available from the ManifoldCF XXX-lib distribution, or by running
the "make-core-deps" ant target
Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1309322&r1=1309321&r2=1309322&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Wed Apr 4 10:20:09 2012
@@ -2442,14 +2442,7 @@
<target name="create-lib-zip" depends="set-version">
<zip destfile="apache-manifoldcf-${release-version}-lib.zip" update="false">
- <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
- <include name="/lib/"/>
- <include name="/connectors/*/lib/"/>
- <include name="/framework/lib/"/>
- </zipfileset>
- <zipfileset dir="lib-license" prefix="apache-manifoldcf-${release-version}">
- <include name="*.txt"/>
- </zipfileset>
+ <zipfileset dir="lib" prefix="apache-manifoldcf-${release-version}"/>
</zip>
</target>
@@ -2489,12 +2482,7 @@
<target name="create-lib-tar" depends="set-version">
<tar destfile="apache-manifoldcf-${release-version}-lib.tar.gz" compression="gzip" longfile="gnu">
- <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
- <include name="/lib/"/>
- <include name="/connectors/*/lib/"/>
- <include name="/framework/lib/"/>
- <include name="*.txt"/>
- </tarfileset>
+ <tarfileset dir="lib" prefix="apache-manifoldcf-${release-version}"/>
</tar>
</target>
@@ -2761,7 +2749,7 @@ Use Apache Forrest version forrest-0.9-d
<delete dir="build/download/hsqldb"/>
<antcall target="checkout-source-via-svn">
<param name="root-dir" value="build/download"/>
- <param name="svn-url" value="https://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/tags/2.2.8"/>
+ <param name="svn-url" value="http://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/tags/2.2.8"/>
<param name="dir-name" value="hsqldb"/>
</antcall>
<!-- Build it -->
@@ -2906,7 +2894,7 @@ Use Apache Forrest version forrest-0.9-d
<delete dir="build/download/commons-httpclient"/>
<antcall target="checkout-source-via-svn">
<param name="root-dir" value="build/download"/>
- <param name="svn-url" value="https://svn.apache.org/repos/asf/httpcomponents/oac.hc3x/tags/HTTPCLIENT_3_1"/>
+ <param name="svn-url" value="http://svn.apache.org/repos/asf/httpcomponents/oac.hc3x/tags/HTTPCLIENT_3_1"/>
<param name="dir-name" value="commons-httpclient"/>
</antcall>
<!-- Apply cumulative post-3.1 fixes patch -->
@@ -2963,7 +2951,7 @@ Use Apache Forrest version forrest-0.9-d
<delete dir="build/download/xerces2-j"/>
<antcall target="checkout-source-via-svn">
<param name="root-dir" value="build/download"/>
- <param name="svn-url" value="https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_9_1"/>
+ <param name="svn-url" value="http://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_9_1"/>
<param name="dir-name" value="xerces2-j"/>
</antcall>
<!-- Apply mcf-specific features and fixes patch -->
@@ -3386,6 +3374,9 @@ Use Apache Forrest version forrest-0.9-d
</target>
<target name="make-core-deps" depends="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-jdbcpool,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-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+ <copy todir="lib">
+ <fileset dir="lib-license" includes="*.txt"/>
+ </copy>
</target>
<target name="download-mysql">
Modified: incubator/lcf/trunk/lib-license/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib-license/README.txt?rev=1309322&r1=1309321&r2=1309322&view=diff
==============================================================================
--- incubator/lcf/trunk/lib-license/README.txt (original)
+++ incubator/lcf/trunk/lib-license/README.txt Wed Apr 4 10:20:09 2012
@@ -32,8 +32,9 @@ source package.
1. Download and unpacked the source package.
-2. Copy the lib directory within this package into the same place in the source
- package's directory structure.
+2. Create a directory called "lib" at the root level in the source tree.
+
+3. Copy the files in this package into the lib directory in the source tree.
Now you are ready to build the ManifoldCF sources.