svn commit: r991035 - in /avro/branches/branch-1.4: ./ CHANGES.txt lang/java/build.xml lang/php/README.txt

[cu...@apache.org]

Author: cutting
Date: Mon Aug 30 23:52:04 2010
New Revision: 991035

URL: http://svn.apache.org/viewvc?rev=991035&view=rev
Log:
Merge r991031 from trunk to 1.4 branch.  Fixes: AVRO-644, AVRO-646.

Modified:
    avro/branches/branch-1.4/   (props changed)
    avro/branches/branch-1.4/CHANGES.txt
    avro/branches/branch-1.4/lang/java/build.xml
    avro/branches/branch-1.4/lang/php/README.txt

Propchange: avro/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 30 23:52:04 2010
@@ -1 +1 @@
-/avro/trunk:990852,990860,990867,990871,990878
+/avro/trunk:990852,990860,990867,990871,990878,991031

Modified: avro/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/CHANGES.txt?rev=991035&r1=991034&r2=991035&view=diff
==============================================================================
--- avro/branches/branch-1.4/CHANGES.txt (original)
+++ avro/branches/branch-1.4/CHANGES.txt Mon Aug 30 23:52:04 2010
@@ -26,7 +26,7 @@ Avro 1.4.0 (31 August 2010)
 
   NEW FEATURES
 
-    AVRO-627. Add PHP implementation. (Michael Glaesemann)
+    AVRO-627. Add PHP implementation. (Michael Glaesemann via cutting)
 
     AVRO-613. Create basic frontend to view trace results.
     (Patrick Wendell via philz)
@@ -159,6 +159,8 @@ Avro 1.4.0 (31 August 2010)
     AVRO-639. Python: Use namespace-unqualified names for references
     to schemas in the same namespace. (cutting)
 
+    AVRO-644: PHP: Add requirements to README. (Michael Glaesemann via cutting)
+
   BUG FIXES
 
     AVRO-622. python avro.ipc doesn't work with python2.4 (philz)

Modified: avro/branches/branch-1.4/lang/java/build.xml
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/lang/java/build.xml?rev=991035&r1=991034&r2=991035&view=diff
==============================================================================
--- avro/branches/branch-1.4/lang/java/build.xml (original)
+++ avro/branches/branch-1.4/lang/java/build.xml Mon Aug 30 23:52:04 2010
@@ -64,6 +64,7 @@
   <property name="test.java.classes" value="${test.java.build.dir}/classes"/>
   <property name="test.java.generated.classes" value="${test.java.generated.build.dir}/classes"/>
   <property name="test.java.include" value="Test*"/>
+  <property name="test.java.exclude" value="ipc/trace/*"/>
 
   <property name="javadoc.link.java"
 	    value="http://java.sun.com/javase/6/docs/api/"/>

Modified: avro/branches/branch-1.4/lang/php/README.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/lang/php/README.txt?rev=991035&r1=991034&r2=991035&view=diff
==============================================================================
--- avro/branches/branch-1.4/lang/php/README.txt (original)
+++ avro/branches/branch-1.4/lang/php/README.txt Mon Aug 30 23:52:04 2010
@@ -3,6 +3,15 @@ What the Avro PHP library is
 
 A library for using [Avro](http://avro.apache.org/) with PHP.
 
+Requirements
+============
+ * PHP 5
+ * On 32-bit platforms, the [GMP PHP extension](http://php.net/gmp)
+ * For testing, [PHPUnit](http://www.phpunit.de/)
+
+Both GMP and PHPUnit are often available via package management
+systems as `php5-gmp` and `phpunit`, respectively.
+
 Getting started
 ===============